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

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

@@ -34,7 +34,7 @@ public class UserSpaceView implements Serializable {
     /**
      * 注册日期
      */
-    private Date registerDate;
+    private Long registerDate;
 
     /**
      * 管理员
@@ -115,11 +115,11 @@ public class UserSpaceView implements Serializable {
         this.corporation = corporation;
     }
 
-    public Date getRegisterDate() {
+    public Long getRegisterDate() {
         return registerDate;
     }
 
-    public void setRegisterDate(Date registerDate) {
+    public void setRegisterDate(Long registerDate) {
         this.registerDate = registerDate;
     }
 

sso-server/src/main/java/com/uas/sso/entity/Userspace.java

@@ -207,7 +207,7 @@ public class Userspace implements Serializable {
     private Long inviteSpaceUU;
 
     /**
-     * 邀请人企业uu号
+     * 邀请人uu号
      */
     @Column(name = "invite_user_uu")
     private Long inviteUserUU;
@@ -555,7 +555,7 @@ public class Userspace implements Serializable {
         userSpaceView.setSpaceUU(this.getSpaceUU());
         userSpaceView.setSpaceName(this.getSpaceName());
         userSpaceView.setCorporation(this.getCorporation());
-        userSpaceView.setRegisterDate(this.getRegisterDate());
+        userSpaceView.setRegisterDate(this.getRegisterDate().getTime());
         userSpaceView.setAdmin(this.getAdmin().toView());
         userSpaceView.setBusinessCode(this.getBusinessCode());
         userSpaceView.setBusinessCodeImage(this.getBusinessCodeImage());

sso-server/src/main/java/com/uas/sso/service/impl/ApplyUserSpaceServiceImpl.java

@@ -69,7 +69,7 @@ public class ApplyUserSpaceServiceImpl implements ApplyUserSpaceService {
         }
 
         // 判断是否已申请
-        List<ApplyUserSpace> applyUserSpaces = applyUserSpaceDao.findByUserUUAndSpaceUUAndStatus(user.getUserUU(), userspace.getSpaceUU(), Status.TO_BE_CERTIFIED.getCode());
+        List<ApplyUserSpace> applyUserSpaces = applyUserSpaceDao.findByUserUUAndSpaceUUAndStatus(user.getUserUU(), userspace.getSpaceUU(), Status.UNAUDIT.getCode());
         if (!CollectionUtils.isEmpty(applyUserSpaces)) {
             throw new VisibleError("你已申请该企业，请耐心等待管理员审核");
         }

sso-server/src/main/java/com/uas/sso/service/impl/UserServiceImpl.java

@@ -137,7 +137,7 @@ public class UserServiceImpl implements UserService {
         if (noEncryPwd.length() >= 32) {
             /// 之后添加日志时恢复
             //logger.error("用户密码加密", String.format("传递过来的密码(%s)必须是未加密的明文", noEncryPwd));
-            throw new AccountException("invalid password");
+            throw new VisibleError("密码过长，请重新输入");
         }
         // $password{$salt}
         String password = format.replace(Const.ENCRY_PARAM_PASSWORD, noEncryPwd);
@@ -531,7 +531,7 @@ public class UserServiceImpl implements UserService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        User finalUser = user;
+        final User finalUser = user;
         ExecuteUtils.execute(new ICallable<Void, String>() {
 
             @Override

sso-server/src/main/java/com/uas/sso/service/impl/UserspaceServiceImpl.java

@@ -111,6 +111,8 @@ public class UserspaceServiceImpl implements UserspaceService {
 
     private void syncUserSpaceInfo(final UserSpaceView userSpaceView, final String msg) {
         List<String> apps = appService.findUid();
+        userSpaceView.setAdminUU(userSpaceView.getAdmin().getUserUU());
+        userSpaceView.setAdmin(null);
 
         ExecuteUtils.execute(new ICallable<Void, String>() {
             @Override