fix

wholesale/src/main/java/com/yhlxj/dao/model/entity/WholesaleUser.java

@@ -22,4 +22,5 @@ public class WholesaleUser extends BaseEntity {
     private String password;
     private String token;
     private Date expireTime;
+    private String exchangeCode;
 }

wholesale/src/main/java/com/yhlxj/service/code/impl/ExchangeCodeServiceImpl.java

@@ -86,6 +86,7 @@ public class ExchangeCodeServiceImpl implements ExchangeCodeService {
 		}else {
 			wholesaleUser.setExpireTime(DateUtil.offsetDay(wholesaleUser.getExpireTime(), 30));
 		}
+		wholesaleUser.setExchangeCode(code);
 		wholesaleUserMapper.updateById(wholesaleUser);
 	}
 }

wholesale/src/main/java/com/yhlxj/service/wholesale/impl/WholesaleUserServiceImpl.java

@@ -24,9 +24,7 @@ public class WholesaleUserServiceImpl extends ServiceImpl<WholesaleUserMapper, W
             throw new BusinessRuntimeException("用户不存在.");
         }
 
-        String encodePasscode = Codec.DoDigest.custom().setAlgorithm(Codec.DoDigest.Algorithm.SHA256).setStringData(password).toBase64String();
-
-        if (!StringUtils.equals(wholesaleUser.getPassword(), encodePasscode)) {
+        if (!StringUtils.equals(wholesaleUser.getPassword(), password)) {
             throw new BusinessRuntimeException("密码有误.");
         }
         wholesaleUser.setPassword(null);
@@ -43,8 +41,9 @@ public class WholesaleUserServiceImpl extends ServiceImpl<WholesaleUserMapper, W
         wholesaleUser = new WholesaleUser();
         wholesaleUser.setWholesaleId(wholesaleId);
         wholesaleUser.setUsername(username);
-        String encodePasscode = Codec.DoDigest.custom().setAlgorithm(Codec.DoDigest.Algorithm.SHA256).setStringData(password).toBase64String();
-        wholesaleUser.setPassword(encodePasscode);
+        wholesaleUser.setPassword(password);
+        //String encodePasscode = Codec.DoDigest.custom().setAlgorithm(Codec.DoDigest.Algorithm.SHA256).setStringData(password).toBase64String();
+        //wholesaleUser.setPassword(encodePasscode);
         baseMapper.insert(wholesaleUser);
         return wholesaleUser;
     }

wholesale/src/main/java/com/yhlxj/web/controller/manage/WholesaleController.java

@@ -135,7 +135,7 @@ public class WholesaleController {
     public Result<Page<WholesaleUser>> listUser(String username, @RequestParam(defaultValue = "1") Integer start, @RequestParam(defaultValue = "10") Integer limit) {
         long wholesaleId = StpUtil.getLoginIdAsLong();
         return GatewayResponse.SUCCESS.newBuilder().toResult(wholesaleUserService.page(new Page<>(start, limit),
-                Wrappers.lambdaQuery(WholesaleUser.class).eq(WholesaleUser::getWholesaleId, wholesaleId).like(WholesaleUser::getUsername, username).orderByDesc(WholesaleUser::getId)));
+                Wrappers.lambdaQuery(WholesaleUser.class).eq(WholesaleUser::getWholesaleId, wholesaleId).like(StringUtils.isNoneBlank(username),WholesaleUser::getUsername, username).orderByDesc(WholesaleUser::getId)));
     }