From d2511e7009febfd1c3047cb2cc1762b05c17141d Mon Sep 17 00:00:00 2001
From: 申海龙 <long455900@163.com>
Date: Thu, 14 Mar 2019 10:55:05 +0800
Subject: [PATCH] 修改远程登录 流程 if判断 去除 login.jsp login()方法
---
src/main/java/com/agent/controller/system/LoginController.java | 41 ++---------------------------------------
src/main/webapp/WEB-INF/views/login.jsp | 26 +++++++++++++-------------
2 files changed, 15 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/agent/controller/system/LoginController.java b/src/main/java/com/agent/controller/system/LoginController.java
index b8c1991..fa7add1 100644
--- a/src/main/java/com/agent/controller/system/LoginController.java
+++ b/src/main/java/com/agent/controller/system/LoginController.java
@@ -158,9 +158,7 @@ public class LoginController {
user.setLoginaccount(loginAccount);
user.setPassword(password);
-
- System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"+PropertiesLoader.getLogin("openRemoteLogin"));
- if (!loginAccount.equals("admin") && loginAccount.equals(PropertiesLoader.getLogin("openRemoteLogin"))) {
+ if (!loginAccount.equals("admin") && "true".equals(PropertiesLoader.getLogin("openRemoteLogin"))) {
// 远程登录
// 用户数据
LoginData login = FLogin.login(user);
@@ -273,41 +271,6 @@ public class LoginController {
UserEntity user = new UserEntity();
user.setLoginaccount(j.get("appLoginID").toString());
user.setPassword(j.get("appLoginPass").toString());
- if (!j.get("appLoginID").toString().equals("admin")) {}
- // 远程登录
- // 用户数据
- LoginData login = FLogin.login(user);
- // 登录成功！
- if (login.getCode() == 20000) {
- // 往数据库中插入数据
- UserEntity ue = userService.findByLoginaccount(user.getLoginaccount());
- // 用户存在
- if (ue != null) {
- // 修改密码
- userService.updatePassword(ue.getLoginaccount(), MD5Tools.MD5(j.get("appLoginPass").toString()));
- } else {
- // 用户不存在，插入数据
- BasicAgentEntity agent = new BasicAgentEntity();
- agent.setContact(login.getInfodata().getContact());
- agent.setNameCn(login.getInfodata().getCompany());
- agent.setCountryCode("CN");
- agent.setAddress(login.getInfodata().getAddress());
- int agent_id = agentSerive.save2(agent);
-
- ue = new UserEntity();
- ue.setLoginaccount(j.get("appLoginID").toString());
- // 设置用户名密码
- ue.setPassword(MD5Tools.MD5(j.get("appLoginPass").toString()));
- ue.setRealName(login.getInfodata().getContact());
- ue.setMobile(login.getInfodata().getMobile());
- ue.setStatus(0);
- ue.setAgent(new Long(agent_id));
- RoleEntity re = new RoleEntity();
- re.setId(new Long(1));
- ue.setRole(re);
- // 删除密码
- userService.save(ue);
- }
// 登录用户
Subject subject = SecurityUtils.getSubject();
@@ -337,7 +300,7 @@ public class LoginController {
}
}
- }
+
return "login";
}
}
diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp
index c78107a..a1d6852 100644
--- a/src/main/webapp/WEB-INF/views/login.jsp
+++ b/src/main/webapp/WEB-INF/views/login.jsp
@@ -38,20 +38,20 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
</body>
<script type="text/javascript">
- function login(){
- $.ajax({
- url:"<%=basePath %>manifest/cross/grid.json",
- data:{
- page:1,
- rows : 10
- },
- success:function(data){
- /* console.log("login()-->"+JSON.stringify(data)); */
- }
- });
- }
+ <%--function login(){--%>
+ <%--$.ajax({--%>
+ <%--url:"<%=basePath %>manifest/cross/grid.json",--%>
+ <%--data:{--%>
+ <%--page:1,--%>
+ <%--rows : 10--%>
+ <%--},--%>
+ <%--success:function(data){--%>
+ <%--/* console.log("login()-->"+JSON.stringify(data)); */--%>
+ <%--}--%>
+ <%--});--%>
+ <%--}--%>
- login();
+ // login();
function doLogin(){
var userName = $("#userName").val();
--
libgit2 0.24.0