I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/dev' into test

Browse Source
yun-zuoyi
wei.peng 6 years ago
parent 5812b5b7b5 4dff4c6fc3
commit b01cc47629
3 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File

3
modules/i3plus-core-apiservice/src/main/resources/application-dev.properties
Unescape Escape View File

@ -7,7 +7,7 @@ impp.console.ip=http://192.168.1.56:8010
#服务注册中心(多注册中心逗号分隔) #服务注册中心(多注册中心逗号分隔)
impp.cluster.regist.center=http://192.168.1.56:8000/eureka/ impp.cluster.regist.center=http://192.168.1.56:8000/eureka/
#日志默认使用log4j2 #日志默认使用log4j2
logging.config=classpath:log4j2-spring-prod.xml logging.config=classpath:log4j2-spring-dev.xml
########平台相关参数########## ########平台相关参数##########
#是否开启redis缓存 #是否开启redis缓存
@ -106,7 +106,6 @@ impp.schedule.thread-count=10
impp.schedule.thread-priority=5 impp.schedule.thread-priority=5
################################ 其他功能设置 ################################ ################################ 其他功能设置 ################################
#redisIP #redisIP
redis.hostName=192.168.1.55 redis.hostName=192.168.1.55

31
modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
Unescape Escape View File

@ -1,11 +1,11 @@
#本机ip #本机ip
impp.server.ip=192.168.1.56 impp.server.ip=192.168.1.241
#项目端口 #项目端口
server.port=1100 server.port=18100
#链路追踪zipkin控制台ip地址 #链路追踪zipkin控制台ip地址
impp.console.ip=http://192.168.1.56:8010 impp.console.ip=http://192.168.1.241:18010
#服务注册中心(多注册中心逗号分隔) #服务注册中心(多注册中心逗号分隔)
impp.cluster.regist.center=http://192.168.1.56:8000/eureka/ impp.cluster.regist.center=http://192.168.1.241:18000/eureka/
#日志默认使用log4j2 #日志默认使用log4j2
logging.config=classpath:log4j2-spring-prod.xml logging.config=classpath:log4j2-spring-prod.xml
@ -44,11 +44,11 @@ impp.mq.queue.sweb.notice=true
spring.datasource.validationQuery=SELECT 1 spring.datasource.validationQuery=SELECT 1
################ 数据池设置 ################ ################ 数据池设置 ################
spring.datasource.maximum-pool-size=300 spring.datasource.maximum-pool-size=200
spring.datasource.max-active=200 spring.datasource.max-active=100
spring.datasource.max-idle=150 spring.datasource.max-idle=100
spring.datasource.min-idle=50 spring.datasource.min-idle=30
spring.datasource.initial-size=30 spring.datasource.initial-size=20
spring.datasource.max-wait=10000 spring.datasource.max-wait=10000
spring.datasource.validation-query=SELECT 1 spring.datasource.validation-query=SELECT 1
spring.datasource.test-on-borrow=false spring.datasource.test-on-borrow=false
@ -58,20 +58,20 @@ spring.datasource.time-between-eviction-runs-millis=18800
##主数据源，读写 ##主数据源，读写
#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/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.240:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.write.datasource.username=impp_i3_core_user impp.write.datasource.username=impp_i3_core_user
impp.write.datasource.password=impp_i3_core_pwd impp.write.datasource.password=impp_i3_core_pwd
##辅数据源，只读 ##辅数据源，只读
#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/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.240:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.read.datasource.username=impp_i3_core_user impp.read.datasource.username=impp_i3_core_user
impp.read.datasource.password=impp_i3_core_pwd impp.read.datasource.password=impp_i3_core_pwd
################ 日志数据源 ################ ################ 日志数据源 ################
spring.data.mongodb.database=mongoDBSource spring.data.mongodb.database=mongoDBSource
spring.data.mongodb.uri=192.168.1.55:27017 spring.data.mongodb.uri=192.168.1.240:27017
spring.data.mongodb.username=sa spring.data.mongodb.username=sa
spring.data.mongodb.password=i3plus spring.data.mongodb.password=i3plus
spring.data.mongodb.port=27017 spring.data.mongodb.port=27017
@ -90,7 +90,7 @@ spring.jpa.properties.hibernate.hbm2ddl.auto=update
##############定时任务持久化############## ##############定时任务持久化##############
impp.schedule.open=true impp.schedule.open=true
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/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.240:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.schedule.datasource.username=impp_i3_schedule_user impp.schedule.datasource.username=impp_i3_schedule_user
impp.schedule.datasource.password=impp_i3_schedule_pwd impp.schedule.datasource.password=impp_i3_schedule_pwd
impp.schedule.datasource.max-connections=20 impp.schedule.datasource.max-connections=20
@ -109,7 +109,7 @@ impp.schedule.thread-priority=5
################################ 其他功能设置 ################################ ################################ 其他功能设置 ################################
#redisIP #redisIP
redis.hostName=192.168.1.55 redis.hostName=192.168.1.240
#端口号 #端口号
redis.port=16376 redis.port=16376
#如果有密码 #如果有密码
@ -117,14 +117,13 @@ redis.password=
##其他redis配置需要调整的加在此处 ##其他redis配置需要调整的加在此处
################## rabbitMQ配置 #################### ################## rabbitMQ配置 ####################
spring.rabbitmq.vhost=/ spring.rabbitmq.vhost=/
spring.rabbitmq.host=192.168.1.55 spring.rabbitmq.host=192.168.1.240
spring.rabbitmq.port=5672 spring.rabbitmq.port=5672
spring.rabbitmq.username=estsh spring.rabbitmq.username=estsh
spring.rabbitmq.password=estsh123 spring.rabbitmq.password=estsh123
##其他rabbitMq配置需要调整的加在此处 ##其他rabbitMq配置需要调整的加在此处
################ 微服配置 ################ ################ 微服配置 ################
#是否进行健康检查 #是否进行健康检查
eureka.client.healthcheck.enabled=true eureka.client.healthcheck.enabled=true

20
modules/i3plus-core-apiservice/src/main/resources/application-test.properties
Unescape Escape View File

@ -1,13 +1,13 @@
#本机ip #本机ip
impp.server.ip=192.168.1.56 impp.server.ip=192.168.1.241
#项目端口 #项目端口
server.port=58100 server.port=58100
#链路追踪zipkin控制台ip地址 #链路追踪zipkin控制台ip地址
impp.console.ip=http://192.168.1.56:8010 impp.console.ip=http://192.168.1.241:8010
#服务注册中心(多注册中心逗号分隔) #服务注册中心(多注册中心逗号分隔)
impp.cluster.regist.center=http://192.168.1.56:8000/eureka/ impp.cluster.regist.center=http://192.168.1.241:8000/eureka/
#日志默认使用log4j2 #日志默认使用log4j2
logging.config=classpath:log4j2-spring-prod.xml logging.config=classpath:log4j2-spring-test.xml
########平台相关参数########## ########平台相关参数##########
#是否开启redis缓存 #是否开启redis缓存
@ -58,20 +58,20 @@ spring.datasource.time-between-eviction-runs-millis=18800
##主数据源，读写 ##主数据源，读写
#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/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.240:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.write.datasource.username=impp_i3_core_user impp.write.datasource.username=impp_i3_core_user
impp.write.datasource.password=impp_i3_core_pwd impp.write.datasource.password=impp_i3_core_pwd
##辅数据源，只读 ##辅数据源，只读
#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/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.240:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.read.datasource.username=impp_i3_core_user impp.read.datasource.username=impp_i3_core_user
impp.read.datasource.password=impp_i3_core_pwd impp.read.datasource.password=impp_i3_core_pwd
################ 日志数据源 ################ ################ 日志数据源 ################
spring.data.mongodb.database=mongoDBSource spring.data.mongodb.database=mongoDBSource
spring.data.mongodb.uri=192.168.1.55:27017 spring.data.mongodb.uri=192.168.1.240:27017
spring.data.mongodb.username=sa spring.data.mongodb.username=sa
spring.data.mongodb.password=i3plus spring.data.mongodb.password=i3plus
spring.data.mongodb.port=27017 spring.data.mongodb.port=27017
@ -90,7 +90,7 @@ spring.jpa.properties.hibernate.hbm2ddl.auto=update
##############定时任务持久化############## ##############定时任务持久化##############
impp.schedule.open=true impp.schedule.open=true
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/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.240:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.schedule.datasource.username=impp_i3_schedule_user impp.schedule.datasource.username=impp_i3_schedule_user
impp.schedule.datasource.password=impp_i3_schedule_pwd impp.schedule.datasource.password=impp_i3_schedule_pwd
impp.schedule.datasource.max-connections=20 impp.schedule.datasource.max-connections=20
@ -109,7 +109,7 @@ impp.schedule.thread-priority=5
################################ 其他功能设置 ################################ ################################ 其他功能设置 ################################
#redisIP #redisIP
redis.hostName=192.168.1.55 redis.hostName=192.168.1.240
#端口号 #端口号
redis.port=16376 redis.port=16376
#如果有密码 #如果有密码
@ -117,7 +117,7 @@ redis.password=
##其他redis配置需要调整的加在此处 ##其他redis配置需要调整的加在此处
################## rabbitMQ配置 #################### ################## rabbitMQ配置 ####################
spring.rabbitmq.vhost=/ spring.rabbitmq.vhost=/
spring.rabbitmq.host=192.168.1.55 spring.rabbitmq.host=192.168.1.240
spring.rabbitmq.port=5672 spring.rabbitmq.port=5672
spring.rabbitmq.username=estsh spring.rabbitmq.username=estsh
spring.rabbitmq.password=estsh123 spring.rabbitmq.password=estsh123

Write Preview
Loading…
Cancel
Save