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

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

@@ -75,6 +75,16 @@ public class UserView implements Serializable {
      */
     private Short identityValidCode;
 
+    /**
+     * 密码强度
+     */
+    private int passwordLevel;
+
+    /**
+     * 有密保
+     */
+    private boolean hasQuestion;
+
     /**
      * 用户身份认证状态
      */
@@ -201,6 +211,22 @@ public class UserView implements Serializable {
         this.identityValidCode = identityValidCode;
     }
 
+    public int getPasswordLevel() {
+        return passwordLevel;
+    }
+
+    public void setPasswordLevel(int passwordLevel) {
+        this.passwordLevel = passwordLevel;
+    }
+
+    public boolean isHasQuestion() {
+        return hasQuestion;
+    }
+
+    public void setHasQuestion(boolean hasQuestion) {
+        this.hasQuestion = hasQuestion;
+    }
+
     public Short getLock() {
         return lock;
     }

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

@@ -58,7 +58,7 @@ public class UserspaceRegisterController extends BaseController {
             data.put("hasRegister", false);
         } else {
             data.put("hasRegister", true);
-            data.put("hasEmail", user.getEmailValidCode() == Status.AUTHENTICATED.getCode());
+            data.put("hasEmail", !StringUtils.isEmpty(user.getEmail()));
         }
         request.getSession().setAttribute("mobile", mobile);
 

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

@@ -1,16 +1,14 @@
 package com.uas.sso.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.uas.sso.core.Status;
+import com.uas.sso.service.*;
 import org.springframework.data.domain.Page;
 import com.uas.sso.core.Const;
 import com.uas.sso.entity.User;
 import com.uas.sso.entity.UserAccount;
 import com.uas.sso.entity.Userspace;
 import com.uas.sso.exception.VisibleError;
-import com.uas.sso.service.ApplyUserSpaceService;
-import com.uas.sso.service.UserAccountService;
-import com.uas.sso.service.UserService;
-import com.uas.sso.service.UserspaceService;
 import com.uas.sso.support.SystemSession;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
@@ -36,7 +34,7 @@ public class YunCenterController extends BaseController {
     private UserspaceService userspaceService;
 
     @Autowired
-    private UserAccountService userAccountService;
+    private UserspaceValidService userspaceValidService;
 
     /**
      * 获取登录用户信息
@@ -64,6 +62,10 @@ public class YunCenterController extends BaseController {
             // 删除管理员的密码盐值,不返回给前端
             userspace.getAdmin().setSalt(null);
             userspace.getAdmin().setPassword(null);
+            if (userspace.getValidCode() == Status.TO_BE_CERTIFIED.getCode()) {
+                Userspace newUserSpace = userspaceValidService.getToBeCertified(userspace.getSpaceUU());
+                data.put("newUserSpace", newUserSpace);
+            }
         }
 
         // 删除用户密码和盐值,不返回给前端

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

@@ -58,7 +58,7 @@ public class Userspace implements Serializable {
     /**
      * 管理员
      */
-    @ManyToOne(cascade = {CascadeType.MERGE, CascadeType.REFRESH})
+    @ManyToOne
     @JoinColumn(name = "adminuu", insertable=false, updatable=false)
     private User admin;
 

sso-server/src/main/java/com/uas/sso/service/UserspaceValidService.java

@@ -19,4 +19,11 @@ public interface UserspaceValidService {
      * @param submitter 提交申请信息人
      */
     void submitValid(Userspace userspace, User submitter);
+
+    /**
+     * 获取待认证企业信息
+     * @param spaceUU 企业uu号
+     * @return
+     */
+    Userspace getToBeCertified(Long spaceUU);
 }

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

@@ -522,7 +522,7 @@ public class UserServiceImpl implements UserService {
      */
     private User syncUserInfo(User user, String noEncryPwd, final String msg) {
         List<String> apps = appService.findUid();
-
+        final boolean hasQuestion = user.getQuestions() != null;
         try {
             // 同步信息到im
             String imId = syncUserToIm(user, noEncryPwd);
@@ -542,6 +542,7 @@ public class UserServiceImpl implements UserService {
                     String url = tempApp.getBackUserUrl();
                     JSONObject formData = JSON.parseObject(JSON.toJSONString(finalUser));
                     formData.put("password", finalUser.getPassword());
+                    formData.put("hasQuestion", hasQuestion);
                     HttpUtil.ResponseWrap res = null;
                     try {
                         res = HttpUtil.doPost(url, formData, 30000);

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

@@ -111,6 +111,7 @@ public class UserspaceServiceImpl implements UserspaceService {
 
     private void syncUserSpaceInfo(final UserSpaceView userSpaceView, final String msg) {
         List<String> apps = appService.findUid();
+        final UserView admin = userSpaceView.getAdmin();
         userSpaceView.setAdminUU(userSpaceView.getAdmin().getUserUU());
         userSpaceView.setAdmin(null);
 
@@ -122,6 +123,7 @@ public class UserspaceServiceImpl implements UserspaceService {
                         && !StringUtils.isEmpty(tempApp.getBackSpaceUrl())) {
                     String url = tempApp.getBackSpaceUrl();
                     JSONObject formData = JSON.parseObject(JSON.toJSONString(userSpaceView));
+                    formData.putAll(JSON.parseObject(JSON.toJSONString(admin)));
                     HttpUtil.ResponseWrap res = null;
                     try {
                         res = HttpUtil.doPost(url, formData, 30000);

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

@@ -1,5 +1,6 @@
 package com.uas.sso.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.uas.sso.core.Status;
 import com.uas.sso.dao.UserspaceValidDao;
 import com.uas.sso.entity.User;
@@ -8,8 +9,10 @@ import com.uas.sso.entity.UserspaceValid;
 import com.uas.sso.service.UserspaceValidService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.sql.Timestamp;
+import java.util.List;
 
 /**
  * @author wangmh
@@ -29,4 +32,13 @@ public class UserspaceValidServiceImpl implements UserspaceValidService {
         userspaceValid.setSubmitDate(new Timestamp(System.currentTimeMillis()));
         userspaceValidDao.save(userspaceValid);
     }
+
+    @Override
+    public Userspace getToBeCertified(Long spaceUU) {
+        List<UserspaceValid> userspaceValids = userspaceValidDao.findBySpaceUUAndValidCode(spaceUU, (short) Status.TO_BE_CERTIFIED.getCode());
+        if (!CollectionUtils.isEmpty(userspaceValids)) {
+            return JSON.parseObject(userspaceValids.get(0).getSubmitInfo(), Userspace.class);
+        }
+        return null;
+    }
 }