Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-18 53562814add61acfdc02d6b25dae6324f6fd5f92

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ProblemServiceImpl.java

@@ -7,7 +7,9 @@
import com.stylefeng.guns.modular.system.model.Problem;
import com.stylefeng.guns.modular.system.model.SensitiveWords;
import com.stylefeng.guns.modular.system.service.IProblemService;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -25,6 +27,9 @@
    @Resource
    private SensitiveWordsMapper sensitiveWordsMapper;

    @Autowired
    private IUserInfoService userInfoService;



    /**
@@ -35,10 +40,11 @@
     * @throws Exception
     */
    @Override
    public ResultUtil leaveMessage(String content, Integer uid) throws Exception {
    public ResultUtil leaveMessage(String content, Integer uid, Integer language) throws Exception {
        if(ToolUtil.isNotEmpty(content)){
            if(content.length() > 200){
                return ResultUtil.error("留言内容过长");
                language = userInfoService.queryLanguage(uid, language);
                return ResultUtil.error(language == 1 ? "留言内容过长" : language == 2 ? "Message is too long" : "Le message est trop long");
            }
            List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
            for(SensitiveWords s : sensitiveWords){