修改系统的登录流程

@@ -10,6 +10,9 @@ package com.agent.controller.system;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
 
+
+import com.framework.util.PropertiesLoader;
+import com.framework.util.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.IncorrectCredentialsException;
 import org.apache.shiro.authc.IncorrectCredentialsException;
 import org.apache.shiro.authc.LockedAccountException;
 import org.apache.shiro.authc.LockedAccountException;
@@ -18,6 +21,7 @@ import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -39,6 +43,8 @@ import com.framework.util.MD5Tools;
 import login.FLogin;
 import login.FLogin;
 import login.LoginData;
 import login.LoginData;
 
 
+import java.util.Map;
+
 @Controller
 @Controller
 public class LoginController {
 public class LoginController {
 
 
@@ -144,13 +150,14 @@ public class LoginController {
 	@RequestMapping(value = "/doLogin", method = RequestMethod.POST)
 	@RequestMapping(value = "/doLogin", method = RequestMethod.POST)
 	@ResponseBody
 	@ResponseBody
 	public ResponseModel doLogin(String loginAccount, String password, String captcha) {
 	public ResponseModel doLogin(String loginAccount, String password, String captcha) {
+
 		SessionUtil.putKey(Constants.CAPTCHA, "");
 		SessionUtil.putKey(Constants.CAPTCHA, "");
 		ResponseModel rm = new ResponseModel(200, "", null);
 		ResponseModel rm = new ResponseModel(200, "", null);
 
 
 		UserEntity user = new UserEntity();
 		UserEntity user = new UserEntity();
 		user.setLoginaccount(loginAccount);
 		user.setLoginaccount(loginAccount);
 		user.setPassword(password);
 		user.setPassword(password);
-		if (!loginAccount.equals("admin")) {
+        if (!loginAccount.equals("admin") && loginAccount.equals(PropertiesLoader.getLogin("openRemoteLogin"))) {
 			// 远程登录
 			// 远程登录
 			// 用户数据
 			// 用户数据
 			LoginData login = FLogin.login(user);
 			LoginData login = FLogin.login(user);
@@ -224,20 +231,21 @@ public class LoginController {
 				rm.setStatus(500);
 				rm.setStatus(500);
 				rm.setMsg("1");
 				rm.setMsg("1");
 			} catch (IncorrectCredentialsException e) {
 			} catch (IncorrectCredentialsException e) {
-				rm.setStatus(500);
-				rm.setMsg("1");
-			} catch (LockedAccountException e) {
-				rm.setStatus(500);
-				rm.setMsg("1");
-			}
+			rm.setStatus(500);
+			rm.setMsg("1");
+		} catch (LockedAccountException e) {
+			rm.setStatus(500);
+			rm.setMsg("1");
 		}
 		}
+	}
 
 
 		return rm;
 		return rm;
 	}
 	}
-	    
+
+
 	/**
 	/**
      * 登录操作api
      * 登录操作api
-     * 
+     *
      * @return
      * @return
      */
      */
     @RequestMapping(value = "/loginApi", method = RequestMethod.POST)
     @RequestMapping(value = "/loginApi", method = RequestMethod.POST)

@@ -22,6 +22,8 @@ public class PropertiesLoader {
 	private static final String CONFIG_FILE = "/config.properties";
 	private static final String CONFIG_FILE = "/config.properties";
 
 
 	private static final String REDIS_FILE = "/redis.properties";
 	private static final String REDIS_FILE = "/redis.properties";
+
+	private static final String LOGIN_FILE = "/openRemoteLogin.properties";
 	
 	
 	/**
 	/**
 	 * 配置文件properties获取value
 	 * 配置文件properties获取value
@@ -63,6 +65,12 @@ public class PropertiesLoader {
 	}
 	}
 
 
 
 
+	public static String getLogin(String key) {
+		Properties properties = PropertiesLoader.loadProperty(LOGIN_FILE);
+		return properties.getProperty(key);
+	}
+
+
 	public static String get(String key,String propertyFile){
 	public static String get(String key,String propertyFile){
 		Properties properties = loadProperty(propertyFile);
 		Properties properties = loadProperty(propertyFile);
 		return (String) properties.get(key);
 		return (String) properties.get(key);

+#ǷԶ̵¼
+openRemoteLogin = true