From 16ad0959f535cbd53ecc3dd9f6bd1e4e7660acc4 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Mon, 27 Dec 2021 19:08:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B4=E6=98=8E=EF=BC=9A=201=E3=80=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=89=8D=E7=AB=AF=E3=80=81=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91api=E6=A0=A1=E9=AA=8C=202=E3=80=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=90=8E=E7=AB=AF=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=EF=BC=8C=E6=8A=BD=E5=87=BA=E5=85=AC=E5=85=B1common=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/english/translation/index.vue    | 37 ++++++++++++-------
 .../com/xjs/{log => common}/aop/ApiLog.java   |  2 +-
 .../xjs/{log => common}/aop/ApiLogAspect.java |  7 ++--
 .../client/BaiduFeignClient.java              |  4 +-
 .../client/YouDaoFeignClient.java             |  4 +-
 .../config/BaiduProperties.java               |  2 +-
 .../config/FeignConfig.java                   |  2 +-
 .../{log => common}/config/JsonConfig.java    |  2 +-
 .../xjs/{log => common}/consts/ReqConst.java  |  2 +-
 .../consts/TranslationTypeConst.java          |  2 +-
 .../xjs/{log => common}/enums/StatusEnum.java |  2 +-
 .../exception/BusinessException.java          |  2 +-
 .../main/java/com/xjs/log/domain/ApiLog.java  |  8 +---
 .../controller/TranslationController.java     |  6 +--
 .../domain/qo/translation/TranslationQo.java  |  2 +
 .../impl/BaiDuTranslationServiceImpl.java     |  6 +--
 .../impl/YouDaoTranslationServiceImpl.java    |  4 +-
 17 files changed, 48 insertions(+), 46 deletions(-)
 rename xjs-business/xjs-business-english/src/main/java/com/xjs/{log => common}/aop/ApiLog.java (95%)
 rename xjs-business/xjs-business-english/src/main/java/com/xjs/{log => common}/aop/ApiLogAspect.java (94%)
 rename xjs-business/xjs-business-english/src/main/java/com/xjs/{translation => common}/client/BaiduFeignClient.java (90%)
 rename xjs-business/xjs-business-english/src/main/java/com/xjs/{translation => common}/client/YouDaoFeignClient.java (91%)
 rename xjs-business/xjs-business-english/src/main/java/com/xjs/{translation => common}/config/BaiduProperties.java (92%)
 rename xjs-business/xjs-business-english/src/main/java/com/xjs/{translation => common}/config/FeignConfig.java (91%)
 rename xjs-business/xjs-business-english/src/main/java/com/xjs/{log => common}/config/JsonConfig.java (99%)
 rename xjs-business/xjs-business-english/src/main/java/com/xjs/{log => common}/consts/ReqConst.java (84%)
 rename xjs-business/xjs-business-english/src/main/java/com/xjs/{translation => common}/consts/TranslationTypeConst.java (82%)
 rename xjs-business/xjs-business-english/src/main/java/com/xjs/{log => common}/enums/StatusEnum.java (95%)
 rename xjs-business/xjs-business-english/src/main/java/com/xjs/{translation => common}/exception/BusinessException.java (91%)

diff --git a/ruoyi-ui/src/views/business/english/translation/index.vue b/ruoyi-ui/src/views/business/english/translation/index.vue
index c64ef309..26743820 100644
--- a/ruoyi-ui/src/views/business/english/translation/index.vue
+++ b/ruoyi-ui/src/views/business/english/translation/index.vue
@@ -48,7 +48,7 @@
         <!--        翻译结果显示区域-->
         <div class="grid-content bg-purple ">
           <div class="spans">
-            {{responseTranslation}}
+            {{ responseTranslation }}
           </div>
         </div>
       </el-col>
@@ -60,13 +60,14 @@
 
 <script>
 import {translation} from "@/api/business/english/translation";
+
 export default {
   dicts: ['translation_type'],
   name: "Log",
   data() {
     return {
       //翻译响应数据
-      responseTranslation:'',
+      responseTranslation: '',
 
       translationData: {
         translationType: '',
@@ -78,11 +79,19 @@ export default {
           message: '翻译平台不能为空',
           trigger: 'change'
         }],
-        q: [{
+        q: [
+          {
           required: true,
           message: '请输入翻译内容',
           trigger: 'blur'
-        }],
+        },
+          {
+            min: 1,
+            max: 120,
+            message: '长度在 1 到 120 个字符',
+            trigger: 'blur'
+          }
+        ],
       },
     }
   },
@@ -94,13 +103,13 @@ export default {
       this.$refs['translation'].validate(valid => {
         if (valid) {
           translation(this.translationData).then(res => {
-            let result =res .data.transResult
+            let result = res.data.transResult
             let results = ''
             console.log(result)
-            result.forEach(r =>{
-              results = results +'  '+ r.dst;
+            result.forEach(r => {
+              results = results + '  ' + r.dst;
             })
-            this.responseTranslation=results
+            this.responseTranslation = results
 
           })
         }
@@ -127,15 +136,15 @@ export default {
   padding: 50px;
 }
 
-.spans{
-  margin :100px;
-  margin-top: 100px;
+.spans {
+  margin: 50px;
+  margin-top: 40px;
   padding: 50px;
   font-family: Georgia;
-  font-size:20px;
-  height: 200px;
+  font-size: 20px;
+  height: 300px;
   box-shadow: 0 0 9px 3px #999;
-  color: #00afff;
+  font-style: italic;
 }
 
 </style>
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/aop/ApiLog.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/aop/ApiLog.java
similarity index 95%
rename from xjs-business/xjs-business-english/src/main/java/com/xjs/log/aop/ApiLog.java
rename to xjs-business/xjs-business-english/src/main/java/com/xjs/common/aop/ApiLog.java
index cca9aa19..3191d0c1 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/aop/ApiLog.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/aop/ApiLog.java
@@ -1,4 +1,4 @@
-package com.xjs.log.aop;
+package com.xjs.common.aop;
 
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.log.enums.OperatorType;
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/aop/ApiLogAspect.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/aop/ApiLogAspect.java
similarity index 94%
rename from xjs-business/xjs-business-english/src/main/java/com/xjs/log/aop/ApiLogAspect.java
rename to xjs-business/xjs-business-english/src/main/java/com/xjs/common/aop/ApiLogAspect.java
index bb05213e..c444135a 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/aop/ApiLogAspect.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/aop/ApiLogAspect.java
@@ -1,8 +1,7 @@
-package com.xjs.log.aop;
+package com.xjs.common.aop;
 
 import cn.hutool.core.date.DateUtil;
-import com.xjs.log.consts.ReqConst;
-import com.xjs.log.enums.StatusEnum;
+import com.xjs.common.enums.StatusEnum;
 import com.xjs.log.mapper.ApiLogMapper;
 import lombok.extern.log4j.Log4j2;
 import org.aspectj.lang.JoinPoint;
@@ -31,7 +30,7 @@ public class ApiLogAspect {
     /**
      * 声明AOP签名
      */
-    @Pointcut("@annotation(com.xjs.log.aop.ApiLog)")
+    @Pointcut("@annotation(com.xjs.common.aop.ApiLog)")
     public void pointcut() {
     }
 
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/client/BaiduFeignClient.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/client/BaiduFeignClient.java
similarity index 90%
rename from xjs-business/xjs-business-english/src/main/java/com/xjs/translation/client/BaiduFeignClient.java
rename to xjs-business/xjs-business-english/src/main/java/com/xjs/common/client/BaiduFeignClient.java
index f874d353..879c7831 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/client/BaiduFeignClient.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/client/BaiduFeignClient.java
@@ -1,7 +1,7 @@
-package com.xjs.translation.client;
+package com.xjs.common.client;
 
 import com.alibaba.fastjson.JSONObject;
-import com.xjs.log.aop.ApiLog;
+import com.xjs.common.aop.ApiLog;
 import com.xjs.translation.domain.qo.translation.BaiDuTranslationQo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/client/YouDaoFeignClient.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/client/YouDaoFeignClient.java
similarity index 91%
rename from xjs-business/xjs-business-english/src/main/java/com/xjs/translation/client/YouDaoFeignClient.java
rename to xjs-business/xjs-business-english/src/main/java/com/xjs/common/client/YouDaoFeignClient.java
index 6051668f..379b0052 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/client/YouDaoFeignClient.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/client/YouDaoFeignClient.java
@@ -1,7 +1,7 @@
-package com.xjs.translation.client;
+package com.xjs.common.client;
 
 import com.alibaba.fastjson.JSONObject;
-import com.xjs.log.aop.ApiLog;
+import com.xjs.common.aop.ApiLog;
 import com.xjs.translation.domain.qo.translation.YouDaoTranslationQo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/config/BaiduProperties.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/config/BaiduProperties.java
similarity index 92%
rename from xjs-business/xjs-business-english/src/main/java/com/xjs/translation/config/BaiduProperties.java
rename to xjs-business/xjs-business-english/src/main/java/com/xjs/common/config/BaiduProperties.java
index dc7d6063..899cdfae 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/config/BaiduProperties.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/config/BaiduProperties.java
@@ -1,4 +1,4 @@
-package com.xjs.translation.config;
+package com.xjs.common.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/config/FeignConfig.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/config/FeignConfig.java
similarity index 91%
rename from xjs-business/xjs-business-english/src/main/java/com/xjs/translation/config/FeignConfig.java
rename to xjs-business/xjs-business-english/src/main/java/com/xjs/common/config/FeignConfig.java
index 6bb05cf9..10b7f373 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/config/FeignConfig.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/config/FeignConfig.java
@@ -1,4 +1,4 @@
-package com.xjs.translation.config;
+package com.xjs.common.config;
 
 import feign.Logger;
 import org.springframework.context.annotation.Bean;
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/config/JsonConfig.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/config/JsonConfig.java
similarity index 99%
rename from xjs-business/xjs-business-english/src/main/java/com/xjs/log/config/JsonConfig.java
rename to xjs-business/xjs-business-english/src/main/java/com/xjs/common/config/JsonConfig.java
index 7d081fde..971e4c54 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/config/JsonConfig.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/config/JsonConfig.java
@@ -1,4 +1,4 @@
-package com.xjs.log.config;
+package com.xjs.common.config;
 
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.serializer.ValueFilter;
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/consts/ReqConst.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/consts/ReqConst.java
similarity index 84%
rename from xjs-business/xjs-business-english/src/main/java/com/xjs/log/consts/ReqConst.java
rename to xjs-business/xjs-business-english/src/main/java/com/xjs/common/consts/ReqConst.java
index bf003882..e950c13c 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/consts/ReqConst.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/consts/ReqConst.java
@@ -1,4 +1,4 @@
-package com.xjs.log.consts;
+package com.xjs.common.consts;
 
 /**
  * @author xiejs
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/consts/TranslationTypeConst.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/consts/TranslationTypeConst.java
similarity index 82%
rename from xjs-business/xjs-business-english/src/main/java/com/xjs/translation/consts/TranslationTypeConst.java
rename to xjs-business/xjs-business-english/src/main/java/com/xjs/common/consts/TranslationTypeConst.java
index 5d553dcc..2cfac94c 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/consts/TranslationTypeConst.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/consts/TranslationTypeConst.java
@@ -1,4 +1,4 @@
-package com.xjs.translation.consts;
+package com.xjs.common.consts;
 
 /**
  * @author xiejs
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/enums/StatusEnum.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/enums/StatusEnum.java
similarity index 95%
rename from xjs-business/xjs-business-english/src/main/java/com/xjs/log/enums/StatusEnum.java
rename to xjs-business/xjs-business-english/src/main/java/com/xjs/common/enums/StatusEnum.java
index 035b76ce..85329a30 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/enums/StatusEnum.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/enums/StatusEnum.java
@@ -1,4 +1,4 @@
-package com.xjs.log.enums;
+package com.xjs.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/exception/BusinessException.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/exception/BusinessException.java
similarity index 91%
rename from xjs-business/xjs-business-english/src/main/java/com/xjs/translation/exception/BusinessException.java
rename to xjs-business/xjs-business-english/src/main/java/com/xjs/common/exception/BusinessException.java
index 946b4894..bc7578a3 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/exception/BusinessException.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/common/exception/BusinessException.java
@@ -1,4 +1,4 @@
-package com.xjs.translation.exception;
+package com.xjs.common.exception;
 
 import lombok.extern.log4j.Log4j2;
 
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/domain/ApiLog.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/log/domain/ApiLog.java
index 1639ed61..edf36394 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/log/domain/ApiLog.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/log/domain/ApiLog.java
@@ -1,18 +1,12 @@
 package com.xjs.log.domain;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.xjs.log.enums.StatusEnum;
+import com.xjs.common.enums.StatusEnum;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
 
 import java.io.Serializable;
 
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/controller/TranslationController.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/controller/TranslationController.java
index 4f9fbead..c50506ab 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/controller/TranslationController.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/controller/TranslationController.java
@@ -2,10 +2,8 @@ package com.xjs.translation.controller;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresLogin;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.annotation.RequiresRoles;
 import com.xjs.translation.domain.qo.translation.TranslationQo;
 import com.xjs.translation.domain.vo.translation.TranslationVo;
 import com.xjs.translation.service.TranslationService;
@@ -15,8 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import static com.xjs.translation.consts.TranslationTypeConst.BAIDU;
-import static com.xjs.translation.consts.TranslationTypeConst.YOUDAO;
+import static com.xjs.common.consts.TranslationTypeConst.BAIDU;
+import static com.xjs.common.consts.TranslationTypeConst.YOUDAO;
 
 /**
  * @author xiejs
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/qo/translation/TranslationQo.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/qo/translation/TranslationQo.java
index 6d654e18..0bb1ffec 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/qo/translation/TranslationQo.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/qo/translation/TranslationQo.java
@@ -6,6 +6,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
@@ -24,6 +25,7 @@ public class TranslationQo implements Serializable {
      */
     @ApiModelProperty("翻译词")
     @NotBlank(message = "翻译内容不能为空")
+    @Size(max=120,message = "长度在 1 到 120 个字符")
     private String q="你傻吗，大傻逼？嗯，哈哈哈";
 
 
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/impl/BaiDuTranslationServiceImpl.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/impl/BaiDuTranslationServiceImpl.java
index 8aeb2ed2..c650d86d 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/impl/BaiDuTranslationServiceImpl.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/impl/BaiDuTranslationServiceImpl.java
@@ -3,12 +3,12 @@ package com.xjs.translation.service.impl;
 import cn.hutool.crypto.SecureUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.xjs.translation.client.BaiduFeignClient;
-import com.xjs.translation.config.BaiduProperties;
+import com.xjs.common.client.BaiduFeignClient;
+import com.xjs.common.config.BaiduProperties;
 import com.xjs.translation.domain.qo.translation.BaiDuTranslationQo;
 import com.xjs.translation.domain.qo.translation.TranslationQo;
 import com.xjs.translation.domain.vo.translation.TranslationVo;
-import com.xjs.translation.exception.BusinessException;
+import com.xjs.common.exception.BusinessException;
 import com.xjs.translation.service.TranslationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/impl/YouDaoTranslationServiceImpl.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/impl/YouDaoTranslationServiceImpl.java
index d7da413b..3847eb22 100644
--- a/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/impl/YouDaoTranslationServiceImpl.java
+++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/impl/YouDaoTranslationServiceImpl.java
@@ -2,11 +2,11 @@ package com.xjs.translation.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.xjs.translation.client.YouDaoFeignClient;
+import com.xjs.common.client.YouDaoFeignClient;
 import com.xjs.translation.domain.qo.translation.TranslationQo;
 import com.xjs.translation.domain.qo.translation.YouDaoTranslationQo;
 import com.xjs.translation.domain.vo.translation.TranslationVo;
-import com.xjs.translation.exception.BusinessException;
+import com.xjs.common.exception.BusinessException;
 import com.xjs.translation.service.TranslationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;