fix:用户注册问题

oddfar · Aug 5, 2023 · 660e446 · 660e446
1 parent e141866
commit 660e446
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git a/campus-admin/pom.xml b/campus-admin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>campus</artifactId>
         <groupId>com.oddfar.campus</groupId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/campus-common/pom.xml b/campus-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>campus</artifactId>
         <groupId>com.oddfar.campus</groupId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/campus-framework/pom.xml b/campus-framework/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>campus</artifactId>
         <groupId>com.oddfar.campus</groupId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...-framework/src/main/java/com/oddfar/campus/framework/service/impl/SysUserServiceImpl.java b/...-framework/src/main/java/com/oddfar/campus/framework/service/impl/SysUserServiceImpl.java
@@ -5,6 +5,7 @@
 import com.oddfar.campus.common.domain.entity.SysUserEntity;
 import com.oddfar.campus.common.domain.entity.SysUserRoleEntity;
 import com.oddfar.campus.common.exception.ServiceException;
+import com.oddfar.campus.common.utils.SecurityUtils;
 import com.oddfar.campus.common.utils.StringUtils;
 import com.oddfar.campus.framework.api.sysconfig.ConfigExpander;
 import com.oddfar.campus.framework.mapper.SysRoleMapper;
@@ -97,6 +98,7 @@ public int insertUser(SysUserEntity user) {
                 && !(checkEmailUnique(user))) {
             throw new ServiceException("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         // 新增用户信息
         int rows = userMapper.insert(user);
         // 新增用户与角色管理

diff --git a/...s-framework/src/main/java/com/oddfar/campus/framework/web/service/SysRegisterService.java b/...s-framework/src/main/java/com/oddfar/campus/framework/web/service/SysRegisterService.java
@@ -56,7 +56,7 @@ public String register(RegisterBody registerBody) {
         } else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
                 || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
             msg = "密码长度必须在5到20个字符之间";
-        } else if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(sysUser))) {
+        } else if (!(userService.checkUserNameUnique(sysUser))) {
             msg = "保存用户'" + username + "'失败，注册账号已存在";
         } else {
             sysUser.setNickName(username);

diff --git a/campus-modular/pom.xml b/campus-modular/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>campus</artifactId>
         <groupId>com.oddfar.campus</groupId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.oddfar.campus</groupId>
     <artifactId>campus</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <packaging>pom</packaging>
 
     <name>campus</name>
@@ -21,7 +21,7 @@
     </modules>
 
     <properties>
-        <campus.version>1.1.4</campus.version>
+        <campus.version>1.1.5</campus.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
         <bitwalker.version>1.21</bitwalker.version>

diff --git a/vue_campus_admin/src/views/index.vue b/vue_campus_admin/src/views/index.vue
@@ -10,7 +10,7 @@ export default {
   data() {
     return {
       // 版本号
-      version: "3.8.4",
+      version: "1.1.5",
     };
   },
   methods: {