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

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

@@ -23,7 +23,7 @@ public class ApplyUserSpaceView implements Serializable {
     /**
      * 用户
      */
-    private UserView userView;
+    private UserView user;
 
     /**
      * 企业uu号
@@ -33,7 +33,7 @@ public class ApplyUserSpaceView implements Serializable {
     /**
      * 企业信息
      */
-    private UserSpaceView userSpaceView;
+    private UserSpaceView userspace;
 
     /**
      * 申请状态
@@ -61,12 +61,12 @@ public class ApplyUserSpaceView implements Serializable {
         this.userUU = userUU;
     }
 
-    public UserView getUserView() {
-        return userView;
+    public UserView getUser() {
+        return user;
     }
 
-    public void setUserView(UserView userView) {
-        this.userView = userView;
+    public void setUser(UserView user) {
+        this.user = user;
     }
 
     public Long getSpaceUU() {
@@ -77,12 +77,12 @@ public class ApplyUserSpaceView implements Serializable {
         this.spaceUU = spaceUU;
     }
 
-    public UserSpaceView getUserSpaceView() {
-        return userSpaceView;
+    public UserSpaceView getUserspace() {
+        return userspace;
     }
 
-    public void setUserSpaceView(UserSpaceView userSpaceView) {
-        this.userSpaceView = userSpaceView;
+    public void setUserspace(UserSpaceView userspace) {
+        this.userspace = userspace;
     }
 
     public int getStatus() {

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

@@ -131,7 +131,7 @@ public class UserAccount implements Serializable {
         this.lastLoginTime = lastLoginTime;
     }
 
-    public UserAccount(Long userUU, String vipName, String mobile, String mobileArea, Short mobileValidCode, String password, String salt, String email, Short emailValidCode, Short identityValidCode, Short lock, Date lastLoginTime) {
+    public UserAccount(Long userUU, String vipName, String mobile, String mobileArea, Short mobileValidCode, String password, String salt, String email, Short emailValidCode, Short identityValidCode, Short lock, String appId, Date lastLoginTime) {
         this.userUU = userUU;
         this.vipName = vipName;
         this.mobile = mobile;
@@ -143,6 +143,7 @@ public class UserAccount implements Serializable {
         this.emailValidCode = emailValidCode;
         this.identityValidCode = identityValidCode;
         this.lock = lock;
+        this.appId = appId;
         this.lastLoginTime = lastLoginTime;
     }
 

sso-common/src/main/java/com/uas/sso/util/AccountUtils.java

@@ -223,7 +223,7 @@ public class AccountUtils {
         if (!StringUtils.isEmpty(saveUrl)) {
             ModelMap formData = new ModelMap();
             saveUrl = saveUrl + "/info/name";
-            formData.put("spaceName", spaceName);
+            formData.put("name", spaceName);
             HttpUtil.ResponseWrap res = HttpUtil.doGet(saveUrl, formData);
             if (!res.isSuccess()) {
                 throw new Exception(res.getContent());

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

@@ -126,7 +126,8 @@ public class UpdateUserController extends BaseController {
         }
 
         // 根据邮箱找到用户
-        User user = userService.findByUsername(email);
+        UserAccount userAccount = SystemSession.getUserAccount();
+        User user = userService.findOne(userAccount.getUserUU());
 
         // 设置发送邮件信息
         Token token = new Token(user.getUserUU(), EXPIRES);
@@ -416,4 +417,47 @@ public class UpdateUserController extends BaseController {
         return success();
     }
 
+    /**
+     * 设置手机号是校验手机号是否被注册
+     * @param mobile 手机号
+     * @return
+     */
+    @RequestMapping(value = "/mobile/hasRegister", method = RequestMethod.GET)
+    public ModelMap checkMobile(String mobile) {
+        UserAccount loginUser = SystemSession.getUserAccount();
+        if (loginUser == null) {
+            return error("未登录");
+        }
+        if (mobile.equals(loginUser.getMobile())) {
+            return success(new ModelMap("hasRegister", false));
+        }
+
+        User user = userService.findByMobile(mobile);
+        if (user != null) {
+            return success(new ModelMap("hasRegister", true));
+        }
+        return success(new ModelMap("hasRegister", false));
+    }
+
+    /**
+     * 设置邮箱时校验邮箱是否被注册
+     * @param email 手机号
+     * @return
+     */
+    @RequestMapping(value = "/email/hasRegister", method = RequestMethod.GET)
+    public ModelMap checkEmail(String email) {
+        UserAccount loginUser = SystemSession.getUserAccount();
+        if (loginUser == null) {
+            return error("未登录");
+        }
+        if (email.equals(loginUser.getEmail())) {
+            return success(new ModelMap("hasRegister", false));
+        }
+
+        List<User> users = userService.findByEmail(email);
+        if (!CollectionUtils.isEmpty(users)) {
+            return success(new ModelMap("hasRegister", true));
+        }
+        return success(new ModelMap("hasRegister", false));
+    }
 }

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

@@ -147,15 +147,15 @@ public class UserspaceManagerController extends BaseController {
 
     /**
      * 根据企业名称查询企业
-     * @param spaceName 企业名称
+     * @param name 企业名称
      * @return 企业信息
      */
     @RequestMapping(value = "/info/name", method = RequestMethod.GET)
-    public ModelMap findByName(String spaceName) {
-        if (StringUtils.isEmpty(spaceName)) {
+    public ModelMap findByName(String name) {
+        if (StringUtils.isEmpty(name)) {
             return success();
         }
-        return success(userspaceService.findBySpaceName(spaceName));
+        return success(userspaceService.findBySpaceName(name));
     }
 
     /**

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

@@ -116,8 +116,6 @@ public class ApplyUserSpace implements Serializable {
         this.spaceUU = spaceUU;
     }
 
-    @JsonIgnore
-    @JSONField(serialize = false)
     public Userspace getUserspace() {
         return userspace;
     }

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

@@ -68,7 +68,7 @@ public class AppealServiceImpl implements AppealService {
         ModelMap data = new ModelMap(userspace);
         data.put("newAdminName", newAdmin == null ? appeal.getContactName() : newAdmin.getVipName());
         data.put("newAdminMobile", newAdmin == null ? appeal.getMobile() : newAdmin.getMobile());
-        data.put("newAdminEmail", newAdmin == null ? null : newAdmin.getEmail());
+        data.put("newAdminEmail", newAdmin == null ? appeal.getContactEmail() : newAdmin.getEmail());
         appeal.setSubmitInfo(JSON.toJSONString(data));
         appeal.setStatus((short) Status.TO_BE_CERTIFIED.getCode());
         appeal.setType(Appeal.Type.CHANGE_ADMIN.getDesc());

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

@@ -172,7 +172,7 @@ public class ApplyUserSpaceServiceImpl implements ApplyUserSpaceService {
 
     @Override
     public Page<ApplyUserSpace> findApplyByUserUU(final Long userUU, int page, int size) {
-        Pageable pageable = new PageRequest(page, size);
+        Pageable pageable = PageInfo.pageRequest(page, size);
         Page<ApplyUserSpace> pApply = applyUserSpaceDao.findAll(new Specification<ApplyUserSpace>() {
             @Override
             public Predicate toPredicate(Root<ApplyUserSpace> root, CriteriaQuery<?> query, CriteriaBuilder cb) {

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

@@ -26,7 +26,7 @@ public class PersonalAccountServiceImpl implements PersonalAccountService {
      */
     private static final String JPQL= "select new com.uas.sso.entity.UserAccount(user.userUU, user.vipName, user.mobile, user.mobileArea, " +
             "user.mobileValidCode, user.password, user.salt, user.email, user.emailValidCode, " +
-            "user.identityValidCode, user.lock, ur.lastLoginTime) from UserRecord ur, User user where user.userRecord.id = ur.id ";
+            "user.identityValidCode, user.lock, app.uid, ur.lastLoginTime) from UserRecord ur, User user, App app where user.userRecord.id = ur.id ";
 
     @Override
     public List<UserAccount> findAll() {

sso-server/src/main/resources/dev/account.properties

@@ -4,7 +4,7 @@ sso.app=sso
 sso.secretkey=0taQcW073Z7G628g5H
 #sso.cookie.domain=ubtob.com
 sso.cookie.secure=false
-sso.front.url=http://10.1.51.37:3001
+sso.front.url=http://192.168.253.118:3001
 
 ### crossdomain verify
 sso.authcookie.secretkey=Z318866alN6gA0piuO