diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/LocaleResolverConfig.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/LocaleResolverConfig.java new file mode 100644 index 00000000..990b5b47 --- /dev/null +++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/config/LocaleResolverConfig.java @@ -0,0 +1,49 @@ +package com.xjs.config; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.LocaleResolver; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Locale; + +/** + * 自定义国际化解析器 + * + * @author xiejs + * @since 2022-02-09 + */ +@Configuration +public class LocaleResolverConfig implements LocaleResolver { + @Override + public Locale resolveLocale(HttpServletRequest httpServletRequest) { + // 获取页面手动切换传递的语言参数l + String l = httpServletRequest.getParameter("l"); + // 获取请求头自动传递的语言参数Accept-Language + String header = httpServletRequest.getHeader("Accept-Language"); + Locale locale = null; + // 如果手动切换参数不为空，就根据手动参数进行语言切换，否则默认根据请求头信息切换 + if (!StringUtils.isEmpty(l)) { + String[] split = l.split("_"); + locale = new Locale(split[0], split[1]); + } else { + // Accept-Language: en-US,en;q=0.9 + String[] splits = header.split(","); + String[] split = splits[0].split("-"); + locale = new Locale(split[0], split[1]); + } + return locale; + } + + @Override + public void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale) { + + } + + @Bean + public LocaleResolver localeResolver(){ + return new LocaleResolverConfig(); + } +} diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/BaiduProperties.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/properties/BaiduProperties.java similarity index 93% rename from xjs-business/xjs-business-common/src/main/java/com/xjs/config/BaiduProperties.java rename to xjs-business/xjs-business-common/src/main/java/com/xjs/properties/BaiduProperties.java index 509333f9..594c9c3c 100644 --- a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/BaiduProperties.java +++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/properties/BaiduProperties.java @@ -1,4 +1,4 @@ -package com.xjs.config; +package com.xjs.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/GaodeProperties.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/properties/GaodeProperties.java similarity index 92% rename from xjs-business/xjs-business-common/src/main/java/com/xjs/config/GaodeProperties.java rename to xjs-business/xjs-business-common/src/main/java/com/xjs/properties/GaodeProperties.java index 9332d4dd..38336147 100644 --- a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/GaodeProperties.java +++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/properties/GaodeProperties.java @@ -1,4 +1,4 @@ -package com.xjs.config; +package com.xjs.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/RollProperties.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/properties/RollProperties.java similarity index 93% rename from xjs-business/xjs-business-common/src/main/java/com/xjs/config/RollProperties.java rename to xjs-business/xjs-business-common/src/main/java/com/xjs/properties/RollProperties.java index ab34b8ab..ee66f690 100644 --- a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/RollProperties.java +++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/properties/RollProperties.java @@ -1,4 +1,4 @@ -package com.xjs.config; +package com.xjs.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/TianXingProperties.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/properties/TianXingProperties.java similarity index 93% rename from xjs-business/xjs-business-common/src/main/java/com/xjs/config/TianXingProperties.java rename to xjs-business/xjs-business-common/src/main/java/com/xjs/properties/TianXingProperties.java index 482d376b..f9e95f3e 100644 --- a/xjs-business/xjs-business-common/src/main/java/com/xjs/config/TianXingProperties.java +++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/properties/TianXingProperties.java @@ -1,4 +1,4 @@ -package com.xjs.config; +package com.xjs.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollBeautyPictureFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollBeautyPictureFactory.java index 40716c73..7edb6111 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollBeautyPictureFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollBeautyPictureFactory.java @@ -6,7 +6,7 @@ import com.xjs.apitools.domain.ApiBeautyPicture; import com.xjs.apitools.domain.RequestBody; import com.xjs.apitools.factory.ApiToolsFactory; import com.xjs.common.client.api.roll.RollBeautyPictureFeignClient; -import com.xjs.config.RollProperties; +import com.xjs.properties.RollProperties; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollChineseDictFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollChineseDictFactory.java index 8db6cbcb..72c8eb1b 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollChineseDictFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollChineseDictFactory.java @@ -6,7 +6,7 @@ import com.xjs.apitools.domain.ApiChineseDict; import com.xjs.apitools.domain.RequestBody; import com.xjs.apitools.factory.ApiToolsFactory; import com.xjs.common.client.api.roll.RollChineseDictFeignClient; -import com.xjs.config.RollProperties; +import com.xjs.properties.RollProperties; import com.xjs.exception.ApiException; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollForecastWeatherFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollForecastWeatherFactory.java index bd8d0d15..ce2db241 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollForecastWeatherFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollForecastWeatherFactory.java @@ -5,7 +5,7 @@ import com.xjs.apitools.domain.ApiForecastWeather; import com.xjs.apitools.domain.RequestBody; import com.xjs.apitools.factory.ApiToolsFactory; import com.xjs.common.client.api.roll.RollWeatherFeignClient; -import com.xjs.config.RollProperties; +import com.xjs.properties.RollProperties; import com.xjs.exception.ApiException; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollGarbageSortingFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollGarbageSortingFactory.java index 51c10af2..bdc63f21 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollGarbageSortingFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollGarbageSortingFactory.java @@ -5,7 +5,7 @@ import com.xjs.apitools.domain.ApiGarbageSorting; import com.xjs.apitools.domain.RequestBody; import com.xjs.apitools.factory.ApiToolsFactory; import com.xjs.common.client.api.roll.RollGarbageSortingDeignClient; -import com.xjs.config.RollProperties; +import com.xjs.properties.RollProperties; import com.xjs.exception.ApiException; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollHistoryTodayFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollHistoryTodayFactory.java index 8853a673..cec957f8 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollHistoryTodayFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollHistoryTodayFactory.java @@ -6,7 +6,7 @@ import com.xjs.apitools.domain.ApiHistoryToday; import com.xjs.apitools.domain.RequestBody; import com.xjs.apitools.factory.ApiToolsFactory; import com.xjs.common.client.api.roll.RollHistoryTodayFeignClient; -import com.xjs.config.RollProperties; +import com.xjs.properties.RollProperties; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollHolidayFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollHolidayFactory.java index 60c99fb0..d85a9d30 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollHolidayFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollHolidayFactory.java @@ -6,7 +6,7 @@ import com.xjs.apitools.domain.ApiHoliday; import com.xjs.apitools.domain.RequestBody; import com.xjs.apitools.factory.ApiToolsFactory; import com.xjs.common.client.api.roll.RollHolidayFeignClient; -import com.xjs.config.RollProperties; +import com.xjs.properties.RollProperties; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollIdcardQueryFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollIdcardQueryFactory.java index 516dbc90..6d58fe5d 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollIdcardQueryFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollIdcardQueryFactory.java @@ -5,7 +5,7 @@ import com.xjs.apitools.domain.ApiIdcardQuery; import com.xjs.apitools.domain.RequestBody; import com.xjs.apitools.factory.ApiToolsFactory; import com.xjs.common.client.api.roll.RollIdcardQueryFeignClient; -import com.xjs.config.RollProperties; +import com.xjs.properties.RollProperties; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollMobileBelongFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollMobileBelongFactory.java index d31a2bf5..44e231b2 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollMobileBelongFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollMobileBelongFactory.java @@ -5,7 +5,7 @@ import com.xjs.apitools.domain.ApiMobileBelong; import com.xjs.apitools.domain.RequestBody; import com.xjs.apitools.factory.ApiToolsFactory; import com.xjs.common.client.api.roll.RollMobileBelongFeignClient; -import com.xjs.config.RollProperties; +import com.xjs.properties.RollProperties; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollNowWeatherFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollNowWeatherFactory.java index 1a1e26a6..09cc5078 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollNowWeatherFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollNowWeatherFactory.java @@ -5,7 +5,7 @@ import com.xjs.apitools.domain.ApiNowWeather; import com.xjs.apitools.domain.RequestBody; import com.xjs.apitools.factory.ApiToolsFactory; import com.xjs.common.client.api.roll.RollWeatherFeignClient; -import com.xjs.config.RollProperties; +import com.xjs.properties.RollProperties; import com.xjs.exception.ApiException; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollSimpleComplexFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollSimpleComplexFactory.java index c6588e1d..1b7a1c87 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollSimpleComplexFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollSimpleComplexFactory.java @@ -5,7 +5,7 @@ import com.xjs.apitools.domain.ApiSimpleComplex; import com.xjs.apitools.domain.RequestBody; import com.xjs.apitools.factory.ApiToolsFactory; import com.xjs.common.client.api.roll.RollSimpleComplexFeignClient; -import com.xjs.config.RollProperties; +import com.xjs.properties.RollProperties; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/factory/impl/TianXingAWordFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/factory/impl/TianXingAWordFactory.java index 3783c8a0..206580cc 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/factory/impl/TianXingAWordFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/factory/impl/TianXingAWordFactory.java @@ -10,7 +10,7 @@ import com.xjs.aword.domain.RequestBody; import com.xjs.aword.factory.AWordFactory; import com.xjs.aword.mapper.ApiAWordMapper; import com.xjs.common.client.api.tianxing.TianXingMMYJFeignClient; -import com.xjs.config.TianXingProperties; +import com.xjs.properties.TianXingProperties; import com.xjs.exception.ApiException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/RollMMYJCopyWritingFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/RollMMYJCopyWritingFactory.java index b55c12d5..6c5695aa 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/RollMMYJCopyWritingFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/RollMMYJCopyWritingFactory.java @@ -3,7 +3,7 @@ package com.xjs.copywriting.factory.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.xjs.common.client.api.roll.RollMMYJFeignClient; -import com.xjs.config.RollProperties; +import com.xjs.properties.RollProperties; import com.xjs.consts.TianXingConst; import com.xjs.copywriting.domain.CopyWriting; import com.xjs.copywriting.domain.RequestBody; 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 586ed75e..fc21e420 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.api.tianxing.TianXingJDTCFeignClient; -import com.xjs.config.TianXingProperties; +import com.xjs.properties.TianXingProperties; import com.xjs.consts.TianXingConst; import com.xjs.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 b2a3980a..fd888691 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.api.tianxing.TianXingMMMYFeignClient; -import com.xjs.config.TianXingProperties; +import com.xjs.properties.TianXingProperties; import com.xjs.consts.TianXingConst; import com.xjs.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 454011de..d5cc3821 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.api.tianxing.TianXingPYQFeignClient; -import com.xjs.config.TianXingProperties; +import com.xjs.properties.TianXingProperties; import com.xjs.consts.TianXingConst; import com.xjs.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 9d49f3e0..f1145a25 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.api.tianxing.TianXingWYYFeignClient; -import com.xjs.config.TianXingProperties; +import com.xjs.properties.TianXingProperties; import com.xjs.consts.TianXingConst; import com.xjs.exception.ApiException; import com.xjs.copywriting.domain.CopyWriting; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/oneenglish/factory/impl/TianXingOneEnglishFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/oneenglish/factory/impl/TianXingOneEnglishFactory.java index a5308710..24aeda9b 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/oneenglish/factory/impl/TianXingOneEnglishFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/oneenglish/factory/impl/TianXingOneEnglishFactory.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.redis.service.RedisService; import com.xjs.common.client.api.tianxing.TianXingOneEnglishFeignClient; -import com.xjs.config.TianXingProperties; +import com.xjs.properties.TianXingProperties; import com.xjs.exception.ApiException; import com.xjs.oneenglish.domain.ApiEnglish; import com.xjs.oneenglish.domain.RequestBody; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchAllnetworkFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchAllnetworkFactory.java index 808f6cbf..bbfe315c 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchAllnetworkFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchAllnetworkFactory.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.constant.HttpStatus; import com.xjs.common.client.api.tianxing.TianXingQWRSFeignClient; -import com.xjs.config.TianXingProperties; +import com.xjs.properties.TianXingProperties; import com.xjs.topsearch.domain.ApiTopsearchAllnetwork; import com.xjs.topsearch.factory.TopserachFactory; import com.xjs.topsearch.service.ApiTopsearchAllnetworkService; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchBaiduFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchBaiduFactory.java index df8a86e7..71db0a4d 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchBaiduFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchBaiduFactory.java @@ -4,9 +4,8 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.constant.HttpStatus; import com.xjs.common.client.api.tianxing.TianXingBDRSFeignClient; -import com.xjs.config.TianXingProperties; +import com.xjs.properties.TianXingProperties; import com.xjs.topsearch.domain.ApiTopsearchBaidu; -import com.xjs.topsearch.domain.ApiTopsearchWechat; import com.xjs.topsearch.factory.TopserachFactory; import com.xjs.topsearch.service.ApiTopsearchBaiduService; import lombok.extern.log4j.Log4j2; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchDouyinFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchDouyinFactory.java index d0be531a..09651d0d 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchDouyinFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchDouyinFactory.java @@ -4,13 +4,10 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.constant.HttpStatus; import com.xjs.common.client.api.tianxing.TianXingDYRSFeignClient; -import com.xjs.common.client.api.tianxing.TianXingWBRSFeignClient; -import com.xjs.config.TianXingProperties; +import com.xjs.properties.TianXingProperties; import com.xjs.topsearch.domain.ApiTopsearchDouyin; -import com.xjs.topsearch.domain.ApiTopsearchWeibo; import com.xjs.topsearch.factory.TopserachFactory; import com.xjs.topsearch.service.ApiTopsearchDouyinService; -import com.xjs.topsearch.service.ApiTopsearchWeiboService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchWechatFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchWechatFactory.java index 1e1903fd..53ead933 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchWechatFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchWechatFactory.java @@ -4,8 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.constant.HttpStatus; import com.xjs.common.client.api.tianxing.TianXingWXRSFeignClient; -import com.xjs.config.TianXingProperties; -import com.xjs.topsearch.domain.ApiTopsearchAllnetwork; +import com.xjs.properties.TianXingProperties; import com.xjs.topsearch.domain.ApiTopsearchWechat; import com.xjs.topsearch.factory.TopserachFactory; import com.xjs.topsearch.service.ApiTopsearchWechatService; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchWeiboFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchWeiboFactory.java index ddd66504..6003ca82 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchWeiboFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchWeiboFactory.java @@ -4,8 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.constant.HttpStatus; import com.xjs.common.client.api.tianxing.TianXingWBRSFeignClient; -import com.xjs.config.TianXingProperties; -import com.xjs.topsearch.domain.ApiTopsearchWechat; +import com.xjs.properties.TianXingProperties; import com.xjs.topsearch.domain.ApiTopsearchWeibo; import com.xjs.topsearch.factory.TopserachFactory; import com.xjs.topsearch.service.ApiTopsearchWeiboService; 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 644bf63f..c3b210c1 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.api.baidu.BaiduFeignClient; -import com.xjs.config.BaiduProperties; +import com.xjs.properties.BaiduProperties; import com.xjs.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/java/com/xjs/translation/factory/impl/RollTranslationFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/RollTranslationFactory.java index 24f8aac3..f2e170ea 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/RollTranslationFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/RollTranslationFactory.java @@ -2,7 +2,7 @@ package com.xjs.translation.factory.impl; import com.alibaba.fastjson.JSONObject; import com.xjs.common.client.api.roll.RollTranslationFeignClient; -import com.xjs.config.RollProperties; +import com.xjs.properties.RollProperties; import com.xjs.exception.ApiException; import com.xjs.translation.domain.qo.translation.RollTranslationQo; import com.xjs.translation.domain.qo.translation.TranslationQo; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/TianXingTranDictFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/TianXingTranDictFactory.java index b1645345..a447d71d 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/TianXingTranDictFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/TianXingTranDictFactory.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.api.tianxing.TianXingTranDictClient; -import com.xjs.config.TianXingProperties; +import com.xjs.properties.TianXingProperties; import com.xjs.copywriting.domain.RequestBody; import com.xjs.exception.ApiException; import com.xjs.translation.domain.qo.translation.TranslationQo; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/GaodeForecastWeatherFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/GaodeForecastWeatherFactory.java index d1630951..a5ce1da8 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/GaodeForecastWeatherFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/GaodeForecastWeatherFactory.java @@ -2,7 +2,7 @@ package com.xjs.weather.factory.impl; import com.alibaba.fastjson.JSONObject; import com.xjs.common.client.api.gaode.GaodeWeatherFeignClient; -import com.xjs.config.GaodeProperties; +import com.xjs.properties.GaodeProperties; import com.xjs.weather.domain.ForecastWeather; import com.xjs.weather.domain.IPInfoVo; import com.xjs.weather.domain.RequestBody; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/GaodeNowWeatherFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/GaodeNowWeatherFactory.java index 65766c7e..2d2d0440 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/GaodeNowWeatherFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/GaodeNowWeatherFactory.java @@ -2,7 +2,7 @@ package com.xjs.weather.factory.impl; import com.alibaba.fastjson.JSONObject; import com.xjs.common.client.api.gaode.GaodeWeatherFeignClient; -import com.xjs.config.GaodeProperties; +import com.xjs.properties.GaodeProperties; import com.xjs.weather.domain.IPInfoVo; import com.xjs.weather.domain.NowWeather; import com.xjs.weather.domain.RequestBody; diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/RollIPFactory.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/RollIPFactory.java index fb7917f9..10ced784 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/RollIPFactory.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/RollIPFactory.java @@ -3,7 +3,7 @@ package com.xjs.weather.factory.impl; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.redis.service.RedisService; import com.xjs.common.client.api.roll.RollIPFeignClient; -import com.xjs.config.RollProperties; +import com.xjs.properties.RollProperties; import com.xjs.copywriting.domain.RequestBody; import com.xjs.utils.IPUtils; import com.xjs.weather.domain.IPInfoVo; diff --git a/xjs-business/xjs-business-openapi/src/test/java/com/xjs/oneenglish/factory/TianXingOneEnglishFactoryTest.java b/xjs-business/xjs-business-openapi/src/test/java/com/xjs/oneenglish/factory/TianXingOneEnglishFactoryTest.java index 7b4804fc..c82921b6 100644 --- a/xjs-business/xjs-business-openapi/src/test/java/com/xjs/oneenglish/factory/TianXingOneEnglishFactoryTest.java +++ b/xjs-business/xjs-business-openapi/src/test/java/com/xjs/oneenglish/factory/TianXingOneEnglishFactoryTest.java @@ -1,7 +1,7 @@ package com.xjs.oneenglish.factory; import com.xjs.XjsOpenApiApp; -import com.xjs.config.TianXingProperties; +import com.xjs.properties.TianXingProperties; import com.xjs.copywriting.domain.CopyWriting; import com.xjs.copywriting.mapper.CopyWritingMapper; import com.xjs.copywriting.service.CopyWritingService;