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

Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test

Browse Source 
# Conflicts:
#	modules/i3plus-core-api/pom.xml
#	modules/i3plus-core-apiservice/pom.xml
#	modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
#	modules/i3plus-core-apiservice/src/main/resources/application-test.properties
#	pom.xml
yun-zuoyi
wei.peng 7 years ago
parent b6caf12c92 fcc97cb438
commit b32d868279
5 changed files with 28 additions and 50 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-core-api/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-core</artifactId>
<groupId>i3plus.core</groupId>
<version>1.0-SNAPSHOT-TEST</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
modules/i3plus-core-apiservice/pom.xml
Unescape Escape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-core</artifactId>
<groupId>i3plus.core</groupId>
<version>1.0-SNAPSHOT-TEST</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

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

@ -1,5 +1,5 @@
#项目端口
server.port=1100
server.port=8100
#本机ip
impp.server.ip=192.168.1.56
#console控制台服务（zipkin追踪全路径）
@ -13,11 +13,6 @@ impp.cluster.regist.center=http://reg.estsh.com/eureka/
#多注册中心
#impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/
################ 功能配置2 ################
#是否允许前端跨域提交impp.web.cross.hosts
impp.web.cross = true
################ 授权过滤配置 ################
#用户登陆路径
filter.shiro.user.loginuri = /login
#系统管理员登陆路径
@ -84,7 +79,7 @@ spring.zipkin.base-url=${impp.console.ip}
spring.sleuth.sampler.probability=1.0
################ 日志据源 ################
spring.data.mongodb.database=prodMongoDBSource
spring.data.mongodb.database=mongoDBSource
spring.data.mongodb.uri=192.168.1.55:27017
spring.data.mongodb.username=sa
spring.data.mongodb.password=i3plus
@ -106,22 +101,22 @@ spring.data.mongodb.port=27017
##主数据源，读写
#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:3309/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.write.datasource.username=impp_i3_core_user
impp.write.datasource.password=impp_i3_core_pwd
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:3309/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.read.datasource.username=impp_i3_core_user
impp.read.datasource.password=impp_i3_core_pwd
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:3309/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.schedule.datasource.username=impp_i3_schedule_user
impp.schedule.datasource.password=impp_i3_schedule_pwd
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

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

@ -1,22 +1,5 @@
#项目端口
server.port=58100
#本机ip
impp.server.ip=192.168.1.56
#console控制台服务（zipkin追踪全路径）
impp.console.ip=http://cst.estsh.com
################ 功能配置1 ################
#若无法连接注册中心，是否需要一直检测加入
impp.cluster.fetch=true
#服务注册中心
impp.cluster.regist.center=http://regt.estsh.com/eureka/
#多注册中心
#impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/
################ 功能配置2 ################
#是否允许前端跨域提交impp.web.cross.hosts
impp.web.cross = true
server.port=51010
################ 授权过滤配置 ################
#用户登陆路径
filter.shiro.user.loginuri = /login
@ -84,7 +67,7 @@ spring.zipkin.base-url=${impp.console.ip}
spring.sleuth.sampler.probability=1.0
################ 日志据源 ################
spring.data.mongodb.database=testMongoDBSource
spring.data.mongodb.database=mongoDBSource
spring.data.mongodb.uri=192.168.1.55:27017
spring.data.mongodb.username=sa
spring.data.mongodb.password=i3plus
@ -106,22 +89,22 @@ spring.data.mongodb.port=27017
##主数据源，读写
#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:3308/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.write.datasource.username=impp_i3_core_user
impp.write.datasource.password=impp_i3_core_pwd
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:3308/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.read.datasource.username=impp_i3_core_user
impp.read.datasource.password=impp_i3_core_pwd
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:3308/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8
impp.schedule.datasource.username=impp_i3_schedule_user
impp.schedule.datasource.password=impp_i3_schedule_pwd
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

8
pom.xml
Unescape Escape View File

@ -7,7 +7,7 @@
<groupId>i3plus.core</groupId>
<artifactId>i3plus-core</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT-TEST</version>
<version>1.0-DEV-SNAPSHOT</version>
<modules>
<module>modules/i3plus-core-api</module>
<module>modules/i3plus-core-apiservice</module>
@ -28,9 +28,9 @@
<java.version>1.8</java.version>
<spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
<log4j2.level>INFO</log4j2.level>
<log4j2.root.path>E:/i3plus-platform-logs/${project.name}</log4j2.root.path>
<log4j2.error.path>E:/i3plus-platform-logs/${project.name}-error</log4j2.error.path>
<log4j2.package.path>E:/i3plus-platform-logs/${project.name}-controller</log4j2.package.path>
<log4j2.root.path>../logs/${project.name}</log4j2.root.path>
<log4j2.error.path>../logs/${project.name}-error</log4j2.error.path>
<log4j2.package.path>../logs/${project.name}-controller</log4j2.package.path>
<maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version>
<maven-jar-plugin.version>2.6</maven-jar-plugin.version>
<maven-compiler-plugin.version>2.1</maven-compiler-plugin.version>

Write Preview
Loading…
Cancel
Save