From 75fded81276bde01881a951d0a056e28df35a1d0 Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Wed, 29 Dec 2021 22:23:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B4=E6=98=8E=EF=BC=9A1=E3=80=81nacos?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../src/views/business/english/word/index.vue | 37 +++---- .../src/main/resources/bootstrap.yml | 2 + xjs-business/pom.xml | 1 + xjs-business/xjs-business-common/pom.xml | 19 ++++ .../java/com/xjs}/config/BaiduProperties.java | 2 +- .../java/com/xjs}/config/FeignConfig.java | 2 +- .../main/java/com/xjs}/config/JsonConfig.java | 2 +- .../com/xjs}/config/TianXingProperties.java | 2 +- .../com/xjs}/handler/MyMetaObjectHandler.java | 3 +- .../src/main/resources/rebel.xml | 16 ++++ xjs-business/xjs-business-english/pom.xml | 8 ++ .../java/com/xjs/word/domain/EnglishWord.java | 96 ++++--------------- .../xjs/word/mapper/EnglishWordMapper.java | 19 +--- .../service/impl/EnglishWordServiceImpl.java | 6 +- .../src/main/resources/bootstrap.yml | 2 + .../mapper.english/EnglishWordMapper.xml | 42 +------- xjs-business/xjs-business-openapi/pom.xml | 9 ++ .../impl/TianXingJDTCCopyWritingFactory.java | 2 +- .../impl/TianXingMMMYCopyWritingFactory.java | 2 +- .../impl/TianXingPYQCopyWritingFactory.java | 2 +- .../impl/TianXingWYYCopyWritingFactory.java | 2 +- .../factory/impl/BaiDuTranslationFactory.java | 2 +- .../src/main/resources/bootstrap.yml | 2 + 29 files changed, 119 insertions(+), 173 deletions(-) create mode 100644 xjs-business/xjs-business-common/pom.xml rename xjs-business/{xjs-business-openapi/src/main/java/com/xjs/common => xjs-business-common/src/main/java/com/xjs}/config/BaiduProperties.java (93%) rename xjs-business/{xjs-business-openapi/src/main/java/com/xjs/common => xjs-business-common/src/main/java/com/xjs}/config/FeignConfig.java (92%) rename xjs-business/{xjs-business-openapi/src/main/java/com/xjs/common => xjs-business-common/src/main/java/com/xjs}/config/JsonConfig.java (99%) rename xjs-business/{xjs-business-openapi/src/main/java/com/xjs/common => xjs-business-common/src/main/java/com/xjs}/config/TianXingProperties.java (92%) rename xjs-business/{xjs-business-openapi/src/main/java/com/xjs/common => xjs-business-common/src/main/java/com/xjs}/handler/MyMetaObjectHandler.java (93%) create mode 100644 xjs-business/xjs-business-common/src/main/resources/rebel.xml diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index f456b03c..a439357e 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -23,3 +23,5 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + #命名空间 + namespace: xjs-666 diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index 0aa81c22..df181d92 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -25,6 +25,8 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + #命名空间 + namespace: xjs-666 sentinel: # 取消控制台懒加载 eager: true diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 55ff4112..7442fabd 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -23,3 +23,5 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + #命名空间 + namespace: xjs-666 diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index 0ef5a457..11f77df4 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -23,3 +23,5 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + #命名空间 + namespace: xjs-666 diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index b86f8c9e..1d86dccb 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -23,3 +23,5 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + #命名空间 + namespace: xjs-666 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index 40ab7816..034fae05 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -23,3 +23,5 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + #命名空间 + namespace: xjs-666 diff --git a/ruoyi-ui/src/views/business/english/word/index.vue b/ruoyi-ui/src/views/business/english/word/index.vue index d99c96e7..c73be4f9 100644 --- a/ruoyi-ui/src/views/business/english/word/index.vue +++ b/ruoyi-ui/src/views/business/english/word/index.vue @@ -85,9 +85,9 @@ - - - + + + - - + + + - - - @@ -164,9 +158,6 @@ > - - -
确 定 @@ -240,8 +231,8 @@ export default { this.loading = true; this.queryParams.params = {}; if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) { - this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0]; - this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1]; + this.queryParams.createTime = this.daterangeCreateTime[0]; + this.queryParams.endCreateTime = this.daterangeCreateTime[1]; } listWord(this.queryParams).then(response => { this.wordList = response.rows; diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index 13d90cd7..e3a6eebf 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -23,3 +23,5 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + #命名空间 + namespace: xjs-666 diff --git a/xjs-business/pom.xml b/xjs-business/pom.xml index 59668e8a..eaa6e0d0 100644 --- a/xjs-business/pom.xml +++ b/xjs-business/pom.xml @@ -17,6 +17,7 @@ xjs-business-openapi xjs-business-english + xjs-business-common diff --git a/xjs-business/xjs-business-common/pom.xml b/xjs-business/xjs-business-common/pom.xml new file mode 100644 index 00000000..b6b245ec --- /dev/null +++ b/xjs-business/xjs-business-common/pom.xml @@ -0,0 +1,19 @@ + + + + xjs-business + com.xjs + 3.3.0 + + 4.0.0 + + xjs-business-common + + + 8 + 8 + + + \ No newline at end of file diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/config/BaiduProperties.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/BaiduProperties.java similarity index 93% rename from xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/config/BaiduProperties.java rename to xjs-business/xjs-business-common/src/main/java/com/xjs/config/BaiduProperties.java index 899cdfae..509333f9 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/config/BaiduProperties.java +++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/BaiduProperties.java @@ -1,4 +1,4 @@ -package com.xjs.common.config; +package com.xjs.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/config/FeignConfig.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/FeignConfig.java similarity index 92% rename from xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/config/FeignConfig.java rename to xjs-business/xjs-business-common/src/main/java/com/xjs/config/FeignConfig.java index 10b7f373..838facae 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/config/FeignConfig.java +++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/FeignConfig.java @@ -1,4 +1,4 @@ -package com.xjs.common.config; +package com.xjs.config; import feign.Logger; import org.springframework.context.annotation.Bean; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/config/JsonConfig.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/JsonConfig.java similarity index 99% rename from xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/config/JsonConfig.java rename to xjs-business/xjs-business-common/src/main/java/com/xjs/config/JsonConfig.java index 971e4c54..2dc54ce9 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/config/JsonConfig.java +++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/JsonConfig.java @@ -1,4 +1,4 @@ -package com.xjs.common.config; +package com.xjs.config; import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.serializer.ValueFilter; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/config/TianXingProperties.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/TianXingProperties.java similarity index 92% rename from xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/config/TianXingProperties.java rename to xjs-business/xjs-business-common/src/main/java/com/xjs/config/TianXingProperties.java index dacea623..482d376b 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/config/TianXingProperties.java +++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/TianXingProperties.java @@ -1,4 +1,4 @@ -package com.xjs.common.config; +package com.xjs.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/handler/MyMetaObjectHandler.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/handler/MyMetaObjectHandler.java similarity index 93% rename from xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/handler/MyMetaObjectHandler.java rename to xjs-business/xjs-business-common/src/main/java/com/xjs/handler/MyMetaObjectHandler.java index c452b792..e5c6b968 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/handler/MyMetaObjectHandler.java +++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/handler/MyMetaObjectHandler.java @@ -1,11 +1,10 @@ -package com.xjs.common.handler; +package com.xjs.handler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Component; -import java.time.LocalDateTime; import java.util.Date; /** diff --git a/xjs-business/xjs-business-common/src/main/resources/rebel.xml b/xjs-business/xjs-business-common/src/main/resources/rebel.xml new file mode 100644 index 00000000..790f0ae7 --- /dev/null +++ b/xjs-business/xjs-business-common/src/main/resources/rebel.xml @@ -0,0 +1,16 @@ + + + + + + xjs-business-common + + + + + + + diff --git a/xjs-business/xjs-business-english/pom.xml b/xjs-business/xjs-business-english/pom.xml index a4a3ae07..74ab043b 100644 --- a/xjs-business/xjs-business-english/pom.xml +++ b/xjs-business/xjs-business-english/pom.xml @@ -12,5 +12,13 @@ xjs-business-english + + + com.xjs + xjs-business-common + 3.3.0 + + + \ No newline at end of file diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/domain/EnglishWord.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/domain/EnglishWord.java index a7770ccc..fb7073e0 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/domain/EnglishWord.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/domain/EnglishWord.java @@ -1,10 +1,10 @@ package com.xjs.word.domain; -import com.baomidou.mybatisplus.annotation.TableId; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.*; import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; + +import java.util.Date; /** * 英语单词对象 english_word @@ -12,13 +12,14 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author xjs * @date 2021-12-29 */ -public class EnglishWord extends BaseEntity { - private static final long serialVersionUID = 1L; +@Data +@TableName("english_word") +public class EnglishWord { /** * 主键id */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** @@ -30,100 +31,39 @@ public class EnglishWord extends BaseEntity { /** * 对应的中文 */ - @Excel(name = "对应的中文") + @Excel(name = "中文") private String chineseWord; /** * 排序1,2,3,4 */ - @Excel(name = "排序1,2,3,4") + @Excel(name = "排序") private Integer sort; /** * 是否收藏 1收藏 2不收藏 */ - @Excel(name = "是否收藏 1收藏 2不收藏") + @Excel(name = "是否收藏",readConverterExp = "1=收藏,2=不收藏") private Integer isCollect; /** * 置顶 1置顶 2不置顶 */ - @Excel(name = "置顶 1置顶 2不置顶") + @Excel(name = "置顶",readConverterExp = "1=置顶,2=不置顶") private Integer top; /** * 查看次数 */ @Excel(name = "查看次数") - private Long lookCount; - - public void setId(Long id) { - this.id = id; - } - - public Long getId() { - return id; - } - - public void setEnglishWord(String englishWord) { - this.englishWord = englishWord; - } - - public String getEnglishWord() { - return englishWord; - } - - public void setChineseWord(String chineseWord) { - this.chineseWord = chineseWord; - } - - public String getChineseWord() { - return chineseWord; - } - - public void setSort(Integer sort) { - this.sort = sort; - } - - public Integer getSort() { - return sort; - } - - public void setIsCollect(Integer isCollect) { - this.isCollect = isCollect; - } - - public Integer getIsCollect() { - return isCollect; - } - - public void setTop(Integer top) { - this.top = top; - } + private Long lookCount = 0L; - public Integer getTop() { - return top; - } + @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") + @TableField(fill = FieldFill.INSERT) + private Date createTime; - public void setLookCount(Long lookCount) { - this.lookCount = lookCount; - } - public Long getLookCount() { - return lookCount; - } + @TableField(exist = false) + private Date endCreateTime; - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("englishWord", getEnglishWord()) - .append("chineseWord", getChineseWord()) - .append("sort", getSort()) - .append("isCollect", getIsCollect()) - .append("top", getTop()) - .append("lookCount", getLookCount()) - .append("createTime", getCreateTime()) - .toString(); - } } diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/mapper/EnglishWordMapper.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/mapper/EnglishWordMapper.java index 2bd03322..cd2f93d8 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/mapper/EnglishWordMapper.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/mapper/EnglishWordMapper.java @@ -1,5 +1,6 @@ package com.xjs.word.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.xjs.word.domain.EnglishWord; import java.util.List; @@ -10,7 +11,7 @@ import java.util.List; * @author xjs * @date 2021-12-29 */ -public interface EnglishWordMapper { +public interface EnglishWordMapper extends BaseMapper { //------------------------代码自动生成----------------------------------- @@ -30,22 +31,6 @@ public interface EnglishWordMapper { */ List selectEnglishWordList(EnglishWord englishWord); - /** - * 新增英语单词 - * - * @param englishWord 英语单词 - * @return 结果 - */ - int insertEnglishWord(EnglishWord englishWord); - - /** - * 修改英语单词 - * - * @param englishWord 英语单词 - * @return 结果 - */ - int updateEnglishWord(EnglishWord englishWord); - /** * 删除英语单词 * diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java index 818f82e2..4a30ce6f 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java @@ -1,6 +1,5 @@ package com.xjs.word.service.impl; -import com.ruoyi.common.core.utils.DateUtils; import com.xjs.word.domain.EnglishWord; import com.xjs.word.mapper.EnglishWordMapper; import com.xjs.word.service.IEnglishWordService; @@ -53,8 +52,7 @@ public class EnglishWordServiceImpl implements IEnglishWordService { */ @Override public int insertEnglishWord(EnglishWord englishWord) { - englishWord.setCreateTime(DateUtils.getNowDate()); - return englishWordMapper.insertEnglishWord(englishWord); + return englishWordMapper.insert(englishWord); } /** @@ -65,7 +63,7 @@ public class EnglishWordServiceImpl implements IEnglishWordService { */ @Override public int updateEnglishWord(EnglishWord englishWord) { - return englishWordMapper.updateEnglishWord(englishWord); + return englishWordMapper.updateById(englishWord); } /** diff --git a/xjs-business/xjs-business-english/src/main/resources/bootstrap.yml b/xjs-business/xjs-business-english/src/main/resources/bootstrap.yml index 1e9e27fb..32c5f726 100644 --- a/xjs-business/xjs-business-english/src/main/resources/bootstrap.yml +++ b/xjs-business/xjs-business-english/src/main/resources/bootstrap.yml @@ -25,5 +25,7 @@ spring: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #配置组 group: xjs + #命名空间 + namespace: xjs-666 diff --git a/xjs-business/xjs-business-english/src/main/resources/mapper.english/EnglishWordMapper.xml b/xjs-business/xjs-business-english/src/main/resources/mapper.english/EnglishWordMapper.xml index bbd9f3a5..55e62116 100644 --- a/xjs-business/xjs-business-english/src/main/resources/mapper.english/EnglishWordMapper.xml +++ b/xjs-business/xjs-business-english/src/main/resources/mapper.english/EnglishWordMapper.xml @@ -36,8 +36,8 @@ and chinese_word like concat('%', #{chineseWord}, '%') - - and create_time between #{params.beginCreateTime} and #{params.endCreateTime} + + and create_time between #{createTime} and #{endCreateTime} @@ -47,44 +47,6 @@ where id = #{id} - - insert into english_word - - id, - english_word, - chinese_word, - sort, - is_collect, - top, - look_count, - create_time, - - - #{id}, - #{englishWord}, - #{chineseWord}, - #{sort}, - #{isCollect}, - #{top}, - #{lookCount}, - #{createTime}, - - - - - update english_word - - english_word = #{englishWord}, - chinese_word = #{chineseWord}, - sort = #{sort}, - is_collect = #{isCollect}, - top = #{top}, - look_count = #{lookCount}, - create_time = #{createTime}, - - where id = #{id} - - delete from english_word diff --git a/xjs-business/xjs-business-openapi/pom.xml b/xjs-business/xjs-business-openapi/pom.xml index 44d7237e..2491dfd7 100644 --- a/xjs-business/xjs-business-openapi/pom.xml +++ b/xjs-business/xjs-business-openapi/pom.xml @@ -17,4 +17,13 @@ 11 + + + + com.xjs + xjs-business-common + 3.3.0 + + + \ No newline at end of file diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingJDTCCopyWritingFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingJDTCCopyWritingFactory.java index d333baa0..2fd1fcba 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingJDTCCopyWritingFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingJDTCCopyWritingFactory.java @@ -4,7 +4,7 @@ import cn.hutool.http.HttpStatus; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.xjs.common.client.TianXingJDTCFeignClient; -import com.xjs.common.config.TianXingProperties; +import com.xjs.config.TianXingProperties; import com.xjs.common.consts.TianXingConst; import com.xjs.common.exception.ApiException; import com.xjs.copywriting.domain.CopyWriting; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingMMMYCopyWritingFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingMMMYCopyWritingFactory.java index 1d74511c..70f1928f 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingMMMYCopyWritingFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingMMMYCopyWritingFactory.java @@ -4,7 +4,7 @@ import cn.hutool.http.HttpStatus; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.xjs.common.client.TianXingMMMYFeignClient; -import com.xjs.common.config.TianXingProperties; +import com.xjs.config.TianXingProperties; import com.xjs.common.consts.TianXingConst; import com.xjs.common.exception.ApiException; import com.xjs.copywriting.domain.CopyWriting; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingPYQCopyWritingFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingPYQCopyWritingFactory.java index 64a3baea..80ec414d 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingPYQCopyWritingFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingPYQCopyWritingFactory.java @@ -4,7 +4,7 @@ import cn.hutool.http.HttpStatus; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.xjs.common.client.TianXingPYQFeignClient; -import com.xjs.common.config.TianXingProperties; +import com.xjs.config.TianXingProperties; import com.xjs.common.consts.TianXingConst; import com.xjs.common.exception.ApiException; import com.xjs.copywriting.domain.CopyWriting; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingWYYCopyWritingFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingWYYCopyWritingFactory.java index a3c086e2..1b2d1d8e 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingWYYCopyWritingFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingWYYCopyWritingFactory.java @@ -4,7 +4,7 @@ import cn.hutool.http.HttpStatus; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.xjs.common.client.TianXingWYYFeignClient; -import com.xjs.common.config.TianXingProperties; +import com.xjs.config.TianXingProperties; import com.xjs.common.consts.TianXingConst; import com.xjs.common.exception.ApiException; import com.xjs.copywriting.domain.CopyWriting; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/BaiDuTranslationFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/BaiDuTranslationFactory.java index 675b842a..ab733824 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/BaiDuTranslationFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/BaiDuTranslationFactory.java @@ -4,7 +4,7 @@ import cn.hutool.crypto.SecureUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.xjs.common.client.BaiduFeignClient; -import com.xjs.common.config.BaiduProperties; +import com.xjs.config.BaiduProperties; import com.xjs.common.exception.ApiException; import com.xjs.translation.domain.qo.translation.BaiDuTranslationQo; import com.xjs.translation.domain.qo.translation.TranslationQo; diff --git a/xjs-business/xjs-business-openapi/src/main/resources/bootstrap.yml b/xjs-business/xjs-business-openapi/src/main/resources/bootstrap.yml index f9f74b57..e6b51aed 100644 --- a/xjs-business/xjs-business-openapi/src/main/resources/bootstrap.yml +++ b/xjs-business/xjs-business-openapi/src/main/resources/bootstrap.yml @@ -25,3 +25,5 @@ spring: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #配置组 group: xjs + #命名空间 + namespace: xjs-666