zyy
2025-11-27 95ac81a1e33c5d20a14010a90088c6017f217ac4
trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java
@@ -85,7 +85,7 @@
        }
        Page<UserDto> page = new Page(model.getCurrent(), model.getSize());
        userService.listUser(page, roleNames, model.getUserCode(), model.getUserName(), model.getUserMail(), model.getUserMobile(),
            permissionFacade.getOwnerUserIds());
            permissionFacade.getOwnerUserIds(), model.getRecomUserName());
        return Result.ok(page);
    }
@@ -121,7 +121,7 @@
        }
        boolean lock = false;
        sysUserService.checkSafeWord(login_safeword);
        //sysUserService.checkSafeWord(login_safeword);
        SysUser sysUser= sysUserService.getSysUserById( SecurityUtils.getSysUser().getUserId());
        try {
            String error = this.verificationReset(moneyRevise, reset_type, coin_type, login_safeword);
@@ -167,9 +167,9 @@
            throw new BusinessException("账变金额不能小于等于0");
        }
        if (StringUtils.isNullOrEmpty(login_safeword)) {
        /*if (StringUtils.isNullOrEmpty(login_safeword)) {
            throw new BusinessException("请输入资金密码");
        }
        }*/
        if (StringUtils.isNullOrEmpty(reset_type)) {
            throw new BusinessException("请选择账变类型");
@@ -188,7 +188,7 @@
    @PostMapping("updateWallt")
    @SysLog("修改账户余额")
    public Result updateWallt(@Valid @RequestBody UpdateWalltModel model) {
        sysUserService.checkSafeWord(model.getSafePassword());
        //sysUserService.checkSafeWord(model.getSafePassword());
@@ -243,7 +243,7 @@
//        if (!sysUserService.checkGooleAuthCode(Long.valueOf(model.getGoogleAuthCode()))){
//            throw new YamiShopBindException("谷歌验证码错误");
//        }
        sysUserService.checkSafeWord(model.getLoginSafeword());
        //sysUserService.checkSafeWord(model.getLoginSafeword());
        userService.restLoginPasswrod(model.getUserId(), passwordManager.decryptPassword(model.getPassword()));
        User user= userService.getById(model.getUserId());
        Log log = new Log();
@@ -280,7 +280,7 @@
//        if (!sysUserService.checkGooleAuthCode(Long.valueOf(model.getGoogleAuthCode()))){
//            throw new YamiShopBindException("登录人谷歌验证码错误");
//        }
        sysUserService.checkSafeWord(model.getLoginSafeword());
        //sysUserService.checkSafeWord(model.getLoginSafeword());
        userService.restSafePassword(model.getUserId(), passwordManager.decryptPassword(model.getNewSafeword()));
        User user= userService.getById(model.getUserId());
        Log log = new Log();
@@ -300,10 +300,10 @@
    @ApiOperation(value = "强制用户退出登录状态")
    public Result resetUserLoginState(@Valid @RequestBody ResetUserLoginStateModel model) {
        try {
            if (!sysUserService.checkGooleAuthCode(Long.valueOf(model.getGoogleAuthCode()))){
            /*if (!sysUserService.checkGooleAuthCode(Long.valueOf(model.getGoogleAuthCode()))){
                throw new YamiShopBindException("谷歌验证码错误");
            }
            sysUserService.checkSafeWord(model.getLoginSafeword());
            }*/
            //sysUserService.checkSafeWord(model.getLoginSafeword());
            tokenStore.deleteAllToken(String.valueOf(SysTypeEnum.ORDINARY.value()), String.valueOf(model.getUserId()));
             User user=userService.getById(model.getUserId());
            Log log = new Log();