说明：1、模块优化，更改business模块相关路径，涉及改动较大

ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/RemoteCopyWritingFeign.java

@@ -1,9 +1,9 @@
-package com.xjs.business.english.api;
+package com.xjs.business.api;
 
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
-import com.xjs.business.english.api.domain.CopyWriting;
+import com.xjs.business.api.domain.CopyWriting;
-import com.xjs.business.english.api.factory.RemoteCopyWritingFactory;
+import com.xjs.business.api.factory.RemoteCopyWritingFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.GetMapping;
  * @create 2021-12-27
  */
 @FeignClient(contextId = "remoteCopyWritingFeign",
-        value = ServiceNameConstants.BUSINESS_ENGLISH_SERVICE,
+        value = ServiceNameConstants.BUSINESS_OPENAPI_SERVICE,
         fallbackFactory = RemoteCopyWritingFactory.class)
 @FunctionalInterface
 public interface RemoteCopyWritingFeign {

ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/domain/CopyWriting.java

@@ -1,4 +1,4 @@
-package com.xjs.business.english.api.domain;
+package com.xjs.business.api.domain;
 
 import java.io.Serializable;
 

ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/factory/RemoteCopyWritingFactory.java

@@ -1,9 +1,8 @@
-package com.xjs.business.english.api.factory;
+package com.xjs.business.api.factory;
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.factory.RemoteFileFallbackFactory;
-import com.xjs.business.english.api.RemoteCopyWritingFeign;
+import com.xjs.business.api.RemoteCopyWritingFeign;
-import com.xjs.business.english.api.domain.CopyWriting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java

@@ -23,7 +23,7 @@ public class ServiceNameConstants
     public static final String FILE_SERVICE = "ruoyi-file";
 
     /**
-     * 英语业务服务的serviceid
+     * 第三方api业务服务的serviceid
      */
-    public static final String BUSINESS_ENGLISH_SERVICE= "xjs-english" ;
+    public static final String BUSINESS_OPENAPI_SERVICE= "xjs-openapi" ;
 }

ruoyi-modules/ruoyi-job/src/main/java/com/xjs/job/task/CopyWritingTask.java

@@ -1,8 +1,8 @@
 package com.xjs.job.task;
 
 import com.ruoyi.common.core.domain.R;
-import com.xjs.business.english.api.RemoteCopyWritingFeign;
+import com.xjs.business.api.RemoteCopyWritingFeign;
-import com.xjs.business.english.api.domain.CopyWriting;
+import com.xjs.business.api.domain.CopyWriting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

ruoyi-ui/src/api/business/openapi/copywriting.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询文案api，通过api获取文案信息列表
 export function listCopyWriting(query) {
   return request({
-    url: '/english/copyWriting/list',
+    url: '/openapi/copyWriting/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listCopyWriting(query) {
 // 查询文案api，通过api获取文案信息详细
 export function getCopyWriting(id) {
   return request({
-    url: '/english/copyWriting/' + id,
+    url: '/openapi/copyWriting/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getCopyWriting(id) {
 // 删除文案api，通过api获取文案信息
 export function delCopyWriting(id) {
   return request({
-    url: '/english/copyWriting/' + id,
+    url: '/openapi/copyWriting/' + id,
     method: 'delete'
   })
 }

ruoyi-ui/src/api/business/openapi/log.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询日志列表
 export function listLog(query) {
   return request({
-    url: '/english/log/list',
+    url: '/openapi/log/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listLog(query) {
 // 查询日志详细
 export function getLog(id) {
   return request({
-    url: '/english/log/' + id,
+    url: '/openapi/log/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getLog(id) {
 // 删除日志
 export function delLog(id) {
   return request({
-    url: '/english/log/' + id,
+    url: '/openapi/log/' + id,
     method: 'delete'
   })
 }

ruoyi-ui/src/api/business/openapi/translation.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 翻译
 export function translation(query) {
   return request({
-    url: '/english/translation',
+    url: '/openapi/translation',
     method: 'post',
     data: query
   })
@@ -12,7 +12,7 @@ export function translation(query) {
 //获取文案
 export function getCopyWriting(query) {
   return request({
-    url: '/english/copyWriting',
+    url: '/openapi/copyWriting',
     method: 'get',
     data: query
   })

ruoyi-ui/src/views/business/openapi/copywriting/index.vue

@@ -60,7 +60,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['english:copywriting:remove']"
+          v-hasPermi="['openapi:copywriting:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -70,7 +70,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['english:copywriting:export']"
+          v-hasPermi="['openapi:copywriting:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -94,7 +94,7 @@
             type=""
             icon="el-icon-view"
             @click="handleView(scope.row,scope.index)"
-            v-hasPermi="['english:copywriting:query']"
+            v-hasPermi="['openapi:copywriting:query']"
           ></el-button>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" content="点击删除" placement="top-start">
@@ -102,7 +102,7 @@
             type="danger"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['english:copywriting:remove']"
+            v-hasPermi="['openapi:copywriting:remove']"
           ></el-button>
           </el-tooltip>
         </template>
@@ -134,7 +134,7 @@
 </template>
 
 <script>
-import { listCopyWriting, getCopyWriting, delCopyWriting } from "@/api/business/english/copywriting";
+import { listCopyWriting, getCopyWriting, delCopyWriting } from "@/api/business/openapi/copywriting";
 
 export default {
   name: "CopyWriting",
@@ -272,7 +272,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('english/copyWriting/export', {
+      this.download('openapi/copyWriting/export', {
         ...this.queryParams
       }, `copyWriting_${new Date().getTime()}.xlsx`)
     }

ruoyi-ui/src/views/business/openapi/log/index.vue

@@ -26,7 +26,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['english:log:remove']"
+          v-hasPermi="['openapi:log:remove']"
         >删除
         </el-button>
       </el-col>
@@ -37,7 +37,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['english:log:export']"
+          v-hasPermi="['openapi:log:export']"
         >导出
         </el-button>
       </el-col>
@@ -64,7 +64,7 @@
             type="danger"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['english:log:remove']"
+            v-hasPermi="['openapi:log:remove']"
           >
           </el-button>
         </template>
@@ -82,7 +82,7 @@
 </template>
 
 <script>
-import {listLog, getLog, delLog} from "@/api/business/english/log";
+import {listLog, getLog, delLog} from "@/api/business/openapi/log";
 
 export default {
   name: "Log",
@@ -195,7 +195,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('english/log/export', {
+      this.download('openapi/log/export', {
         ...this.queryParams
       }, `log_${new Date().getTime()}.xlsx`)
     }

ruoyi-ui/src/views/business/openapi/translation/index.vue

@@ -70,7 +70,7 @@
 </template>
 
 <script>
-import {translation,getCopyWriting} from "@/api/business/english/translation";
+import {translation,getCopyWriting} from "@/api/business/openapi/translation";
 
 export default {
   dicts: ['translation_type'],

xjs-business/pom.xml

@@ -15,7 +15,7 @@
     <description>业务模块</description>
     <name>业务模块</name>
     <modules>
-        <module>xjs-business-english</module>
+        <module>xjs-business-openapi</module>
     </modules>
 
     <properties>

xjs-business/xjs-business-openapi/pom.xml

@@ -8,9 +8,9 @@
         <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <name>业务模块-英语模块</name>
+    <name>业务模块-第三方API模块</name>
 
-    <artifactId>xjs-business-english</artifactId>
+    <artifactId>xjs-business-openapi</artifactId>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

xjs-business/xjs-business-openapi/src/main/java/com/xjs/XjsOpenApiApp.java

@@ -15,8 +15,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @EnableCustomConfig
 @EnableCustomSwagger2
 @EnableRyFeignClients
-public class XjsEnglishApp {
+public class XjsOpenApiApp {
     public static void main(String[] args) {
-        SpringApplication.run(XjsEnglishApp.class, args);
+        SpringApplication.run(XjsOpenApiApp.class, args);
     }
 }

xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/controller/CopyWritingController.java

@@ -105,7 +105,7 @@ public class CopyWritingController extends BaseController {
      * 查询文案api，通过api获取文案信息列表
      */
     @ApiOperation("文案列表")
-    @RequiresPermissions("system:copywriting:list")
+    @RequiresPermissions("openapi:copywriting:list")
     @GetMapping("/list")
     public TableDataInfo list(CopyWriting copyWriting) {
         startPage();
@@ -116,7 +116,7 @@ public class CopyWritingController extends BaseController {
     /**
      * 导出文案api，通过api获取文案信息列表
      */
-    @RequiresPermissions("system:copywriting:export")
+    @RequiresPermissions("openapi:copywriting:export")
     @Log(title = "文案管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation("导出文案")
@@ -129,7 +129,7 @@ public class CopyWritingController extends BaseController {
     /**
      * 获取文案api，通过api获取文案信息详细信息
      */
-    @RequiresPermissions("system:copywriting:query")
+    @RequiresPermissions("openapi:copywriting:query")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取文案根据ID")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
@@ -139,7 +139,7 @@ public class CopyWritingController extends BaseController {
     /**
      * 删除文案api，通过api获取文案信息
      */
-    @RequiresPermissions("system:copywriting:remove")
+    @RequiresPermissions("openapi:copywriting:remove")
     @Log(title = "文案管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @ApiOperation("删除文案")

xjs-business/xjs-business-openapi/src/main/java/com/xjs/log/controller/ApiLogController.java

@@ -38,7 +38,7 @@ public class ApiLogController extends BaseController {
     /**
      * 查询日志列表
      */
-    @RequiresPermissions("english:log:list")
+    @RequiresPermissions("openapi:log:list")
     @GetMapping("/list")
     @ApiOperation("查询日志列表")
     public TableDataInfo list(ApiLog apiLog) {
@@ -50,7 +50,7 @@ public class ApiLogController extends BaseController {
     /**
      * 导出日志列表
      */
-    @RequiresPermissions("english:log:export")
+    @RequiresPermissions("openapi:log:export")
     @Log(title = "API日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation("导出日志列表")
@@ -63,7 +63,7 @@ public class ApiLogController extends BaseController {
     /**
      * 获取日志详细信息
      */
-    @RequiresPermissions("english:log:query")
+    @RequiresPermissions("openapi:log:query")
     @GetMapping(value = "/{id}")
     @ApiOperation("获取日志详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
@@ -74,7 +74,7 @@ public class ApiLogController extends BaseController {
     /**
      * 删除日志
      */
-    @RequiresPermissions("english:log:remove")
+    @RequiresPermissions("openapi:log:remove")
     @Log(title = "API日志", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @ApiOperation("删除日志")

xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/controller/TranslationController.java

@@ -3,6 +3,7 @@ package com.xjs.translation.controller;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.security.annotation.RequiresLogin;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.xjs.translation.domain.qo.translation.TranslationQo;
 import com.xjs.translation.domain.vo.translation.TranslationVo;
 import com.xjs.translation.factory.TranslationFactory;
@@ -37,6 +38,7 @@ public class TranslationController {
     @ApiOperation("翻译接口")
     @Log(title = "获取翻译")
     @RequiresLogin
+    @RequiresPermissions("openapi:translation:api")
     public AjaxResult translation(@Validated @RequestBody TranslationQo translationQo) {
         TranslationVo translationVo=new TranslationVo();
         if (BAIDU.equals(translationQo.getTranslationType())) {

xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/YouDaoTranslationFactory.java

@@ -33,8 +33,10 @@ public class YouDaoTranslationFactory implements TranslationFactory {
         JSONObject translationApi = youDaoFeignClient.translationApi(youDaoTranslationQo);
         //接口内部错误以及网络错误都抛异常
         if(!"0".equals(translationApi.getString("errorCode"))|| translationApi.containsKey("error") ){
+            if(!"40".equals(translationApi.getString("errorCode"))){
                 throw new ApiException("有道翻译接口调用异常");
             }
+        }
         String type = translationApi.getString("type");
         TranslationVo translationVo = new TranslationVo();
         translationVo.setType(type);

xjs-business/xjs-business-openapi/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ server:
 spring: 
   application:
     # 应用名称
-    name: xjs-english
+    name: xjs-openapi
   profiles:
     # 环境配置
     active: dev

xjs-business/xjs-business-openapi/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="logs/xjs-english"/>
+	<property name="log.path" value="logs/xjs-openapi"/>
    <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

xjs-business/xjs-business-openapi/src/test/java/com/xjs/copywriting/factory/impl/TianXingPYQCopyWritingFactoryTestJob.java

@@ -1,22 +1,18 @@
 package com.xjs.copywriting.factory.impl;
 
-import com.xjs.XjsEnglishApp;
+import com.xjs.XjsOpenApiApp;
 import com.xjs.copywriting.domain.RequestBody;
 import com.xjs.copywriting.factory.CopyWritingFactory;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import javax.annotation.Resource;
-
-import static org.junit.jupiter.api.Assertions.*;
-
 /**
  * @author xiejs
  * @desc
  * @create 2021-12-27
  */
-@SpringBootTest(classes = XjsEnglishApp.class)
+@SpringBootTest(classes = XjsOpenApiApp.class)
 class TianXingPYQCopyWritingFactoryTestJob {
 
     @Autowired

xjs-business/xjs-business-openapi/src/test/java/com/xjs/translation/factory/impl/BaiDuTranslationFactoryTest.java

@@ -1,6 +1,6 @@
 package com.xjs.translation.factory.impl;
 
-import com.xjs.XjsEnglishApp;
+import com.xjs.XjsOpenApiApp;
 import com.xjs.translation.domain.qo.translation.TranslationQo;
 import com.xjs.translation.domain.vo.translation.TranslationVo;
 import com.xjs.translation.factory.TranslationFactory;
@@ -16,7 +16,7 @@ import javax.annotation.Resource;
  * @desc
  * @create 2021-12-25
  */
-@SpringBootTest(classes = XjsEnglishApp.class)
+@SpringBootTest(classes = XjsOpenApiApp.class)
 class BaiDuTranslationFactoryTest {
     @Resource(name = "baiDuTranslationFactory")
     TranslationFactory translationFactory;

xjs-business/xjs-business-openapi/src/test/java/com/xjs/translation/factory/impl/YouDaoTranslationFactoryTest.java

@@ -1,6 +1,6 @@
 package com.xjs.translation.factory.impl;
 
-import com.xjs.XjsEnglishApp;
+import com.xjs.XjsOpenApiApp;
 import com.xjs.translation.domain.qo.translation.TranslationQo;
 import com.xjs.translation.domain.vo.translation.TranslationVo;
 import com.xjs.translation.factory.TranslationFactory;
@@ -14,7 +14,7 @@ import javax.annotation.Resource;
  * @desc
  * @create 2021-12-25
  */
-@SpringBootTest(classes = XjsEnglishApp.class)
+@SpringBootTest(classes = XjsOpenApiApp.class)
 class YouDaoTranslationFactoryTest {
 
     @Resource(name = "youDaoTranslationFactory")