1

zj

5 days ago 3d8c9b6f4455b4efd34812c8e66073bebfacfce7

1

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodAddModel.java

@@ -45,7 +45,6 @@
    private  String remark;

    @ApiModelProperty("资金密码")
    @NotBlank
    private  String loginSafeword;

}

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodDeleteModel.java

@@ -16,7 +16,6 @@


    @ApiModelProperty("资金密码")
    @NotBlank
    private  String loginSafeword;

}

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/model/PaymentMethodUpdateModel.java

@@ -48,7 +48,6 @@
    private  String remark;

    @ApiModelProperty("资金密码")
    @NotBlank
    private  String loginSafeword;

}

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/BannerController.java

@@ -64,11 +64,6 @@
    @ApiOperation(value = "新增")
    @PostMapping("add")
    public Result<?> add(@RequestBody @Valid BannerModel model) {
        model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
        SysUser sysUser = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
        if (!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
            throw new YamiShopBindException("资金密码不正确!");
        }
        if (StrUtil.isEmpty(model.getImage())){
            throw new YamiShopBindException("展示图片不能为空");
        }
@@ -88,11 +83,6 @@
    @ApiOperation(value = "更新")
    @PostMapping("update")
    public Result<?> update(@RequestBody @Valid BannerModel model) {
        model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
        SysUser sysUser = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
        if (!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
            throw new YamiShopBindException("资金密码不正确!");
        }
        if (StrUtil.isEmpty(model.getImage())){
            throw new YamiShopBindException("展示图片不能为空");
        }

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/CmsController.java

@@ -75,11 +75,6 @@
    @ApiOperation(value = "新增")
    @PostMapping("add")
    public Result<?> add(@RequestBody @Valid CmsModel model) {
        model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
        SysUser sysUser = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
        if (!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
            throw new YamiShopBindException("资金密码不正确!");
        }
        Cms cms = new Cms();
        cms.setContent(model.getContent());
        cms.setLanguage(model.getLanguage());
@@ -100,11 +95,6 @@
    @ApiOperation(value = "更新")
    @PostMapping("update")
    public Result<?> update(@RequestBody @Valid CmsModel model) {
        model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
        SysUser sysUser = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
        if (!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
            throw new YamiShopBindException("资金密码不正确!");
        }
        Cms cms = cmsService.getById(model.getId());
        if (cms == null) {
            throw new YamiShopBindException("参数错误!");

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/NewsController.java

@@ -65,11 +65,6 @@
    @ApiOperation(value = "新增")
    @PostMapping("add")
    public  Result<?> add(@RequestBody @Valid NewsModel model){
        model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
        SysUser sysUser = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
        if (!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
            throw new YamiShopBindException("资金密码不正确!");
        }
        News news=new News();
        if (!StringUtils.isEmptyString(model.getUserCode())) {
            User user= userService.findUserByUserCode(model.getUserCode());
@@ -98,11 +93,6 @@
    @ApiOperation(value = "更新")
    @PostMapping("update")
    public  Result<?> update(@RequestBody @Valid NewsModel model){
        model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
        SysUser sysUser = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
        if (!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
            throw new YamiShopBindException("资金密码不正确!");
        }
        News news=newsSerivce.getById(model.getId());
        if (news==null){
            throw  new YamiShopBindException("参数错误!");

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/cms/model/DeleteModel.java

@@ -15,6 +15,5 @@


    @ApiModelProperty("登录人资金密码")
    @NotBlank
    private String loginSafeword;
}

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/customer/model/ForceOfflineModel.java

@@ -13,7 +13,6 @@
    private String id;

    @ApiModelProperty("资金密码")
    @NotBlank
    private String loginSafeword;

}

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/exchange/model/SuccessModel.java

@@ -11,7 +11,6 @@
public class SuccessModel {

    @ApiModelProperty("登录人资金密码")
    @NotBlank
    private  String loginSafeword;



 trading-order-admin/src/main/java/com/yami/trading/admin/controller/miner/AdminMinerController.java

@@ -527,13 +527,7 @@
     * @param loginSafeword
     */
    protected void checkLoginSafeword(User secUser,String operatorUsername,String loginSafeword) {
//        SecUser sec = this.secUserService.findUserByLoginName(operatorUsername);
        String sysSafeword = secUser.getSafePassword();

        String safeword_md5 = passwordEncoder.encode(loginSafeword);
        if (!safeword_md5.equals(sysSafeword)) {
            throw new BusinessException("登录人资金密码错误");
        }
        // 登录人资金密码校验已关闭
    }

//    public String toDelete() {

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/syspara/SysparaController.java

@@ -172,9 +172,6 @@


    private void verification(SysparasDto sysparasDto) {
        if (StringUtils.isEmpty(sysparasDto.getLogin_safeword())) {
            throw new YamiShopBindException("The fund password cannot be blank");
        }
        if (StringUtils.isEmpty(sysparasDto.getSuper_google_auth_code())) {
            throw new YamiShopBindException("谷歌验证码不能为空");
        }

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserRecomController.java

@@ -66,11 +66,6 @@
    @ApiOperation("修改推荐关系")
    public Result<Page<UserRecomDto>> update(@Valid @RequestBody UserRecomUpdateModel model) {

        model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
        SysUser sysUser = sysUserService.getSysUserById( SecurityUtils.getSysUser().getUserId());
        if(!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
            throw new YamiShopBindException("资金密码不正确!");
        }
       UserRecom userRecom= userRecomService.getById(model.getId());
        if (userRecom==null){
            throw  new YamiShopBindException("参数错误!");

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/WithdrawController.java

@@ -91,11 +91,6 @@
    public Result<?> changeAddress(@RequestBody @Valid ChangeAddressModel model) {
        String adminUserName = SecurityUtils.getSysUser().getUsername();
        Long adminUserId = SecurityUtils.getSysUser().getUserId();
        model.setSafeWord(passwordManager.decryptPassword(model.getSafeWord()));
        SysUser user = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
        if (passwordEncoder.matches(model.getSafeWord(), user.getSafePassword())) {
            throw new YamiShopBindException("资金密码不正确!");
        }
        withdrawService.updateAddress(model.getId(), adminUserName, adminUserId, model.getChangeAfterAddress());
        return Result.ok(null);


 trading-order-admin/src/main/java/com/yami/trading/admin/facade/CustomerServiceImpl.java

@@ -263,8 +263,7 @@
        onlineChatMessageService.updateNoAnwserUser(username);
    }
    public void updatePersonalAutoAnswer(String username,String loginSafeword,String ip,String autoAnswer) {
        userService.checkSafeWord(loginSafeword);
        SysUser user = userService.getByUserName(username);
        SysUser user = sysUserService.getByUserName(username);
        updateAutoAnswer(user,username,ip,autoAnswer);
    }
    public void updateAutoAnswer(SysUser user,String operatorUsername,String ip,String autoAnswer) {

 trading-order-admin/src/main/java/com/yami/trading/admin/model/AgentAndModel.java

@@ -20,7 +20,6 @@


    @ApiModelProperty("登录人资金密码")
    @NotBlank
    private String safeword;



 trading-order-admin/src/main/java/com/yami/trading/admin/model/BannerModel.java

@@ -15,7 +15,6 @@
    private String id;

    @ApiModelProperty("资金密码")
    @NotBlank
    private String loginSafeword;

    @ApiModelProperty("语言")

 trading-order-admin/src/main/java/com/yami/trading/admin/model/ChangeAddressModel.java

@@ -18,7 +18,6 @@
    private String changeAfterAddress;


    @NotBlank
    @ApiModelProperty("资金密码")
    private  String safeWord;
}

 trading-order-admin/src/main/java/com/yami/trading/admin/model/CheckSafeWordModel.java

@@ -11,6 +11,5 @@
public class CheckSafeWordModel {

    @ApiModelProperty("登录人资金密码")
    @NotBlank
    private  String loginSafeword;
}

 trading-order-admin/src/main/java/com/yami/trading/admin/model/CmsModel.java

@@ -15,7 +15,6 @@
    private String id;

    @ApiModelProperty("资金密码")
    @NotBlank
    private String loginSafeword;



 trading-order-admin/src/main/java/com/yami/trading/admin/model/DeleteGooleAuthCodeModel.java

@@ -20,6 +20,5 @@
    private  String  googleAuthCode;

    @ApiModelProperty("登录人资金密码")
    @NotBlank
    private  String loginSafeword;
}

 trading-order-admin/src/main/java/com/yami/trading/admin/model/GooleAuthUnbindingModel.java

@@ -10,7 +10,6 @@
@ApiModel
public class GooleAuthUnbindingModel {

    @NotBlank
    @ApiModelProperty("资金密码")
    private  String safeWord;


 trading-order-admin/src/main/java/com/yami/trading/admin/model/ManualReceiptModel.java

@@ -20,6 +20,5 @@
    private BigDecimal amount;

    @ApiModelProperty("资金密码")
    @NotBlank
    private  String safePasssword;
}

 trading-order-admin/src/main/java/com/yami/trading/admin/model/ManualReleaseModel.java

@@ -18,5 +18,4 @@


    @ApiModelProperty("资金密码")
    @NotBlank
    private  String safeword;}

 trading-order-admin/src/main/java/com/yami/trading/admin/model/NewsModel.java

@@ -14,7 +14,6 @@
    @ApiModelProperty("修改传id  新增不传")
    private String id;
    @ApiModelProperty("资金密码")
    @NotBlank
    private String loginSafeword;
    @ApiModelProperty("标题")
    @NotBlank

 trading-order-admin/src/main/java/com/yami/trading/admin/model/ResetUserLoginStateModel.java

@@ -16,7 +16,6 @@


    @ApiModelProperty("资金密码")
    @NotBlank
    private  String loginSafeword;

    @ApiModelProperty("userid")

 trading-order-admin/src/main/java/com/yami/trading/admin/model/RestLoginPasswrodModel.java

@@ -16,7 +16,6 @@
    private  String  googleAuthCode;

    @ApiModelProperty("登录人资金密码")
    @NotBlank
    private  String loginSafeword;



 trading-order-admin/src/main/java/com/yami/trading/admin/model/RestPasswordModel.java

@@ -20,6 +20,5 @@


    @ApiModelProperty("登录人资金密码")
    @NotBlank
    private String safeword;
}

 trading-order-admin/src/main/java/com/yami/trading/admin/model/RestSafePasswordModel.java

@@ -21,7 +21,6 @@
    private  String  googleAuthCode;

    @ApiModelProperty("登录人资金密码")
    @NotBlank
    private  String loginSafeword;

    @ApiModelProperty("新资金密码")

 trading-order-admin/src/main/java/com/yami/trading/admin/model/UserRecomUpdateModel.java

@@ -19,6 +19,5 @@


    @ApiModelProperty("登录人资金密码")
    @NotBlank
    private  String loginSafeword;
}

 trading-order-admin/src/main/java/com/yami/trading/admin/model/WithdrawExamineModel.java

@@ -16,6 +16,5 @@


    @ApiModelProperty("资金密码")
    @NotBlank
    private  String safePasssword;
}

 trading-order-admin/src/main/java/com/yami/trading/admin/model/c2c/C2cPaymentMethodConfigDeleteModel.java

@@ -18,7 +18,6 @@


    @ApiModelProperty("登录资金人密码")
    @NotBlank
    private  String  loginSafeword;

}

 trading-order-admin/src/main/java/com/yami/trading/admin/model/c2c/C2cPaymentMethodConfigUpdateModel.java

@@ -115,7 +115,6 @@


    @ApiModelProperty("登录资金人密码")
    @NotBlank
    private  String  loginSafeword;

}

 trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerAddModel.java

@@ -31,7 +31,6 @@
    private boolean enabled;

    @ApiModelProperty("登录人资金密码")
    @NotBlank
    private String loginSafeword;

    @ApiModelProperty("超级管理员谷歌验证码")

 trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerPasswordModel.java

@@ -19,7 +19,6 @@
    private String password;

    @ApiModelProperty("登录人资金密码")
    @NotBlank
    private String loginSafeword;

    @ApiModelProperty("超级管理员谷歌验证码")

 trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/CustomerUpdateModel.java

@@ -23,7 +23,6 @@
    @ApiModelProperty("登录权限  true 开启 false 禁用")
    private boolean enabled;
    @ApiModelProperty("登录人资金密码")
    @NotBlank
    private String loginSafeword;

    @ApiModelProperty("备注")

 trading-order-admin/src/main/java/com/yami/trading/admin/model/customer/ForceOfflineModel.java

@@ -17,6 +17,5 @@


    @ApiModelProperty("登录人资金密码")
    @NotBlank
    private  String loginSafeword;
}

 trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java

@@ -937,9 +937,6 @@
        if (!flag && Long.valueOf(googleAuthCode) != 998899) {
            throw new YamiShopBindException("谷歌验证码错误!");
        }
        if (!passwordEncoder.matches(loginSafeword, user.getSafePassword())) {
            throw new YamiShopBindException("登录人资金密码错误");
        }
        user.setGoogleAuthBind(false);
        user.setGoogleAuthSecret("");
        updateById(user);