回退用于部署

jeecg-module-interlock/src/main/java/org/jeecg/modules/ssoClient/controller/SSOLoginLogoutController.java

@@ -168,10 +168,9 @@ public class SSOLoginLogoutController {
      * */
     @ApiOperation(".登录接口（sso）——从IoTedge链接跳转登录")
     @RequestMapping(value = "/tzlogin", method = RequestMethod.POST)
-    public LoginResult tzlogin(HttpServletRequest request, HttpServletResponse response){
+    public LoginResult tzlogin(HttpServletRequest request, HttpServletResponse response, @RequestBody SysLoginModelDTO dto){
 
         String eiToken = "";
-        String wisEUser = "";
 
         Cookie[] cookies = request.getCookies();
         if (cookies != null) {
@@ -179,15 +178,14 @@ public class SSOLoginLogoutController {
                 if (cookie.getName().equals("EIToken")) {
                     eiToken = cookie.getValue();
                 }
-                if (cookie.getName().equals("WISEUser")) {
-                    wisEUser = cookie.getValue();
-                }
             }
         }
 
         LoginResult loginResult = new LoginResult();
         Result<JSONObject> result = new Result<JSONObject>();
-        String usernameSSO = wisEUser;
+        String usernameSSO = dto.getUsername();
+        String password = dto.getPassword();
+//        String eiToken = dto.getEiToken();
         String lsToken = request.getHeader(CommonConstant.X_ACCESS_TOKEN);
 
         if(eiToken!=null && !"".equals(eiToken)){
@@ -206,10 +204,10 @@ public class SSOLoginLogoutController {
                     SysUser sysUser = sysUserService.getUserAll(usernameSSO);
                     result = sysUserService.checkUserIsEffective(sysUser);
                     if(!result.isSuccess()) {
-                        // TODO 已经单点登录成功了的用户如果在本系统不存在，新增用户？——初始密码设为123456？？
+                        // TODO 已经单点登录成功了的用户如果在本系统不存在，新增用户？
                         if(result.getMessage().equals(SSOConstants.BCZ) ){
                             log.info("用户在本系统不存在，新增该用户");
-                            JSONObject addJSONObject = toAddJSONObject(usernameSSO,  "123456");
+                            JSONObject addJSONObject = toAddJSONObject(usernameSSO,  password);
                             addUser(addJSONObject);
                         }else if(result.getMessage().equals(SSOConstants.YZX) || result.getMessage().equals(SSOConstants.YDj)){
                             // TODO 已注销或冻结的用户怎么处理？——首先不应该允许在本系统注销或者冻结用户？——如果真的有恢复正常状态？