Merge remote-tracking branch 'origin/develop' into test

service-base/src/main/java/com/simuwang/base/components/ShiroLoginAuthAdapter.java

@@ -18,6 +18,9 @@ public record ShiroLoginAuthAdapter(UserAuthService userAuthService) implements
     @Override
     public ShiroUser findUserByUsername(String username) {
         SysUserDO userInfo = this.userAuthService.getUserInfoByUsername(username);
+        if (userInfo == null) {
+            return null;
+        }
         ShiroUser sysUser = new ShiroUser();
         sysUser.setUserId(userInfo.getUserId());
         sysUser.setUsername(userInfo.getUserName());

service-base/src/main/java/com/simuwang/base/pojo/dto/sys/UserAddCmd.java

@@ -30,7 +30,7 @@ public class UserAddCmd extends BaseAddCmd<SysUserDO> {
      */
     private String phonenumber;
     /**
-     * 密码在后端加密
+     * 密码在前端加密
      */
     private String password;
 
@@ -46,7 +46,7 @@ public class UserAddCmd extends BaseAddCmd<SysUserDO> {
         entity.setPhonenumber(this.phonenumber);
         entity.setStatus(this.status);
         entity.setRemark(this.remark);
-        // 密码要加密才OK
+        entity.setPassword(this.password);
         return entity;
     }
 }

service-base/src/main/java/com/simuwang/base/pojo/dto/sys/UserEditCmd.java

@@ -29,7 +29,7 @@ public class UserEditCmd extends BaseEditCmd<SysUserDO> {
      */
     private String phonenumber;
     /**
-     * 密码在后端加密
+     * 密码在前端加密
      */
     private String password;
 
@@ -46,7 +46,7 @@ public class UserEditCmd extends BaseEditCmd<SysUserDO> {
         entity.setPhonenumber(this.phonenumber);
         entity.setStatus(this.status);
         entity.setRemark(this.remark);
-        // 密码要加密才OK
+        entity.setPassword(this.password);
         return entity;
     }
 }

service-manage/src/main/java/com/simuwang/manage/service/impl/system/SysUserServiceImpl.java

@@ -92,7 +92,7 @@ public class SysUserServiceImpl implements SysUserService {
     public <C extends BaseAddCmd<SysUserDO>> void insert(C command) {
         UserAddCmd cmd = (UserAddCmd) command;
         SysUserDO entity = cmd.toEntity();
-        String originalPwd = cmd.getPassword();
+        String originalPwd = entity.getPassword();
         // 密码在前端已加密
         if (StrUtil.isBlank(originalPwd)) {
             originalPwd = this.properties.getDefaultPwd();