1

zj

20 hours ago 640ccb9229224642515527daf87f308a7aa9bdf4

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

@@ -56,7 +56,7 @@
        newsSerivce.pageNews(page,request.getTitle(),request.getLanguage(),request.getUserCode());
        for (NewsDto news:page.getRecords()){
            news.setLanguageText(Constants.LANGUAGE.get(news.getLanguage()));
            String nUrl = awsS3OSSFileService.getUrl(news.getImgUrl());
            String nUrl = Constants.IMAGES_HTTP+news.getImgUrl();
            news.setHttpImgUrl(nUrl);
        }
        return  Result.ok(page);
@@ -68,13 +68,13 @@
        model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
        SysUser sysUser = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
        if (!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
            throw new YamiShopBindException("资金密码不正确!");
            throw new YamiShopBindException("Incorrect fund password!");
        }
        News news=new News();
        if (!StringUtils.isEmptyString(model.getUserCode())) {
            User user= userService.findUserByUserCode(model.getUserCode());
            if (user==null){
                throw  new YamiShopBindException("UID不存在");
                throw new YamiShopBindException("UID does not exist");
            }
            news.setUserId(user.getUserId());
        } else {
@@ -101,17 +101,17 @@
        model.setLoginSafeword(passwordManager.decryptPassword(model.getLoginSafeword()));
        SysUser sysUser = sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId());
        if (!passwordEncoder.matches(model.getLoginSafeword(), sysUser.getSafePassword())) {
            throw new YamiShopBindException("资金密码不正确!");
            throw new YamiShopBindException("Incorrect fund password!");
        }
        News news=newsSerivce.getById(model.getId());
        if (news==null){
            throw  new YamiShopBindException("参数错误!");
            throw new YamiShopBindException("Invalid parameters!");
        }

        if (!StringUtils.isEmptyString(model.getUserCode())) {
            User user= userService.findUserByUserCode(model.getUserCode());
            if (user==null){
                throw  new YamiShopBindException("UID不存在");
                throw new YamiShopBindException("UID does not exist");
            }
            news.setUserId(user.getUserId());
        } else {