Merge remote-tracking branch 'origin/dev' into dev2

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

@@ -316,7 +316,8 @@ public class LoginController extends BaseController {
 
         UserAccount userAccount = userAccountService.findOneByUserUU(app.getUid(), userUU, spaceUU);
         if (userAccount == null) {
-            return success(new ModelMap("returnUrl", HttpUtil.decodeURL(returnUrl)));
+            List<UserAccount> userAccounts = userAccountService.findByUserUU(app.getUid(), userUU);
+            return success(getSpaceSelect(userAccounts, false));
         }
         return loginByUser(userAccount, returnUrl, null, false);
     }

sso-server/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8081
+  port: 23232
 
 spring:
   main:
@@ -7,7 +7,7 @@ spring:
   application:
     name: sso-server
   profiles:
-    active: dev
+    active: prod
   jpa:
     database: MYSQL
     show-sql: false