Просмотр исходного кода

Merge branch 'test' of jishutao/kede-server into prod

anderx лет назад: 2
Родитель
Сommit
5579078379

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -53,7 +53,7 @@ amb.maxLvl=6
 
 avatar.host=//static.jishutao.com
 static.host=//static.jishutao.com/1.2.96
-rd.static.host=//static.jishutao.com/RD/1.0.00
+rd.static.host=//static.jishutao.com/RD/1.0.02
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.62
 #static.host=//172.16.1.187/1.2.81

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -53,7 +53,7 @@ amb.maxLvl=6
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 static.host=//static.jishutao.com/1.2.96
-rd.static.host=//static.jishutao.com/RD/1.0.01
+rd.static.host=//static.jishutao.com/RD/1.0.02
 avatar.upload.host=//static.jishutao.com/upload
 
 wx.appId=wxff2f5720ed7d7f63

+ 2 - 2
src/main/resources/spring/spring-shiro.xml

@@ -163,9 +163,9 @@
 	<bean id="shiroFilter"
 		class="org.apache.shiro.spring.web.ShiroFilterFactoryBean">
 		<property name="securityManager" ref="securityManager" />
-		<property name="loginUrl" value="/user/login" />
+		<property name="loginUrl" value="/admin/login" />
 		<property name="successUrl" value="/" />
-		<property name="unauthorizedUrl" value="/user/login" />
+		<property name="unauthorizedUrl" value="/admin/login" />
 		<property name="filterChainDefinitions"
 			value="#{shiroManager.loadFilterChainDefinitions()}" />
 		<property name="filters">