diff --git a/ruoyi-ui/src/views/business/english/article/index.vue b/ruoyi-ui/src/views/business/english/article/index.vue index 1db0ecdd..9412470d 100644 --- a/ruoyi-ui/src/views/business/english/article/index.vue +++ b/ruoyi-ui/src/views/business/english/article/index.vue @@ -326,6 +326,8 @@ export default { this.queryParams.createTime = null this.queryParams.endCreateTime = null + this.queryParams.condition = null; + this.resetForm("queryForm"); this.handleQuery(); }, diff --git a/ruoyi-ui/src/views/business/openapi/commondata/Area.vue b/ruoyi-ui/src/views/business/openapi/commondata/Area.vue index deb0cc24..34231b5e 100644 --- a/ruoyi-ui/src/views/business/openapi/commondata/Area.vue +++ b/ruoyi-ui/src/views/business/openapi/commondata/Area.vue @@ -19,6 +19,20 @@ :load="loadNode" highlight-current > + + {{ node.label }} + + + + + + + + @@ -55,6 +69,14 @@ export default { }, methods: { + //跳转页面 + toBaidu(node, data) { + console.log(node) + + //打开新标签跳转 + window.open('https://www.baidu.com/s?wd=' + node.data.name) + }, + getProvinceAreaList() { getProvinceArea().then(res => { this.dataList = res.data diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/article/service/impl/EnglishArticleServiceImpl.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/article/service/impl/EnglishArticleServiceImpl.java index d2693b4b..eaf9127a 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/article/service/impl/EnglishArticleServiceImpl.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/article/service/impl/EnglishArticleServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; +import java.util.concurrent.CopyOnWriteArrayList; /** * 英语文章service接口实现 @@ -145,8 +146,8 @@ public class EnglishArticleServiceImpl extends ServiceImpl threads = new Vector(); + // 使用线程安全的CopyOnWriteArrayList + CopyOnWriteArrayList threads = new CopyOnWriteArrayList<>(); Thread thread1 = new Thread(() -> { R titleR = remoteTranslationFeign.translation(englishArticle.getTitleChinese()); diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/aop/ApiLogAspect.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/aop/ApiLogAspect.java index 6b3bb5cd..ba27a811 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/aop/ApiLogAspect.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/aop/ApiLogAspect.java @@ -156,7 +156,13 @@ public class ApiLogAspect { String response = null; if (Objects.nonNull(jsonResult)) { response = jsonResult.toString(); - entity.setResponse(response); + + //数据量太大就不set了 + if ("高德-区域编码".equals(name)) { + entity.setResponse("\"数据量太大了~~\""); + }else { + entity.setResponse(response); + } //如果降级error if (response.contains(ERROR_500)) {