1

zj

8 hours ago be8c9767089b5e52ed462ea1d083d846e7420a45

 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);
@@ -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());
@@ -82,7 +77,7 @@
        }
        news.setTitle(model.getTitle());
        news.setImgJumpUrl(model.getImgJumpUrl());
        news.setImgUrl(Constants.IMAGES_HTTP+model.getImgUrl());
        news.setImgUrl(model.getImgUrl());
        news.setClick(model.isClick());
        news.setPopUp(model.isPopUp());
        news.setIndexTop(model.isIndex());
@@ -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("参数错误!");
@@ -121,7 +111,7 @@
        news.setImgJumpUrl(model.getImgJumpUrl());
        news.setClick(model.isClick());
        news.setPopUp(model.isPopUp());
        news.setImgUrl(Constants.IMAGES_HTTP+model.getImgUrl());
        news.setImgUrl(model.getImgUrl());
        news.setIndexTop(model.isIndex());
        news.setLanguage(model.getLanguage());
        news.setStartTime(model.getStartTime());