产城个人注册企业注册完成修改

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

@@ -6,6 +6,7 @@ import com.uas.sso.SSOToken;
 import com.uas.sso.core.Step;
 import com.uas.sso.core.Type;
 import com.uas.sso.core.PasswordStrength;
+import com.uas.sso.entity.App;
 import com.uas.sso.entity.User;
 import com.uas.sso.entity.UserAccount;
 import com.uas.sso.logging.LoggerManager;
@@ -93,13 +94,29 @@ public class PersonalRegisterController extends BaseController {
         // 注册成功后删除验证码token
         tokenService.delete(token);
 
+        App app = appService.findOne(appId);
         if ("mall".equals(appId)) {
             UserAccount userAccount = personalAccountService.findOneByUserUU(appId, user.getUserUU());
             List<String> loginUrls = appService.findAllLoginUrl();
             ModelMap data = new ModelMap();
             data.addAttribute("data", userAccount)
                     .addAttribute("loginUrls", loginUrls)
-                    .addAttribute("currentUrl", baseUrl);
+                    .addAttribute("currentUrl", baseUrl)
+                    .addAttribute("type", "mall");
+            SSOToken st = new SSOToken(request, userAccount.getMobile());
+            st.setData(JSON.toJSONString(userAccount));
+            SSOHelper.setSSOCookie(request, response, st, true);
+            return success(data);
+        } else if ("city".equals(appId) || "city".equals(app.getUserControl())) {
+            UserAccount userAccount = personalAccountService.findOneByUserUU(appId, user.getUserUU());
+            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);

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

@@ -180,9 +180,17 @@ public class UserspaceRegisterController extends BaseController {
             SSOHelper.setSSOCookie(request, response, st, true);
             return success(data);
         } else if ("city".equals(appId) || "city".equals(app.getUserControl())) {
+            UserAccount userAccount = userAccountService.findOneByUserUU(appId, admin.getUserUU(), userspace.getSpaceUU());
+            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);
             return success(data);
         }
         return success();