diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/RemoteCopyWritingFeign.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/RemoteCopyWritingFeign.java similarity index 73% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/RemoteCopyWritingFeign.java rename to ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/RemoteCopyWritingFeign.java index 2530327b..6db46845 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/RemoteCopyWritingFeign.java +++ b/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.english.api.factory.RemoteCopyWritingFactory; +import com.xjs.business.api.domain.CopyWriting; +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 { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/domain/CopyWriting.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/domain/CopyWriting.java similarity index 96% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/domain/CopyWriting.java rename to ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/domain/CopyWriting.java index d6127bf7..0ac816f1 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/domain/CopyWriting.java +++ b/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; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/factory/RemoteCopyWritingFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/factory/RemoteCopyWritingFactory.java similarity index 83% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/factory/RemoteCopyWritingFactory.java rename to ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/api/factory/RemoteCopyWritingFactory.java index 18860d2d..0b785fd9 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/english/api/factory/RemoteCopyWritingFactory.java +++ b/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.english.api.domain.CopyWriting; +import com.xjs.business.api.RemoteCopyWritingFeign; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java index 80d9e019..a93c44c0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java +++ b/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" ; } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/xjs/job/task/CopyWritingTask.java b/ruoyi-modules/ruoyi-job/src/main/java/com/xjs/job/task/CopyWritingTask.java index d2b35080..df6f2f27 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/xjs/job/task/CopyWritingTask.java +++ b/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.english.api.domain.CopyWriting; +import com.xjs.business.api.RemoteCopyWritingFeign; +import com.xjs.business.api.domain.CopyWriting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/ruoyi-ui/src/api/business/english/copywriting.js b/ruoyi-ui/src/api/business/openapi/copywriting.js similarity index 80% rename from ruoyi-ui/src/api/business/english/copywriting.js rename to ruoyi-ui/src/api/business/openapi/copywriting.js index 95060adc..9cec588f 100644 --- a/ruoyi-ui/src/api/business/english/copywriting.js +++ b/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' }) } diff --git a/ruoyi-ui/src/api/business/english/log.js b/ruoyi-ui/src/api/business/openapi/log.js similarity index 78% rename from ruoyi-ui/src/api/business/english/log.js rename to ruoyi-ui/src/api/business/openapi/log.js index 953d75c5..4d71d6bd 100644 --- a/ruoyi-ui/src/api/business/english/log.js +++ b/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' }) } diff --git a/ruoyi-ui/src/api/business/english/translation.js b/ruoyi-ui/src/api/business/openapi/translation.js similarity index 80% rename from ruoyi-ui/src/api/business/english/translation.js rename to ruoyi-ui/src/api/business/openapi/translation.js index ae0b000d..026647aa 100644 --- a/ruoyi-ui/src/api/business/english/translation.js +++ b/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 }) diff --git a/ruoyi-ui/src/views/business/english/copywriting/index.vue b/ruoyi-ui/src/views/business/openapi/copywriting/index.vue similarity index 96% rename from ruoyi-ui/src/views/business/english/copywriting/index.vue rename to ruoyi-ui/src/views/business/openapi/copywriting/index.vue index 1def4ee9..a2a3d334 100644 --- a/ruoyi-ui/src/views/business/english/copywriting/index.vue +++ b/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']" >删除 @@ -70,7 +70,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['english:copywriting:export']" + v-hasPermi="['openapi:copywriting:export']" >导出 @@ -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']" > @@ -102,7 +102,7 @@ type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)" - v-hasPermi="['english:copywriting:remove']" + v-hasPermi="['openapi:copywriting:remove']" > @@ -134,7 +134,7 @@