字段名修改

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

@@ -46,8 +46,8 @@ public class UserAccount implements Serializable {
     /**
      * 手机号认证状态
      */
-    @Column(name = "mobile_is_valid")
-    private Short mobileIsValid;
+    @Column(name = "mobile_valid_code")
+    private Short mobileValidCode;
 
     /**
      * 用户密码
@@ -76,8 +76,8 @@ public class UserAccount implements Serializable {
     /**
      * 用户邮箱认证状态
      */
-    @Column(name = "email_is_valid")
-    private Short emailIsValid;
+    @Column(name = "email_valid_code")
+    private Short emailValidCode;
 
     /**
      * 账户是否冻结（1、冻结）
@@ -147,12 +147,12 @@ public class UserAccount implements Serializable {
         this.mobileArea = mobileArea;
     }
 
-    public Short getMobileIsValid() {
-        return mobileIsValid;
+    public Short getMobileValidCode() {
+        return mobileValidCode;
     }
 
-    public void setMobileIsValid(Short mobileIsValid) {
-        this.mobileIsValid = mobileIsValid;
+    public void setMobileValidCode(Short mobileValidCode) {
+        this.mobileValidCode = mobileValidCode;
     }
 
     public String getPassword() {
@@ -187,12 +187,12 @@ public class UserAccount implements Serializable {
         this.email = email;
     }
 
-    public Short getEmailIsValid() {
-        return emailIsValid;
+    public Short getEmailValidCode() {
+        return emailValidCode;
     }
 
-    public void setEmailIsValid(Short emailIsValid) {
-        this.emailIsValid = emailIsValid;
+    public void setEmailValidCode(Short emailValidCode) {
+        this.emailValidCode = emailValidCode;
     }
 
     public Integer getLock() {

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

@@ -59,8 +59,8 @@ public interface UserDao extends JpaRepository<User, Long>, JpaSpecificationExec
      * 根据邮箱查找用户信息
      *
      * @param email 邮箱
-     * @param emailIsValid 邮箱认证状态
+     * @param emailValidCode 邮箱认证状态
      * @return
      */
-    List<User> findByEmailAndEmailIsValid(String email, Short emailIsValid);
+    List<User> findByEmailAndEmailValidCode(String email, Short emailValidCode);
 }

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

@@ -47,8 +47,8 @@ public class User implements Serializable {
     /**
      * 手机号认证状态
      */
-    @Column(name = "mobile_is_valid")
-    private Short mobileIsValid;
+    @Column(name = "mobile_valid_code")
+    private Short mobileValidCode;
 
     /**
      * 用户密码
@@ -83,8 +83,8 @@ public class User implements Serializable {
     /**
      * 用户邮箱
      */
-    @Column(name = "email_is_valid")
-    private Short emailIsValid;
+    @Column(name = "email_valid_code")
+    private Short emailValidCode;
 
     /**
      * 用户真实姓名
@@ -101,8 +101,8 @@ public class User implements Serializable {
     /**
      * 用户身份认证状态
      */
-    @Column(name = "identity_is_valid")
-    private Short identityIsValid;
+    @Column(name = "identity_valid_code")
+    private Short identityValidCode;
 
     /**
      * 用户注册应用
@@ -202,12 +202,12 @@ public class User implements Serializable {
         this.mobileArea = mobileArea;
     }
 
-    public Short getMobileIsValid() {
-        return mobileIsValid;
+    public Short getMobileValidCode() {
+        return mobileValidCode;
     }
 
-    public void setMobileIsValid(Short mobileIsValid) {
-        this.mobileIsValid = mobileIsValid;
+    public void setMobileValidCode(Short mobileValidCode) {
+        this.mobileValidCode = mobileValidCode;
     }
 
     public String getPassword() {
@@ -250,12 +250,12 @@ public class User implements Serializable {
         this.email = email;
     }
 
-    public Short getEmailIsValid() {
-        return emailIsValid;
+    public Short getEmailValidCode() {
+        return emailValidCode;
     }
 
-    public void setEmailIsValid(Short emailIsValid) {
-        this.emailIsValid = emailIsValid;
+    public void setEmailValidCode(Short emailValidCode) {
+        this.emailValidCode = emailValidCode;
     }
 
     public String getRealName() {
@@ -274,12 +274,12 @@ public class User implements Serializable {
         this.idCard = idCard;
     }
 
-    public Short getIdentityIsValid() {
-        return identityIsValid;
+    public Short getIdentityValidCode() {
+        return identityValidCode;
     }
 
-    public void setIdentityIsValid(Short identityIsValid) {
-        this.identityIsValid = identityIsValid;
+    public void setIdentityValidCode(Short identityValidCode) {
+        this.identityValidCode = identityValidCode;
     }
 
     public String getFromApp() {

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

@@ -115,8 +115,8 @@ public class Userspace implements Serializable {
     /**
      * 企业信息认证状态
      */
-    @Column(name = "is_valid")
-    private Short isValid;
+    @Column(name = "valid_code")
+    private Short validCode;
 
     /**
      * logo图片
@@ -246,12 +246,12 @@ public class Userspace implements Serializable {
         this.companyAddress = companyAddress;
     }
 
-    public Short getIsValid() {
-        return isValid;
+    public Short getValidCode() {
+        return validCode;
     }
 
-    public void setIsValid(Short isValid) {
-        this.isValid = isValid;
+    public void setValidCode(Short validCode) {
+        this.validCode = validCode;
     }
 
     public String getLogoImage() {

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

@@ -70,9 +70,9 @@ public class UserServiceImpl implements UserService {
         Long uu = userDao.findMaxUU();
         user.setUserUU(uu == null ? 10000 : (uu + 1));
         user.setSalt(String.valueOf(user.getUserUU()));
-        user.setMobileIsValid((short) Status.AUTHENTICATED.getCode());
-        user.setEmailIsValid((short) Status.NOT_APPLYING.getCode());
-        user.setIdentityIsValid((short) Status.NOT_APPLYING.getCode());
+        user.setMobileValidCode((short) Status.AUTHENTICATED.getCode());
+        user.setEmailValidCode((short) Status.NOT_APPLYING.getCode());
+        user.setIdentityValidCode((short) Status.NOT_APPLYING.getCode());
         user.setPassword(getEncryPassword(Const.ENCRY_FORMAT, user.getPassword(), user.getSalt()));
 
         userDao.save(user);
@@ -130,7 +130,7 @@ public class UserServiceImpl implements UserService {
     @Override
     public void checkPasswordByEmail(String email, String password, boolean isEncry) {
         // 找到用户
-        List<User> oldUsers = userDao.findByEmailAndEmailIsValid(email, (short) Status.AUTHENTICATED.getCode());
+        List<User> oldUsers = userDao.findByEmailAndEmailValidCode(email, (short) Status.AUTHENTICATED.getCode());
         if (CollectionUtils.isEmpty(oldUsers)) {
             throw new VisibleError("该邮箱未认证，请使用手机号登录");
         }