diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml
index 7484e99..cbfbca2 100644
--- a/modules/i3plus-core-api/pom.xml
+++ b/modules/i3plus-core-api/pom.xml
@@ -5,7 +5,7 @@
i3plus-core
i3plus.core
- 1.0-SNAPSHOT-TEST
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml
index 276d7e4..50107af 100644
--- a/modules/i3plus-core-apiservice/pom.xml
+++ b/modules/i3plus-core-apiservice/pom.xml
@@ -5,7 +5,7 @@
i3plus-core
i3plus.core
- 1.0-SNAPSHOT-TEST
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
index 73f944e..586923c 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
@@ -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
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
index 3dbaed7..d7dc9a4 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
@@ -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
diff --git a/pom.xml b/pom.xml
index 621ffd8..0a79893 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
i3plus.core
i3plus-core
pom
- 1.0-SNAPSHOT-TEST
+ 1.0-DEV-SNAPSHOT
modules/i3plus-core-api
modules/i3plus-core-apiservice
@@ -28,9 +28,9 @@
1.8
Finchley.RELEASE
INFO
- E:/i3plus-platform-logs/${project.name}
- E:/i3plus-platform-logs/${project.name}-error
- E:/i3plus-platform-logs/${project.name}-controller
+ ../logs/${project.name}
+ ../logs/${project.name}-error
+ ../logs/${project.name}-controller
2.9.1
2.6
2.1