ignore整理

yun-zuoyi
alwaysfrin 7 years ago
parent 41f15551aa
commit cae7ba95de

@ -1,7 +1,8 @@
package cn.estsh.i3plus.core.apiservice.listener; package cn.estsh.i3plus.core.apiservice.listener;
import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService; 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.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
@ -110,10 +111,10 @@ public class SysResourceBindleListener implements ApplicationListener<ContextRef
langMsgMap.put(lang.getLanguageCode(),resMap); langMsgMap.put(lang.getLanguageCode(),resMap);
} }
redisCore.putHashMap(ConstWords.PLAT_MODULE_PREX,langModoleMap); redisCore.putHashMap(CommonConstWords.RES_PLAT_MODULE,langModoleMap);
redisCore.putHashMap(ConstWords.PLAT_MODULE_METHOD_PREX,langMethodMap); redisCore.putHashMap(CommonConstWords.RES_PLAT_MODULE_METHOD,langMethodMap);
redisCore.putHashMap(ConstWords.PLAT_MODULE_BUTTON_PREX,langBtnMap); redisCore.putHashMap(CommonConstWords.RES_PLAT_MODULE_BUTTON,langBtnMap);
redisCore.putHashMap(ConstWords.LANGUAGE_CONVERT_PREX,langMsgMap); redisCore.putHashMap(CommonConstWords.RES_LANGUAGE_CONVERT,langMsgMap);
LOGGER.info("【资源配置文件已全部加载】"); LOGGER.info("【资源配置文件已全部加载】");
} }

@ -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_";
}

@ -1,18 +1,18 @@
#用户登陆路径 #用户登陆路径
filter.shiro.user.loginuri = /login filter.shiro.user.loginuri = /login
#系统管理员登陆路径 #系统管理员登陆路径
filter.shiro.admin.loginuri = /salogin filter.shiro.admin.loginuri = /salogin
#运维人员登陆路径 #运维人员登陆路径
filter.shiro.saadmin.loginuri = /salogin filter.shiro.saadmin.loginuri = /salogin
#用户授权过滤路径 #用户授权过滤路径
filter.shiro.user.filteruri = /operate/* filter.shiro.user.filteruri = /operate/*
#用户授权过滤路径 #用户授权过滤路径
filter.shiro.admin.filteruri = /adoperate/* filter.shiro.admin.filteruri = /adoperate/*
#用户授权过滤路径 #用户授权过滤路径
filter.shiro.saadmin.filteruri = /saoperate/* filter.shiro.saadmin.filteruri = /saoperate/*
################ 主数据源 ################ ################ 主数据源 ################
# mysql # mysql
#spring.datasource.driver-class-name=com.mysql.jdbc.Driver #spring.datasource.driver-class-name=com.mysql.jdbc.Driver
#spring.datasource.url=jdbc:mysql://localhost:3306/i3wms #spring.datasource.url=jdbc:mysql://localhost:3306/i3wms
@ -25,39 +25,39 @@ filter.shiro.saadmin.filteruri = /saoperate/*
#spring.datasource.username=root #spring.datasource.username=root
#spring.datasource.password=123456 #spring.datasource.password=123456
##主数据源,读写 ##主数据源,读写
#impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource
impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver 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.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.username=i3_dev_core
impp.write.datasource.password=i3_core_pass impp.write.datasource.password=i3_core_pass
##辅数据源,只读 ##辅数据源,只读
#impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource #impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource
impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver 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.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.username=i3_dev_core
impp.read.datasource.password=i3_core_pass impp.read.datasource.password=i3_core_pass
##############定时任务持久化############## ##############定时任务持久化##############
impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver 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.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.username=i3_dev_schedule
impp.schedule.datasource.password=i3_schedule_pass impp.schedule.datasource.password=i3_schedule_pass
impp.schedule.datasource.max-connections=20 impp.schedule.datasource.max-connections=20
#定时任务在服务启动后多少秒执行 #定时任务在服务启动后多少秒执行
impp.schedule.start.after-second=20 impp.schedule.start.after-second=20
#是否集群部署 #是否集群部署
impp.schedule.datasource.is-clustered=true impp.schedule.datasource.is-clustered=true
#执行检测(毫秒),若宕机由其他定时器执行 #执行检测(毫秒),若宕机由其他定时器执行
impp.schedule.datasource.cluster-checkin-interval=30000 impp.schedule.datasource.cluster-checkin-interval=30000
#线程数 #线程数
impp.schedule.thread-count=10 impp.schedule.thread-count=10
#线程优先级1-10默认为5 #线程优先级1-10默认为5
impp.schedule.thread-priority=5 impp.schedule.thread-priority=5
################ 数据池设置 ################ ################ 数据池设置 ################
spring.datasource.maximum-pool-size=100 spring.datasource.maximum-pool-size=100
spring.datasource.max-active=3 spring.datasource.max-active=3
spring.datasource.max-idle=3 spring.datasource.max-idle=3
@ -69,7 +69,7 @@ spring.datasource.test-on-borrow=false
spring.datasource.test-while-idle=true spring.datasource.test-while-idle=true
spring.datasource.time-between-eviction-runs-millis=18800 spring.datasource.time-between-eviction-runs-millis=18800
################ JPA设置设置 ################ ################ JPA设置设置 ################
# mysql # mysql
spring.jpa.database=MYSQL spring.jpa.database=MYSQL
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
@ -87,9 +87,9 @@ spring.datasource.validationQuery=SELECT 1
##oracle## ##oracle##
# spring.datasource.validationQuery=SELECT 1 FROM DUAL # 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 # 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 spring.jpa.properties.hibernate.hbm2ddl.auto=update
#是否显示sql #是否显示sql
spring.jpa.show-sql=true spring.jpa.show-sql=true

@ -1,32 +1,32 @@
#项目名称 #项目名称
spring.application.name=${project.name} spring.application.name=${project.name}
#项目端口 #项目端口
server.port=8080 server.port=8080
#使用配置 #使用配置
spring.profiles.active=dev spring.profiles.active=dev
######### 自定义参数 ######### ######### 自定义参数 #########
#项目描述信息swagger中显式 #项目描述信息swagger中显式
desc.application.name=Intelligent Manufacturing System desc.application.name=Intelligent Manufacturing System
#当前项目版本 #当前项目版本
version=${project.version} version=${project.version}
#日志默认使用log4j2 #日志默认使用log4j2
logging.config=classpath:log4j2.xml logging.config=classpath:log4j2.xml
#上传单个文件大小 #上传单个文件大小
spring.servlet.multipart.max-file-size=1MB spring.servlet.multipart.max-file-size=1MB
#request请求全部数据最大限制 #request请求全部数据最大限制
spring.servlet.multipart.max-request-size=10MB spring.servlet.multipart.max-request-size=10MB
#是否推迟文件解析true则接受完后再解析 #是否推迟文件解析true则接受完后再解析
spring.servlet.multipart.resolve-lazily=true spring.servlet.multipart.resolve-lazily=true
########## 页面配置 ######## ########## 页面配置 ########
#访问相关配置 #访问相关配置
server.tomcat.uri-encoding=UTF-8 server.tomcat.uri-encoding=UTF-8
#Spring boot视图配置 #Spring boot视图配置
spring.mvc.view.prefix=/upload_demo spring.mvc.view.prefix=/upload_demo
spring.mvc.view.suffix=.jsp spring.mvc.view.suffix=.jsp
#静态文件访问配置 #静态文件访问配置
spring.resources.static-locations=/static/**,/** spring.resources.static-locations=/static/**,/**
Loading…
Cancel
Save