Browse Source

写死的dev改回来

wangdy 8 năm trước cách đây
mục cha
commit
bb79889ebe

+ 1 - 1
src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -126,7 +126,7 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 			// 跨域代理界面
 			redirectUrl = request.getContextPath() + "/login/proxy";
 		}*/
-		return redirectUrl + "&baseUrl=" + request.getContextPath() + "/login/page";
+		return redirectUrl;
 	}
 
 	@Override

+ 4 - 4
src/main/resources/spring/context.xml

@@ -11,13 +11,13 @@
 	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 	http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-3.1.xsd">
 
-	<context:property-placeholder location="classpath*:dev/*.properties" />
+	<context:property-placeholder location="classpath*:${profile}/*.properties" />
 	<!-- 系统运行参数注入 -->
 	<util:properties id="sys"
-		location="classpath:dev/sys.properties" />
+		location="classpath:${profile}/sys.properties" />
 	<!-- 消息参数 -->
 	<util:properties id="message"
-		location="classpath:dev/message.properties" />
+		location="classpath:${profile}/message.properties" />
 	<!-- 注册spring上下文对象 -->
 	<bean class="com.uas.platform.b2c.core.support.ApplicationContextRegister" />
 	<!-- 容器启动完成之后执行 -->
@@ -185,7 +185,7 @@
 	<!-- 账户中心配置 -->
 	<bean id="accountConfigurer" class="com.uas.account.web.AccountConfigurer"
 		init-method="init">
-		<property name="configPath" value="classpath:dev/account.properties" />
+		<property name="configPath" value="classpath:${profile}/account.properties" />
 	</bean>
 
 	<import resource="classpath:spring/ehcache.xml"/>