浏览代码

修改zheng-upms-client模块为zheng-upms-sso-client

shuzheng 8 年之前
父节点
当前提交
17c5ed4861

+ 1 - 8
zheng-cms/zheng-cms-admin/pom.xml

@@ -31,15 +31,10 @@
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.zheng</groupId>
-            <artifactId>zheng-upms-client</artifactId>
-            <version>1.0.0</version>
-        </dependency>
         <!-- zheng-upms-client -->
         <dependency>
             <groupId>com.zheng</groupId>
-            <artifactId>zheng-upms-client</artifactId>
+            <artifactId>zheng-upms-sso-client</artifactId>
             <version>1.0.0</version>
         </dependency>
     </dependencies>
@@ -102,9 +97,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.18.1</version>
                 <configuration>
-                    <!--是否跳过单元测试-->
                     <skipTests>true</skipTests>
-                    <!--是否忽略单元测试错误-->
                     <testFailureIgnore>true</testFailureIgnore>
                 </configuration>
             </plugin>

+ 1 - 1
zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/web.xml

@@ -67,7 +67,7 @@
     <!-- zhang-upms-client -->
     <filter>
         <filter-name>zheng-upms-client</filter-name>
-        <filter-class>com.zheng.upms.client.filter.SSOFilter</filter-class>
+        <filter-class>com.zheng.upms.sso.client.filter.SSOFilter</filter-class>
         <init-param>
             <param-name>system_name</param-name>
             <param-value>zheng-cms-admin</param-value>

+ 1 - 2
zheng-upms/pom.xml

@@ -20,8 +20,7 @@
 
     <modules>
         <module>zheng-upms-dao</module>
-        <module>zheng-upms-service</module>
-        <module>zheng-upms-client</module>
+        <module>zheng-upms-sso-client</module>
         <module>zheng-upms-server</module>
         <module>zheng-upms-app1</module>
         <module>zheng-upms-app2</module>

+ 1 - 3
zheng-upms/zheng-upms-app1/pom.xml

@@ -41,7 +41,7 @@
         <!-- zheng-upms-client -->
         <dependency>
             <groupId>com.zheng</groupId>
-            <artifactId>zheng-upms-client</artifactId>
+            <artifactId>zheng-upms-sso-client</artifactId>
             <version>1.0.0</version>
         </dependency>
     </dependencies>
@@ -104,9 +104,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.18.1</version>
                 <configuration>
-                    <!--是否跳过单元测试-->
                     <skipTests>true</skipTests>
-                    <!--是否忽略单元测试错误-->
                     <testFailureIgnore>true</testFailureIgnore>
                 </configuration>
             </plugin>

+ 1 - 1
zheng-upms/zheng-upms-app1/src/main/webapp/WEB-INF/web.xml

@@ -77,7 +77,7 @@
     <!-- zhang-upms-client -->
     <filter>
         <filter-name>zheng-upms-client</filter-name>
-        <filter-class>com.zheng.upms.client.filter.SSOFilter</filter-class>
+        <filter-class>com.zheng.upms.sso.client.filter.SSOFilter</filter-class>
         <init-param>
             <param-name>system_name</param-name>
             <param-value>zheng-upms-app1</param-value>

+ 1 - 3
zheng-upms/zheng-upms-app2/pom.xml

@@ -41,7 +41,7 @@
         <!-- zheng-upms-client -->
         <dependency>
             <groupId>com.zheng</groupId>
-            <artifactId>zheng-upms-client</artifactId>
+            <artifactId>zheng-upms-sso-client</artifactId>
             <version>1.0.0</version>
         </dependency>
     </dependencies>
@@ -104,9 +104,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.18.1</version>
                 <configuration>
-                    <!--是否跳过单元测试-->
                     <skipTests>true</skipTests>
-                    <!--是否忽略单元测试错误-->
                     <testFailureIgnore>true</testFailureIgnore>
                 </configuration>
             </plugin>

+ 1 - 1
zheng-upms/zheng-upms-app2/src/main/webapp/WEB-INF/web.xml

@@ -77,7 +77,7 @@
     <!-- zhang-upms-client -->
     <filter>
         <filter-name>zheng-upms-client</filter-name>
-        <filter-class>com.zheng.upms.client.filter.SSOFilter</filter-class>
+        <filter-class>com.zheng.upms.sso.client.filter.SSOFilter</filter-class>
         <init-param>
             <param-name>system_name</param-name>
             <param-value>zheng-upms-app2</param-value>

+ 3 - 5
zheng-upms/zheng-upms-client/pom.xml → zheng-upms/zheng-upms-sso-client/pom.xml

@@ -8,10 +8,10 @@
         <version>1.0.0</version>
     </parent>
 
-    <artifactId>zheng-upms-client</artifactId>
+    <artifactId>zheng-upms-sso-client</artifactId>
     <packaging>jar</packaging>
 
-    <name>zheng-upms-client</name>
+    <name>zheng-upms-sso-client</name>
     <url>http://www.zhangshuzheng.cn</url>
 
     <properties>
@@ -41,7 +41,7 @@
     </dependencies>
 
     <build>
-        <finalName>zheng-upms-client</finalName>
+        <finalName>zheng-upms-sso-client</finalName>
         <resources>
             <resource>
                 <directory>src/main/java</directory>
@@ -60,9 +60,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.18.1</version>
                 <configuration>
-                    <!--是否跳过单元测试-->
                     <skipTests>true</skipTests>
-                    <!--是否忽略单元测试错误-->
                     <testFailureIgnore>true</testFailureIgnore>
                 </configuration>
             </plugin>

+ 1 - 3
zheng-upms/zheng-upms-client/src/main/java/com/zheng/upms/client/filter/SSOFilter.java → zheng-upms/zheng-upms-sso-client/src/main/java/com/zheng/upms/sso/client/filter/SSOFilter.java

@@ -1,6 +1,5 @@
-package com.zheng.upms.client.filter;
+package com.zheng.upms.sso.client.filter;
 
-import com.zheng.common.util.CookieUtil;
 import com.zheng.common.util.RedisUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpEntity;
@@ -19,7 +18,6 @@ import org.slf4j.LoggerFactory;
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.ArrayList;

+ 1 - 1
zheng-upms/zheng-upms-client/src/main/java/com/zheng/upms/client/util/MyHttpServletRequestWrapper.java → zheng-upms/zheng-upms-sso-client/src/main/java/com/zheng/upms/sso/client/util/MyHttpServletRequestWrapper.java

@@ -1,4 +1,4 @@
-package com.zheng.upms.client.util;
+package com.zheng.upms.sso.client.util;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;

+ 1 - 1
zheng-upms/zheng-upms-client/src/main/java/com/zheng/upms/client/util/RequestParameterUtil.java → zheng-upms/zheng-upms-sso-client/src/main/java/com/zheng/upms/sso/client/util/RequestParameterUtil.java

@@ -1,4 +1,4 @@
-package com.zheng.upms.client.util;
+package com.zheng.upms.sso.client.util;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Enumeration;

+ 0 - 0
zheng-upms/zheng-upms-client/src/test/java/com/zheng/AppTest.java → zheng-upms/zheng-upms-sso-client/src/test/java/com/zheng/AppTest.java


+ 0 - 2
zheng-wechat-mp/zheng-wechat-mp-admin/pom.xml

@@ -97,9 +97,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.18.1</version>
                 <configuration>
-                    <!--是否跳过单元测试-->
                     <skipTests>true</skipTests>
-                    <!--是否忽略单元测试错误-->
                     <testFailureIgnore>true</testFailureIgnore>
                 </configuration>
             </plugin>

+ 0 - 2
zheng-wechat-mp/zheng-wechat-mp-dao/pom.xml

@@ -63,9 +63,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.18.1</version>
                 <configuration>
-                    <!--是否跳过单元测试-->
                     <skipTests>true</skipTests>
-                    <!--是否忽略单元测试错误-->
                     <testFailureIgnore>true</testFailureIgnore>
                 </configuration>
             </plugin>

+ 0 - 2
zheng-wechat-mp/zheng-wechat-mp-service/pom.xml

@@ -60,9 +60,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.18.1</version>
                 <configuration>
-                    <!--是否跳过单元测试-->
                     <skipTests>true</skipTests>
-                    <!--是否忽略单元测试错误-->
                     <testFailureIgnore>true</testFailureIgnore>
                 </configuration>
             </plugin>