From cae7ba95de58a3fc3e7a233531ef30b03adb41fc Mon Sep 17 00:00:00 2001
From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com>
Date: Wed, 24 Oct 2018 17:06:14 +0800
Subject: [PATCH] =?UTF-8?q?ignore=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/SysResourceBindleListener.java        | 11 +++---
 .../i3plus/core/apiservice/util/ConstWords.java    | 22 ------------
 .../src/main/resources/application-dev.properties  | 40 +++++++++++-----------
 .../src/main/resources/application.properties      | 28 +++++++--------
 4 files changed, 40 insertions(+), 61 deletions(-)
 delete mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ConstWords.java

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/listener/SysResourceBindleListener.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/listener/SysResourceBindleListener.java
index 897dbeb..92c7b09 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/listener/SysResourceBindleListener.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/listener/SysResourceBindleListener.java
@@ -1,7 +1,8 @@
 package cn.estsh.i3plus.core.apiservice.listener;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService;
-import cn.estsh.i3plus.core.apiservice.util.ConstWords;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
+import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
 import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
@@ -110,10 +111,10 @@ public class SysResourceBindleListener implements ApplicationListener<ContextRef
             langMsgMap.put(lang.getLanguageCode(),resMap);
         }
 
-        redisCore.putHashMap(ConstWords.PLAT_MODULE_PREX,langModoleMap);
-        redisCore.putHashMap(ConstWords.PLAT_MODULE_METHOD_PREX,langMethodMap);
-        redisCore.putHashMap(ConstWords.PLAT_MODULE_BUTTON_PREX,langBtnMap);
-        redisCore.putHashMap(ConstWords.LANGUAGE_CONVERT_PREX,langMsgMap);
+        redisCore.putHashMap(CommonConstWords.RES_PLAT_MODULE,langModoleMap);
+        redisCore.putHashMap(CommonConstWords.RES_PLAT_MODULE_METHOD,langMethodMap);
+        redisCore.putHashMap(CommonConstWords.RES_PLAT_MODULE_BUTTON,langBtnMap);
+        redisCore.putHashMap(CommonConstWords.RES_LANGUAGE_CONVERT,langMsgMap);
 
         LOGGER.info("【资源配置文件已全部加载】");
     }
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ConstWords.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ConstWords.java
deleted file mode 100644
index 4374347..0000000
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ConstWords.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.estsh.i3plus.core.apiservice.util;
-
-/**
- * @Description :
- * @Reference :
- * @Author : alwaysfrin
- * @CreateDate : 2018-10-12 18:49
- * @Modify:
- **/
-public class ConstWords {
-    //语言前缀（用于存放redis中作为key）
-    public static final String LANGUAGE_CONVERT_PREX = "LANGUAGE_CONVERT_PREX_";
-
-    //系统模块功能
-    public static final String PLAT_MODULE_PREX = "PLAT_MODULE_PREX_";
-
-    //系统功能功能
-    public static final String PLAT_MODULE_METHOD_PREX = "PLAT_MODULE_METHOD_PREX_";
-
-    //系统按钮功能
-    public static final String PLAT_MODULE_BUTTON_PREX = "PLAT_MODULE_BUTTON_PREX_";
-}
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
index 1b8c5bf..6802558 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
@@ -1,18 +1,18 @@
-#�û���½·��
+#用户登陆路径
 filter.shiro.user.loginuri = /login
-#ϵͳ����Ա��½·��
+#系统管理员登陆路径
 filter.shiro.admin.loginuri = /salogin
-#��ά��Ա��½·��
+#运维人员登陆路径
 filter.shiro.saadmin.loginuri = /salogin
 
-#�û���Ȩ����·��
+#用户授权过滤路径
 filter.shiro.user.filteruri = /operate/*
-#�û���Ȩ����·��
+#用户授权过滤路径
 filter.shiro.admin.filteruri = /adoperate/*
-#�û���Ȩ����·��
+#用户授权过滤路径
 filter.shiro.saadmin.filteruri = /saoperate/*
 
-################ ������Դ ################
+################ 主数据源 ################
 # mysql
 #spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 #spring.datasource.url=jdbc:mysql://localhost:3306/i3wms
@@ -25,39 +25,39 @@ filter.shiro.saadmin.filteruri = /saoperate/*
 #spring.datasource.username=root
 #spring.datasource.password=123456
 
-##������Դ����д
+##主数据源，读写
 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource
 impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver
 impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
 impp.write.datasource.username=i3_dev_core
 impp.write.datasource.password=i3_core_pass
 
-##������Դ��ֻ��
+##辅数据源，只读
 #impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource
 impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver
 impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
 impp.read.datasource.username=i3_dev_core
 impp.read.datasource.password=i3_core_pass
 
-##############��ʱ����־û�##############
+##############定时任务持久化##############
 impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver
 impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8
 impp.schedule.datasource.username=i3_dev_schedule
 impp.schedule.datasource.password=i3_schedule_pass
 impp.schedule.datasource.max-connections=20
-#��ʱ�����ڷ��������������ִ��
+#定时任务在服务启动后多少秒执行
 impp.schedule.start.after-second=20
-#�Ƿ�Ⱥ����
+#是否集群部署
 impp.schedule.datasource.is-clustered=true
-#ִ�м�⣨���룩����崻���������ʱ��ִ��
+#执行检测（毫秒），若宕机由其他定时器执行
 impp.schedule.datasource.cluster-checkin-interval=30000
-#�߳���
+#线程数
 impp.schedule.thread-count=10
-#�߳����ȼ���1-10��Ĭ��Ϊ5
+#线程优先级（1-10）默认为5
 impp.schedule.thread-priority=5
 
 
-################ ���ݳ����� ################
+################ 数据池设置 ################
 spring.datasource.maximum-pool-size=100
 spring.datasource.max-active=3
 spring.datasource.max-idle=3
@@ -69,7 +69,7 @@ spring.datasource.test-on-borrow=false
 spring.datasource.test-while-idle=true
 spring.datasource.time-between-eviction-runs-millis=18800
 
-################ JPA�������� ################
+################ JPA设置设置 ################
 # mysql
 spring.jpa.database=MYSQL
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
@@ -87,9 +87,9 @@ spring.datasource.validationQuery=SELECT 1
 ##oracle##
 # spring.datasource.validationQuery=SELECT 1 FROM DUAL
 
-#ImprovedNamingStrategy / physical_naming_strategy java����ӳ�䵽���ݿ��ֶ�ʱ��������
+#ImprovedNamingStrategy / physical_naming_strategy java属性映射到数据库字段时命名规则
 # spring.jpa.properties.hibernate.physical_naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy/org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-#����ϵcreate,create-drop,update,validate
+#表关系create,create-drop,update,validate
 spring.jpa.properties.hibernate.hbm2ddl.auto=update
-#�Ƿ���ʾsql
+#是否显示sql
 spring.jpa.show-sql=true
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties
index 15285c9..8ec3b58 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties
@@ -1,32 +1,32 @@
-#��Ŀ����
+#项目名称
 spring.application.name=${project.name}
-#��Ŀ�˿�
+#项目端口
 server.port=8080
 
-#ʹ������
+#使用配置
 spring.profiles.active=dev
 
-######### �Զ������ #########
-#��Ŀ������Ϣ��swagger����ʽ��
+######### 自定义参数 #########
+#项目描述信息（swagger中显式）
 desc.application.name=Intelligent Manufacturing System 
-#��ǰ��Ŀ�汾
+#当前项目版本
 version=${project.version}
 
-#��־Ĭ��ʹ��log4j2
+#日志默认使用log4j2
 logging.config=classpath:log4j2.xml
 
-#�ϴ������ļ���С
+#上传单个文件大小
 spring.servlet.multipart.max-file-size=1MB
-#request����ȫ�������������
+#request请求全部数据最大限制
 spring.servlet.multipart.max-request-size=10MB
-#�Ƿ��Ƴ��ļ�������true���������ٽ���
+#是否推迟文件解析，true则接受完后再解析
 spring.servlet.multipart.resolve-lazily=true
 
-########## ҳ������ ########
-#�����������
+########## 页面配置 ########
+#访问相关配置
 server.tomcat.uri-encoding=UTF-8
-#Spring boot��ͼ����
+#Spring boot视图配置
 spring.mvc.view.prefix=/upload_demo
 spring.mvc.view.suffix=.jsp
-#��̬�ļ���������
+#静态文件访问配置
 spring.resources.static-locations=/static/**,/**
\ No newline at end of file