update 国际化修改

laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java

@@ -86,6 +86,8 @@ public class ResultCommon {
 
     public static final String ZIP_CHARSET_ERROR = "zip.charset.error"; // zip压缩包编码错误
 
+    /**字段名称太长*/
+    public static final String TAG_ADD_ERROR_1 = "tag.add.error.1";
     /**同一所属模块下,展示区域名称不能重复！*/
     public static final String TAG_ERROR_1 = "tag.error.1";
     /**该展示区域有关联数据，无法删除！*/

laws-base/laws-base-core/src/main/java/com/jero/config/MyLocaleResolver.java

@@ -16,7 +16,7 @@ public class MyLocaleResolver implements LocaleResolver {
 
     @Override
     public Locale resolveLocale(HttpServletRequest httpServletRequest) {
-        String l = httpServletRequest.getHeader("l");
+        String l = httpServletRequest.getHeader("Language");
         Locale locale = Locale.CHINESE;
         if (StringUtils.isNotBlank(l)){
             locale = new Locale(l);

laws-modules/src/main/java/com/jero/modules/tag/service/impl/ILawsTagServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
@@ -101,7 +102,7 @@ public class ILawsTagServiceImpl extends ServiceImpl<LawsTagMapper, LawsTag> imp
 				lawsTag.setDbFieldName("grp_" + dbFieldName);
 			}
 			if (dbFieldName.length() > 64){
-				throw new JeroBootException("tag.add.字段名称太长",dbFieldName);
+				throw new JeroBootException(ResultCommon.TAG_ADD_ERROR_1,dbFieldName);
 			}
 
 		if (lawsTag1 != null){
@@ -175,7 +176,7 @@ public class ILawsTagServiceImpl extends ServiceImpl<LawsTagMapper, LawsTag> imp
 			lawsTag.setDbFieldName("grp_" + dbFieldName);
 		}
 		if (dbFieldName.length() > 64){
-			throw new JeroBootException("tag.add.字段名称太长",dbFieldName);
+			throw new JeroBootException(ResultCommon.TAG_ADD_ERROR_1,dbFieldName);
 		}
 		executeDDL(lawsTag,"modify");
 		lawsTag.setDbFieldNameOld(dbFieldName);

laws-single-startup/src/main/resources/application-prod.yml

@@ -24,6 +24,8 @@ spring:
     multipart:
       max-file-size: 500MB
       max-request-size: 500MB
+  messages:
+    basename: i18n/messages
   mail:
     host: smtp.163.com
     username: test@163.com

laws-single-startup/src/main/resources/i18n/messages.properties

@@ -1,7 +1,5 @@
 message=1
 message.operate.error=123{0}
-tag.add.\u5B57\u6BB5\u540D\u79F0\u592A\u957F=\u60A8\u8BBE\u7F6E\u7684\u5B57\u6BB5\u540D\u4E3A{0}\uFF0C\u6700\u957F\u4E3A64\u4F4D\u5B57\u7B26\u3002
-tag.delete.\u5305\u542B\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664=\u5305\u542B\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664
 tag.edit.error.2=\u5C5E\u6027\u5DF2\u5B58\u5728,\u8BF7\u68C0\u67E5
 es.rmr.setQuality.overTen=\u8BF7\u6700\u591A\u9009\u62E910\u6761
 message.ok=\u64CD\u4F5C\u6210\u529F

laws-single-startup/src/main/resources/i18n/messages_en.properties

@@ -1,7 +1,5 @@
 message=1
 message.operate.error=123{0}
-tag.add.\u5B57\u6BB5\u540D\u79F0\u592A\u957F=The field name you set is {0}, with a maximum length of 64 characters.
-tag.delete.\u5305\u542B\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664=It contains fixed fields and cannot be deleted.
 tag.edit.error.2=Attribute already exists, please check!
 message.ok=Successful operation
 message.error=Operation failure

laws-single-startup/src/main/resources/i18n/messages_zh.properties

@@ -1,7 +1,5 @@
 message=1
 message.operate.error=123{0}
-tag.add.\u5B57\u6BB5\u540D\u79F0\u592A\u957F=\u60A8\u8BBE\u7F6E\u7684\u5B57\u6BB5\u540D\u4E3A{0}\uFF0C\u6700\u957F\u4E3A64\u4F4D\u5B57\u7B26\u3002
-tag.delete.\u5305\u542B\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664=\u5305\u542B\u56FA\u5B9A\u5B57\u6BB5,\u4E0D\u53EF\u5220\u9664
 tag.edit.error.2=\u5C5E\u6027\u5DF2\u5B58\u5728,\u8BF7\u68C0\u67E5
 es.rmr.setQuality.overTen=\u8BF7\u6700\u591A\u9009\u62E910\u6761
 message.ok=\u64CD\u4F5C\u6210\u529F