feat:注册完成后自动登录

sso-server/src/main/java/com/uas/sso/controller/PersonalRegisterController.java

@@ -132,42 +132,27 @@ public class PersonalRegisterController extends BaseController {
         }
         tokenService.delete(token);
 
+        // 判断应用是否存在
         App app = appService.findOne(appId);
-        if ("mall".equals(appId)) {
-            UserAccount userAccount = personalAccountService.findOneByUserUU(appId, user.getUserUU());
-            userAccount.setLastLoginTime(System.currentTimeMillis());
-            List<String> loginUrls = appService.findAllLoginUrl();
-            ModelMap data = new ModelMap();
-            data.addAttribute("data", userAccount)
-                    .addAttribute("loginUrls", loginUrls)
-                    .addAttribute("currentUrl", baseUrl)
-                    .addAttribute("type", "mall");
-            SSOToken st = new SSOToken(request, userAccount.getMobile());
-            st.setData(JSON.toJSONString(userAccount));
-            SSOHelper.setSSOCookie(request, response, st, true);
-            LOGGER.info("用户（{}）注册并登录成功，时间：{}", user.getUserUU(), System.currentTimeMillis());
-            return success(data);
-        } else if ("city".equals(appId) || "city".equals(app == null ? "" : app.getUserControl())) {
-            UserAccount userAccount = personalAccountService.findOneByUserUU(appId, user.getUserUU());
-            userAccount.setLastLoginTime(System.currentTimeMillis());
-            List<String> loginUrls = appService.findAllLoginUrl();
-            ModelMap data = new ModelMap();
-            data.addAttribute("data", userAccount)
-                    .addAttribute("loginUrls", loginUrls)
-                    .addAttribute("currentUrl", baseUrl)
-                    .addAttribute("type", "city");
-            data.addAttribute("bgImage", "https://dfs.ubtob.com/group1/M00/88/AE/CgpkyFsPxC-ADHD8ACBM14PiAS8632.png")
-                    .addAttribute("type", "city");
-            SSOToken st = new SSOToken(request, userAccount.getMobile());
-            st.setData(JSON.toJSONString(userAccount));
-            SSOHelper.setSSOCookie(request, response, st, true);
-            LOGGER.info("用户（{}）注册并登录成功，时间：{}", user.getUserUU(), System.currentTimeMillis());
-            return success(data);
+        if (app == null) {
+            LOGGER.warn("个人注册，应用{}不存在，注册用户：{}", appId, user.getUserUU());
+            return success();
         }
 
-        // 设置返回数据
-        LOGGER.info("用户（{}）注册成功，时间：{}", user.getUserUU(), System.currentTimeMillis());
-        return success(new ModelMap("userUU", user.getUserUU()));
+        // 登录并返回数据
+        UserAccount userAccount = personalAccountService.findOneByUserUU(appId, user.getUserUU());
+        userAccount.setLastLoginTime(System.currentTimeMillis());
+        List<String> loginUrls = appService.findAllLoginUrl();
+        SSOToken st = new SSOToken(request, userAccount.getMobile());
+        st.setData(JSON.toJSONString(userAccount));
+        SSOHelper.setSSOCookie(request, response, st, true);
+
+        ModelMap data = new ModelMap();
+        data.addAttribute("data", userAccount)
+                .addAttribute("loginUrls", loginUrls)
+                .addAttribute("currentUrl", baseUrl);
+        LOGGER.info("用户（{}）注册并登录成功，时间：{}", user.getUserUU(), System.currentTimeMillis());
+        return success(data);
     }
 
     @PostMapping("/sms")

sso-server/src/main/java/com/uas/sso/controller/UserspaceRegisterController.java

@@ -198,39 +198,26 @@ public class UserspaceRegisterController extends BaseController {
         // 添加日志
         registerLogger.info(Type.REGISTER_USERSPACE.getValue(), Step.SECOND.getValue(), "企业注册", userspace, appId);
 
+        // 判断应用是否存在
         App app = appService.findOne(appId);
-        if ("mall".equals(appId)) {
-            UserAccount userAccount = userAccountService.findOneByUserUU(appId, admin.getUserUU(), userspace.getSpaceUU());
-            userAccount.setLastLoginTime(System.currentTimeMillis());
-            List<String> loginUrls = appService.findAllLoginUrl();
-            ModelMap data = new ModelMap();
-            data.addAttribute("data", userAccount)
-                    .addAttribute("loginUrls", loginUrls)
-                    .addAttribute("currentUrl", baseUrl)
-                    .addAttribute("type", "mall");
-            SSOToken st = new SSOToken(request, userAccount.getMobile());
-            st.setData(JSON.toJSONString(userAccount));
-            SSOHelper.setSSOCookie(request, response, st, true);
-            LOGGER.info("用户（{}）注册并登录成功，时间：{}", admin.getUserUU(), System.currentTimeMillis());
-            return success(data);
-        } else if ("city".equals(appId) || "city".equals(app.getUserControl())) {
-            UserAccount userAccount = userAccountService.findOneByUserUU(appId, admin.getUserUU(), userspace.getSpaceUU());
-            userAccount.setLastLoginTime(System.currentTimeMillis());
-            List<String> loginUrls = appService.findAllLoginUrl();
-            ModelMap data = new ModelMap();
-            data.addAttribute("bgImage", "https://dfs.ubtob.com/group1/M00/88/AE/CgpkyFsPxC-ADHD8ACBM14PiAS8632.png")
-                    .addAttribute("type", "city");
-            data.addAttribute("data", userAccount)
-                    .addAttribute("loginUrls", loginUrls)
-                    .addAttribute("currentUrl", baseUrl);
-            SSOToken st = new SSOToken(request, userAccount.getMobile());
-            st.setData(JSON.toJSONString(userAccount));
-            SSOHelper.setSSOCookie(request, response, st, true);
-            LOGGER.info("用户（{}）注册并登录成功，时间：{}", admin.getUserUU(), System.currentTimeMillis());
-            return success(data);
+        if (app == null) {
+            LOGGER.warn("企业注册，应用{}不存在，注册企业：{}", appId, userspace.getSpaceUU());
+            return success();
         }
-        LOGGER.info("用户（{}）注册企业（{}）成功，时间：{}", user.getUserUU(), userspace.getSpaceUU(), System.currentTimeMillis());
-        return success();
+
+        // 登录并返回数据
+        UserAccount userAccount = userAccountService.findOneByUserUU(appId, admin.getUserUU(), userspace.getSpaceUU());
+        userAccount.setLastLoginTime(System.currentTimeMillis());
+        List<String> loginUrls = appService.findAllLoginUrl();
+        ModelMap data = new ModelMap();
+        data.addAttribute("data", userAccount)
+                .addAttribute("loginUrls", loginUrls)
+                .addAttribute("currentUrl", baseUrl);
+        SSOToken st = new SSOToken(request, userAccount.getMobile());
+        st.setData(JSON.toJSONString(userAccount));
+        SSOHelper.setSSOCookie(request, response, st, true);
+        LOGGER.info("用户（{}）注册并登录成功，时间：{}", admin.getUserUU(), System.currentTimeMillis());
+        return success(data);
     }
 
     /**