From dfbc0b5eeb365fcef94527a34df864dba01b8587 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Sat, 8 Dec 2018 01:13:59 +0800 Subject: [PATCH] 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 --- .../src/main/resources/application-test.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d7dc9a4..daeee39 100644 --- 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