From 2b62ca8b3a40ff837caa6c969a842f453009c6e0 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Thu, 24 Mar 2022 23:08:55 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81ApiLogAspect=E7=B1=BB=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=9F=90=E4=B8=AA=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=8F=E5=A4=AA=E5=A4=A7=E4=B8=8D=E8=BF=94=E5=9B=9E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=202=E3=80=81=E8=8B=B1=E8=AF=AD=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91=E6=96=87=E7=AB=A0list=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=BF=E7=A8=8B=E5=AE=89=E5=85=A8=203?=
 =?UTF-8?q?=E3=80=81=E6=96=87=E7=AB=A0=E9=A1=B5=E9=9D=A2=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=8C=89=E9=92=AEbug=E4=BF=AE=E5=A4=8D=204=E3=80=81=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E7=BC=96=E7=A0=81=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/business/english/article/index.vue  |  2 ++
 .../business/openapi/commondata/Area.vue      | 22 +++++++++++++++++++
 .../impl/EnglishArticleServiceImpl.java       |  5 +++--
 .../java/com/xjs/common/aop/ApiLogAspect.java |  8 ++++++-
 4 files changed, 34 insertions(+), 3 deletions(-)

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
         >
+          <span class="custom-tree-node" slot-scope="{ node, data }">
+            <span>{{ node.label }}</span>
+            <span style="margin-left: 50px">
+              <el-tooltip class="item" effect="dark" content="点击去百度" placement="right">
+                  <el-button
+                    icon="el-icon-search"
+                    type="text"
+                    size="mini"
+                    @click="() => toBaidu(node, data)">
+                  </el-button>
+              </el-tooltip>
+
+            </span>
+      </span>
         </el-tree>
 
 
@@ -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<EnglishArticleMapper,
      * @return 文章实体类
      */
     private EnglishArticle translation(EnglishArticle englishArticle) {
-        // 使用线程安全的Vector
-        Vector<Thread> threads = new Vector<Thread>();
+        // 使用线程安全的CopyOnWriteArrayList
+        CopyOnWriteArrayList<Thread> threads = new CopyOnWriteArrayList<>();
 
         Thread thread1 = new Thread(() -> {
             R<TranslationVo> 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)) {