企业注册bug修复

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

@@ -117,13 +117,14 @@ public class UserspaceRegisterController extends BaseController {
         if (admin == null) {
             // 新用户直接注册
             admin = new User();
+            admin.setMobile(mobile);
             admin.setVipName(adminName);
             admin.setPassword(password);
             admin.setEmail(adminEmail);
             userService.register(admin);
         } else if (StringUtils.isEmpty(admin.getEmail())) {
             // 老用户校验密码
-            userService.checkPassword(admin.getUserUU(), admin.getPassword(), false);
+            userService.checkPassword(admin.getUserUU(), user.getPassword(), false);
 
             // 老用户邮箱为空的话设置邮箱
             admin.setEmail(adminEmail);

sso-server/src/main/java/com/uas/sso/dao/UserspaceDao.java

@@ -3,6 +3,7 @@ package com.uas.sso.dao;
 import com.uas.sso.entity.Userspace;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 /**
  * 企业信息dao，Userspace实体中spaceUU为主键
@@ -27,4 +28,11 @@ public interface UserspaceDao extends JpaRepository<Userspace, Long>, JpaSpecifi
      * @return
      */
     Userspace findByBusinessCode(String businessCode);
+
+    /**
+     * 找到企业最大的uu号
+     * @return 最大的uu号
+     */
+    @Query("select max(us.spaceUU) from Userspace us")
+    Long findMaxUU();
 }

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

@@ -45,7 +45,7 @@ public class RegisterLog extends BaseLog {
     /**
      * 当前步数提交信息详情
      */
-    @Column(name = "msgDetail")
+    @Column(name = "msgDetail", length = 2000)
     private String msgDetail;
 
     /**

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

@@ -59,13 +59,13 @@ public class UserLog extends BaseLog implements Serializable {
     /**
      * 修改后用户信息
      */
-    @Column(name = "userMsg", nullable = false)
+    @Column(name = "userMsg", nullable = false, length = 2000)
     private String userMsg;
 
     /**
      * 其他信息
      */
-    @Column(name = "otherMsg")
+    @Column(name = "otherMsg", length = 2000)
     private String otherMsg;
 
     public UserLog() {

sso-server/src/main/java/com/uas/sso/logging/RegisterBufferedLogger.java

@@ -16,7 +16,7 @@ import com.uas.sso.util.ContextUtils;
  */
 public class RegisterBufferedLogger extends Logger<RegisterLog> {
 
-    private RegisterBufferedLogger() {
+    RegisterBufferedLogger() {
         super(ContextUtils.getBean(RegisterLogService.class));
     }
 

sso-server/src/main/java/com/uas/sso/logging/UserBufferedLogger.java

@@ -14,7 +14,7 @@ import com.uas.sso.util.ContextUtils;
  */
 public class UserBufferedLogger extends Logger<UserLog> {
 
-    private UserBufferedLogger() {
+    UserBufferedLogger() {
         super(ContextUtils.getBean(UserLogService.class));
     }