提交zheng-upms-client配置文件

zheng-cms/zheng-cms-admin/src/main/resources/zheng-upms-client-shiro.properties → zheng-cms/zheng-cms-admin/src/main/resources/zheng-upms-client.properties

@@ -2,7 +2,7 @@
 upms.type=client
 # \u7EC8\u7AEFsession\u540D\u79F0
 upms.session.id=zheng-upms-client-session-id
-# \u767B\u5F55\u5730\u5740
+# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740
 sso.server.url=http://upms.zhangshuzheng.cn:1111
 # \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740
 upms.successUrl=/manage/index
@@ -12,8 +12,8 @@ upms.unauthorizedUrl=/403
 upms.session.timeout=1800000
 # \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929
 upms.rememberMe.timeout=2592000
-# \u5B50\u7CFB\u7EDFid
-AppID=zheng-cms-admin
-AppSecret=
+# \u5B50\u7CFB\u7EDF
+appID=zheng-cms-admin
+appSecret=
 # \u5F00\u53D1\u6A21\u5F0F
 debug=false

zheng-upms/zheng-upms-client/src/main/java/com/zheng/upms/client/shiro/filter/UpmsAuthenticationFilter.java

@@ -17,7 +17,6 @@ import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 import org.apache.shiro.session.Session;
-import org.apache.shiro.subject.SimplePrincipalCollection;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.web.filter.authc.AuthenticationFilter;
 import org.apache.shiro.web.util.WebUtils;
@@ -76,7 +75,7 @@ public class UpmsAuthenticationFilter extends AuthenticationFilter {
             WebUtils.toHttp(response).sendRedirect(sso_server_url.append("/sso/login").toString());
             return false;
         }
-        sso_server_url.append("/sso/index").append("?").append("appid").append("=").append(PropertiesFileUtil.getInstance("zheng-upms-client-shiro").get("AppID"));
+        sso_server_url.append("/sso/index").append("?").append("appid").append("=").append(PropertiesFileUtil.getInstance("zheng-upms-client").get("appID"));
         // 回跳地址
         HttpServletRequest httpServletRequest = WebUtils.toHttp(request);
         StringBuffer backurl = httpServletRequest.getRequestURL();

zheng-upms/zheng-upms-client/src/main/resources/applicationContext-shiro.xml

@@ -7,12 +7,12 @@
 
     <description>zheng-upms</description>
 
-    <context:property-placeholder location="classpath*:zheng-upms-shiro-*.properties"/>
+    <context:property-placeholder location="classpath*:zheng-upms-client.properties"/>
 
     <!-- Shiro的Web过滤器 -->
     <bean id="shiroFilter" class="org.apache.shiro.spring.web.ShiroFilterFactoryBean">
         <property name="securityManager" ref="securityManager"/>
-        <property name="loginUrl" value="${upms.loginUrl}"/>
+        <property name="loginUrl" value="${sso.server.url}"/>
         <property name="successUrl" value="${upms.successUrl}"/>
         <property name="unauthorizedUrl" value="${upms.unauthorizedUrl}"/>
         <property name="filters">

zheng-upms/zheng-upms-server/src/main/resources/zheng-upms-client-shiro.properties → zheng-upms/zheng-upms-server/src/main/resources/zheng-upms-client.properties

@@ -2,8 +2,8 @@
 upms.type=server
 # \u7EC8\u7AEFsession\u540D\u79F0
 upms.session.id=zheng-upms-server-session-id
-# \u767B\u5F55\u5730\u5740
-upms.loginUrl=http://upms.zhangshuzheng.cn:1111/sso/login
+# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740
+sso.server.url=http://upms.zhangshuzheng.cn:1111
 # \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740
 upms.successUrl=/manage/index
 # \u672A\u6388\u6743\u5730\u5740