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

# 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
7 years ago · dfbc0b5eeb
parent b382c5ae00
commit dfbc0b5eeb
1 changed files with 1 additions and 1 deletions
--- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties
@ -1,5 +1,5 @@
 #项目端口
-server.port=51010
+server.port=58100
 ################ 授权过滤配置 ################
 #用户登陆路径
 filter.shiro.user.loginuri = /login