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

sso-common/src/main/java/com/uas/sso/entity/UserSpaceView.java

@@ -101,6 +101,11 @@ public class UserSpaceView implements Serializable {
      */
     private Long invitationTime;
 
+    /**
+     * 秘钥
+     */
+    private String accessSecret;
+
     /**
      * 邀请时间
      */
@@ -246,6 +251,14 @@ public class UserSpaceView implements Serializable {
         this.invitationTime = invitationTime;
     }
 
+    public String getAccessSecret() {
+        return accessSecret;
+    }
+
+    public void setAccessSecret(String accessSecret) {
+        this.accessSecret = accessSecret;
+    }
+
     public String getSource() {
         return source;
     }

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

@@ -240,17 +240,6 @@ public class UserManagerController extends BaseController {
         // 绑定企业
         userService.bindUserspace(appId, user.getUserUU(), spaceUU);
 
-        // 同步到旧账户中心
-        try {
-            UserDetail userDetail = new UserDetail();
-            userDetail.setName(user.getVipName());
-            userDetail.setMobile(user.getMobile());
-            userDetail.setEmail(user.getEmail());
-            AccountUtils.addUser(user.getUserUU(), spaceUU, userDetail, user.getPassword());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
         return success(user);
     }
 
@@ -362,4 +351,10 @@ public class UserManagerController extends BaseController {
         tokenService.save(token);
         return success(token.getId());
     }
+
+    @RequestMapping("/getTokenData")
+    public ModelMap getTokenData(String token) {
+        return success(tokenService.findOne(token).getBind());
+    }
+
 }