clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、调整common包的config包路径 

2、新增国际化配置配置文件
This commit is contained in:
xjs 2022-02-09 10:48:29 +08:00
parent f6d56d9b3f
commit 2e1b9f97b6
34 changed files with 82 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
xjs-business/xjs-business-common/src/main/java/com/xjs/config/LocaleResolverConfig.java Normal file
View File

@ -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();
}
}

2
xjs-business/xjs-business-common/src/main/java/com/xjs/config/BaiduProperties.java → xjs-business/xjs-business-common/src/main/java/com/xjs/properties/BaiduProperties.java
View File

@ -1,4 +1,4 @@
package com.xjs.config;
package com.xjs.properties;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

2
xjs-business/xjs-business-common/src/main/java/com/xjs/config/GaodeProperties.java → xjs-business/xjs-business-common/src/main/java/com/xjs/properties/GaodeProperties.java
View File

@ -1,4 +1,4 @@
package com.xjs.config;
package com.xjs.properties;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

2
xjs-business/xjs-business-common/src/main/java/com/xjs/config/RollProperties.java → xjs-business/xjs-business-common/src/main/java/com/xjs/properties/RollProperties.java
View File

@ -1,4 +1,4 @@
package com.xjs.config;
package com.xjs.properties;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

2
xjs-business/xjs-business-common/src/main/java/com/xjs/config/TianXingProperties.java → xjs-business/xjs-business-common/src/main/java/com/xjs/properties/TianXingProperties.java
View File

@ -1,4 +1,4 @@
package com.xjs.config;
package com.xjs.properties;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollBeautyPictureFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollChineseDictFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollForecastWeatherFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollGarbageSortingFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollHistoryTodayFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollHolidayFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollIdcardQueryFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollMobileBelongFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollNowWeatherFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/factory/impl/RollSimpleComplexFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/aword/factory/impl/TianXingAWordFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/RollMMYJCopyWritingFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingJDTCCopyWritingFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingMMMYCopyWritingFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingPYQCopyWritingFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/factory/impl/TianXingWYYCopyWritingFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/oneenglish/factory/impl/TianXingOneEnglishFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchAllnetworkFactory.java
View File

@ -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;

3
xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchBaiduFactory.java
View File

@ -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;

5
xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchDouyinFactory.java
View File

@ -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;

3
xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchWechatFactory.java
View File

@ -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;

3
xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/factory/impl/TianXingTopsearchWeiboFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/BaiDuTranslationFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/RollTranslationFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/factory/impl/TianXingTranDictFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/GaodeForecastWeatherFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/GaodeNowWeatherFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/main/java/com/xjs/weather/factory/impl/RollIPFactory.java
View File

@ -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;

2
xjs-business/xjs-business-openapi/src/test/java/com/xjs/oneenglish/factory/TianXingOneEnglishFactoryTest.java
View File

@ -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;