diff --git a/xjs-business/pom.xml b/xjs-business/pom.xml index 0c0c494b..147d07e1 100644 --- a/xjs-business/pom.xml +++ b/xjs-business/pom.xml @@ -112,6 +112,12 @@ ${hutool.version} + + + org.springframework.boot + spring-boot-devtools + + diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/XjsEnglishApp.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/XjsEnglishApp.java similarity index 95% rename from xjs-business/xjs-business-english/src/main/java/com/xjs/english/XjsEnglishApp.java rename to xjs-business/xjs-business-english/src/main/java/com/xjs/translation/XjsEnglishApp.java index fa9b3550..cf290901 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/XjsEnglishApp.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/XjsEnglishApp.java @@ -1,4 +1,4 @@ -package com.xjs.english; +package com.xjs.translation; import com.ruoyi.common.security.annotation.EnableCustomConfig; import com.ruoyi.common.security.annotation.EnableRyFeignClients; diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/client/BaiduFeignClient.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/client/BaiduFeignClient.java similarity index 75% rename from xjs-business/xjs-business-english/src/main/java/com/xjs/english/client/BaiduFeignClient.java rename to xjs-business/xjs-business-english/src/main/java/com/xjs/translation/client/BaiduFeignClient.java index 0fd1fbf8..24ba4b77 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/client/BaiduFeignClient.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/client/BaiduFeignClient.java @@ -1,8 +1,7 @@ -package com.xjs.english.client; +package com.xjs.translation.client; -import com.xjs.english.domain.qo.translation.BaiDuTranslationQo; +import com.xjs.translation.domain.qo.translation.BaiDuTranslationQo; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; /** diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/client/YouDaoFeignClient.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/client/YouDaoFeignClient.java similarity index 71% rename from xjs-business/xjs-business-english/src/main/java/com/xjs/english/client/YouDaoFeignClient.java rename to xjs-business/xjs-business-english/src/main/java/com/xjs/translation/client/YouDaoFeignClient.java index fa4e9c69..beb25f6c 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/client/YouDaoFeignClient.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/client/YouDaoFeignClient.java @@ -1,12 +1,10 @@ -package com.xjs.english.client; +package com.xjs.translation.client; import com.alibaba.fastjson.JSONObject; -import com.xjs.english.domain.qo.translation.YouDaoTranslationQo; +import com.xjs.translation.domain.qo.translation.YouDaoTranslationQo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; -import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; /** * @author xiejs diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/config/BaiduProperties.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/config/BaiduProperties.java similarity index 92% rename from xjs-business/xjs-business-english/src/main/java/com/xjs/english/config/BaiduProperties.java rename to xjs-business/xjs-business-english/src/main/java/com/xjs/translation/config/BaiduProperties.java index 7153600b..dc7d6063 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/config/BaiduProperties.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/config/BaiduProperties.java @@ -1,4 +1,4 @@ -package com.xjs.english.config; +package com.xjs.translation.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/config/FeignConfig.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/config/FeignConfig.java similarity index 91% rename from xjs-business/xjs-business-english/src/main/java/com/xjs/english/config/FeignConfig.java rename to xjs-business/xjs-business-english/src/main/java/com/xjs/translation/config/FeignConfig.java index 48a3f614..6bb05cf9 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/config/FeignConfig.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/config/FeignConfig.java @@ -1,4 +1,4 @@ -package com.xjs.english.config; +package com.xjs.translation.config; import feign.Logger; import org.springframework.context.annotation.Bean; diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/consts/TranslationTypeConst.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/consts/TranslationTypeConst.java similarity index 82% rename from xjs-business/xjs-business-english/src/main/java/com/xjs/english/consts/TranslationTypeConst.java rename to xjs-business/xjs-business-english/src/main/java/com/xjs/translation/consts/TranslationTypeConst.java index b1ed689b..5d553dcc 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/consts/TranslationTypeConst.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/consts/TranslationTypeConst.java @@ -1,4 +1,4 @@ -package com.xjs.english.consts; +package com.xjs.translation.consts; /** * @author xiejs diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/controller/TranslationController.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/controller/TranslationController.java similarity index 77% rename from xjs-business/xjs-business-english/src/main/java/com/xjs/english/controller/TranslationController.java rename to xjs-business/xjs-business-english/src/main/java/com/xjs/translation/controller/TranslationController.java index 28b2bdb5..2fc518e8 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/controller/TranslationController.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/controller/TranslationController.java @@ -1,17 +1,17 @@ -package com.xjs.english.controller; +package com.xjs.translation.controller; import com.ruoyi.common.core.web.domain.AjaxResult; -import com.xjs.english.domain.qo.translation.TranslationQo; -import com.xjs.english.domain.vo.translation.TranslationVo; -import com.xjs.english.service.TranslationService; +import com.xjs.translation.domain.qo.translation.TranslationQo; +import com.xjs.translation.domain.vo.translation.TranslationVo; +import com.xjs.translation.service.TranslationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import static com.xjs.english.consts.TranslationTypeConst.BAIDU; -import static com.xjs.english.consts.TranslationTypeConst.YOUDAO; +import static com.xjs.translation.consts.TranslationTypeConst.BAIDU; +import static com.xjs.translation.consts.TranslationTypeConst.YOUDAO; /** * @author xiejs diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/domain/qo/translation/BaiDuTranslationQo.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/qo/translation/BaiDuTranslationQo.java similarity index 92% rename from xjs-business/xjs-business-english/src/main/java/com/xjs/english/domain/qo/translation/BaiDuTranslationQo.java rename to xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/qo/translation/BaiDuTranslationQo.java index 0df971f3..83aedcd4 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/domain/qo/translation/BaiDuTranslationQo.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/qo/translation/BaiDuTranslationQo.java @@ -1,4 +1,4 @@ -package com.xjs.english.domain.qo.translation; +package com.xjs.translation.domain.qo.translation; import lombok.Data; diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/domain/qo/translation/TranslationQo.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/qo/translation/TranslationQo.java similarity index 95% rename from xjs-business/xjs-business-english/src/main/java/com/xjs/english/domain/qo/translation/TranslationQo.java rename to xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/qo/translation/TranslationQo.java index 944616b8..6d654e18 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/domain/qo/translation/TranslationQo.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/qo/translation/TranslationQo.java @@ -1,4 +1,4 @@ -package com.xjs.english.domain.qo.translation; +package com.xjs.translation.domain.qo.translation; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/domain/qo/translation/YouDaoTranslationQo.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/qo/translation/YouDaoTranslationQo.java similarity index 88% rename from xjs-business/xjs-business-english/src/main/java/com/xjs/english/domain/qo/translation/YouDaoTranslationQo.java rename to xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/qo/translation/YouDaoTranslationQo.java index cf34635a..55be7c13 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/domain/qo/translation/YouDaoTranslationQo.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/qo/translation/YouDaoTranslationQo.java @@ -1,4 +1,4 @@ -package com.xjs.english.domain.qo.translation; +package com.xjs.translation.domain.qo.translation; import lombok.Data; diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/domain/vo/translation/GoogleTranslationVo.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/vo/translation/GoogleTranslationVo.java similarity index 73% rename from xjs-business/xjs-business-english/src/main/java/com/xjs/english/domain/vo/translation/GoogleTranslationVo.java rename to xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/vo/translation/GoogleTranslationVo.java index 17460360..26c1ef8b 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/domain/vo/translation/GoogleTranslationVo.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/vo/translation/GoogleTranslationVo.java @@ -1,4 +1,4 @@ -package com.xjs.english.domain.vo.translation; +package com.xjs.translation.domain.vo.translation; /** * @author xiejs diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/domain/vo/translation/TranslationVo.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/vo/translation/TranslationVo.java similarity index 93% rename from xjs-business/xjs-business-english/src/main/java/com/xjs/english/domain/vo/translation/TranslationVo.java rename to xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/vo/translation/TranslationVo.java index 3b653b00..513f4779 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/domain/vo/translation/TranslationVo.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/domain/vo/translation/TranslationVo.java @@ -1,4 +1,4 @@ -package com.xjs.english.domain.vo.translation; +package com.xjs.translation.domain.vo.translation; import lombok.Data; diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/exception/BusinessException.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/exception/BusinessException.java similarity index 91% rename from xjs-business/xjs-business-english/src/main/java/com/xjs/english/exception/BusinessException.java rename to xjs-business/xjs-business-english/src/main/java/com/xjs/translation/exception/BusinessException.java index 3951fa22..946b4894 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/exception/BusinessException.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/exception/BusinessException.java @@ -1,4 +1,4 @@ -package com.xjs.english.exception; +package com.xjs.translation.exception; import lombok.extern.log4j.Log4j2; diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/service/TranslationService.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/TranslationService.java similarity index 65% rename from xjs-business/xjs-business-english/src/main/java/com/xjs/english/service/TranslationService.java rename to xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/TranslationService.java index c5653700..2be69e8f 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/service/TranslationService.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/TranslationService.java @@ -1,7 +1,7 @@ -package com.xjs.english.service; +package com.xjs.translation.service; -import com.xjs.english.domain.qo.translation.TranslationQo; -import com.xjs.english.domain.vo.translation.TranslationVo; +import com.xjs.translation.domain.qo.translation.TranslationQo; +import com.xjs.translation.domain.vo.translation.TranslationVo; /** * @author xiejs diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/service/impl/BaiDuTranslationServiceImpl.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/impl/BaiDuTranslationServiceImpl.java similarity index 82% rename from xjs-business/xjs-business-english/src/main/java/com/xjs/english/service/impl/BaiDuTranslationServiceImpl.java rename to xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/impl/BaiDuTranslationServiceImpl.java index 7095cefc..68add587 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/service/impl/BaiDuTranslationServiceImpl.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/impl/BaiDuTranslationServiceImpl.java @@ -1,15 +1,15 @@ -package com.xjs.english.service.impl; +package com.xjs.translation.service.impl; import cn.hutool.crypto.SecureUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.xjs.english.client.BaiduFeignClient; -import com.xjs.english.config.BaiduProperties; -import com.xjs.english.domain.qo.translation.BaiDuTranslationQo; -import com.xjs.english.domain.qo.translation.TranslationQo; -import com.xjs.english.domain.vo.translation.TranslationVo; -import com.xjs.english.exception.BusinessException; -import com.xjs.english.service.TranslationService; +import com.xjs.translation.client.BaiduFeignClient; +import com.xjs.translation.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.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/english/service/impl/YouDaoTranslationServiceImpl.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/impl/YouDaoTranslationServiceImpl.java similarity index 82% rename from xjs-business/xjs-business-english/src/main/java/com/xjs/english/service/impl/YouDaoTranslationServiceImpl.java rename to xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/impl/YouDaoTranslationServiceImpl.java index 37964dff..1364bcb6 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/english/service/impl/YouDaoTranslationServiceImpl.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/translation/service/impl/YouDaoTranslationServiceImpl.java @@ -1,20 +1,18 @@ -package com.xjs.english.service.impl; +package com.xjs.translation.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.xjs.english.client.BaiduFeignClient; -import com.xjs.english.client.YouDaoFeignClient; -import com.xjs.english.domain.qo.translation.TranslationQo; -import com.xjs.english.domain.qo.translation.YouDaoTranslationQo; -import com.xjs.english.domain.vo.translation.TranslationVo; -import com.xjs.english.exception.BusinessException; -import com.xjs.english.service.TranslationService; +import com.xjs.translation.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.translation.service.TranslationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/xjs-business/xjs-business-english/src/main/resources/logback.xml b/xjs-business/xjs-business-english/src/main/resources/logback.xml index 3b651ec3..5d9151a0 100644 --- a/xjs-business/xjs-business-english/src/main/resources/logback.xml +++ b/xjs-business/xjs-business-english/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/xjs-business/xjs-business-english/src/test/java/com/xjs/english/service/impl/BaiDuTranslationServiceImplTest.java b/xjs-business/xjs-business-english/src/test/java/com/xjs/translation/service/impl/BaiDuTranslationServiceImplTest.java similarity index 56% rename from xjs-business/xjs-business-english/src/test/java/com/xjs/english/service/impl/BaiDuTranslationServiceImplTest.java rename to xjs-business/xjs-business-english/src/test/java/com/xjs/translation/service/impl/BaiDuTranslationServiceImplTest.java index af118587..067dc9d9 100644 --- a/xjs-business/xjs-business-english/src/test/java/com/xjs/english/service/impl/BaiDuTranslationServiceImplTest.java +++ b/xjs-business/xjs-business-english/src/test/java/com/xjs/translation/service/impl/BaiDuTranslationServiceImplTest.java @@ -1,17 +1,13 @@ -package com.xjs.english.service.impl; +package com.xjs.translation.service.impl; -import com.xjs.english.XjsEnglishApp; -import com.xjs.english.domain.qo.translation.BaiDuTranslationQo; -import com.xjs.english.domain.qo.translation.TranslationQo; -import com.xjs.english.domain.vo.translation.TranslationVo; -import com.xjs.english.service.TranslationService; -import org.springframework.beans.factory.annotation.Autowired; +import com.xjs.translation.XjsEnglishApp; +import com.xjs.translation.domain.qo.translation.TranslationQo; +import com.xjs.translation.domain.vo.translation.TranslationVo; +import com.xjs.translation.service.TranslationService; import org.springframework.boot.test.context.SpringBootTest; import javax.annotation.Resource; -import static org.junit.jupiter.api.Assertions.*; - /** * @author xiejs * @desc diff --git a/xjs-business/xjs-business-english/src/test/java/com/xjs/english/service/impl/YouDaoTranslationServiceImplTest.java b/xjs-business/xjs-business-english/src/test/java/com/xjs/translation/service/impl/YouDaoTranslationServiceImplTest.java similarity index 60% rename from xjs-business/xjs-business-english/src/test/java/com/xjs/english/service/impl/YouDaoTranslationServiceImplTest.java rename to xjs-business/xjs-business-english/src/test/java/com/xjs/translation/service/impl/YouDaoTranslationServiceImplTest.java index 4f75a513..38f1ddae 100644 --- a/xjs-business/xjs-business-english/src/test/java/com/xjs/english/service/impl/YouDaoTranslationServiceImplTest.java +++ b/xjs-business/xjs-business-english/src/test/java/com/xjs/translation/service/impl/YouDaoTranslationServiceImplTest.java @@ -1,17 +1,14 @@ -package com.xjs.english.service.impl; +package com.xjs.translation.service.impl; -import com.xjs.english.XjsEnglishApp; -import com.xjs.english.domain.qo.translation.TranslationQo; -import com.xjs.english.domain.vo.translation.TranslationVo; -import com.xjs.english.service.TranslationService; +import com.xjs.translation.XjsEnglishApp; +import com.xjs.translation.domain.qo.translation.TranslationQo; +import com.xjs.translation.domain.vo.translation.TranslationVo; +import com.xjs.translation.service.TranslationService; 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