diff --git a/README.md b/README.md
index cadf6af9..76511b53 100644
--- a/README.md
+++ b/README.md
@@ -25,14 +25,12 @@ zheng
| ├── zheng-upms-dao -- MyBatisGenerator代码生成模块,无需开发
| ├── zheng-upms-sso-client -- SSO客户端依赖包
| ├── zheng-upms-rpc-api -- rpc接口包
-| ├── zheng-upms-rpc-service -- rpc服务提供者[端口:1112]
-| ├── zheng-upms-app1 -- SSO测试客户端1[端口:1113]
-| ├── zheng-upms-app2 -- SSO测试客户端2[端口:1114]
+| ├── zheng-upms-rpc-service -- rpc服务提供者
| └── zheng-upms-server -- 系统及SSO服务端[端口:1111]
├── zheng-cms -- 内容管理系统
| ├── zheng-cms-dao -- MyBatisGenerator代码生成模块,无需开发
| ├── zheng-cms-rpc-api -- rpc接口包
-| ├── zheng-cms-rpc-service -- rpc服务提供者[端口:2225]
+| ├── zheng-cms-rpc-service -- rpc服务提供者
| ├── zheng-cms-search -- 搜索服务[端口:2221]
| ├── zheng-cms-admin -- 后台管理[端口:2222]
| ├── zheng-cms-job -- 消息队列、任务调度等[端口:2223]
diff --git a/zheng-cms/zheng-cms-rpc-service/pom.xml b/zheng-cms/zheng-cms-rpc-service/pom.xml
index e7ceb739..5cc2ff1f 100644
--- a/zheng-cms/zheng-cms-rpc-service/pom.xml
+++ b/zheng-cms/zheng-cms-rpc-service/pom.xml
@@ -9,9 +9,9 @@
zheng-cms-rpc-service
- war
+ jar
- zheng-cms-rpc-service Maven Webapp
+ zheng-cms-rpc-service
http://www.zhangshuzheng.cn
@@ -26,17 +26,6 @@
4.12
test
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
- javax.servlet
- jstl
- 1.2
-
@@ -75,23 +64,6 @@
-
-
- org.eclipse.jetty
- jetty-maven-plugin
-
- 9.2.7.v20150116
-
- 3
-
- /
-
-
- 2225
-
- automatic
-
-
org.apache.maven.plugins
maven-surefire-plugin
diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/ZhengCmsRpcServiceApplication.java b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/ZhengCmsRpcServiceApplication.java
new file mode 100644
index 00000000..6865e51f
--- /dev/null
+++ b/zheng-cms/zheng-cms-rpc-service/src/main/java/com/zheng/cms/rpc/service/ZhengCmsRpcServiceApplication.java
@@ -0,0 +1,16 @@
+package com.zheng.cms.rpc.service;
+
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * 服务启动类
+ * Created by ZhangShuzheng on 2017/2/3.
+ */
+public class ZhengCmsRpcServiceApplication {
+
+ public static void main(String[] args) {
+ new ClassPathXmlApplicationContext("classpath*:applicationContext*.xml");
+ System.out.println(">>>>> zheng-cms-rpc-service 启动完成 <<<<<");
+ }
+
+}
diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/webapp/WEB-INF/web.xml b/zheng-cms/zheng-cms-rpc-service/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 0c8c0fe0..00000000
--- a/zheng-cms/zheng-cms-rpc-service/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
- CharacterEncodingFilter
- org.springframework.web.filter.CharacterEncodingFilter
-
- encoding
- UTF-8
-
-
-
- CharacterEncodingFilter
- /*
- REQUEST
- FORWARD
-
-
-
-
- org.springframework.web.context.ContextLoaderListener
-
-
- contextConfigLocation
-
- classpath*:applicationContext*.xml
-
-
-
-
-
- log4jConfigLocation
- classpath:log4j.properties
-
-
-
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-rpc-service/pom.xml b/zheng-upms/zheng-upms-rpc-service/pom.xml
index b33be7ee..0243ceeb 100644
--- a/zheng-upms/zheng-upms-rpc-service/pom.xml
+++ b/zheng-upms/zheng-upms-rpc-service/pom.xml
@@ -9,9 +9,9 @@
zheng-upms-rpc-service
- war
+ jar
- zheng-upms-rpc-service Maven Webapp
+ zheng-upms-rpc-service
http://www.zhangshuzheng.cn
@@ -26,17 +26,6 @@
4.12
test
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
- javax.servlet
- jstl
- 1.2
-
@@ -75,23 +64,6 @@
-
-
- org.eclipse.jetty
- jetty-maven-plugin
-
- 9.2.7.v20150116
-
- 3
-
- /
-
-
- 1112
-
- automatic
-
-
org.apache.maven.plugins
maven-surefire-plugin
diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/ZhengUpmsRpcServiceApplication.java b/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/ZhengUpmsRpcServiceApplication.java
new file mode 100644
index 00000000..c1fc6f7f
--- /dev/null
+++ b/zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/ZhengUpmsRpcServiceApplication.java
@@ -0,0 +1,16 @@
+package com.zheng.upms.rpc.service;
+
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * 服务启动类
+ * Created by ZhangShuzheng on 2017/2/3.
+ */
+public class ZhengUpmsRpcServiceApplication {
+
+ public static void main(String[] args) {
+ new ClassPathXmlApplicationContext("classpath*:applicationContext*.xml");
+ System.out.println(">>>>> zheng-upms-rpc-service 启动完成 <<<<<");
+ }
+
+}
diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/webapp/WEB-INF/web.xml b/zheng-upms/zheng-upms-rpc-service/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 0c8c0fe0..00000000
--- a/zheng-upms/zheng-upms-rpc-service/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
- CharacterEncodingFilter
- org.springframework.web.filter.CharacterEncodingFilter
-
- encoding
- UTF-8
-
-
-
- CharacterEncodingFilter
- /*
- REQUEST
- FORWARD
-
-
-
-
- org.springframework.web.context.ContextLoaderListener
-
-
- contextConfigLocation
-
- classpath*:applicationContext*.xml
-
-
-
-
-
- log4jConfigLocation
- classpath:log4j.properties
-
-
-
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/SSOController.java b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/SSOController.java
index a6b1a84c..f66f283e 100644
--- a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/SSOController.java
+++ b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/SSOController.java
@@ -1,12 +1,9 @@
package com.zheng.upms.admin.controller;
import com.zheng.common.util.CookieUtil;
-import com.zheng.common.util.MD5Util;
import com.zheng.common.util.RedisUtil;
import com.zheng.upms.admin.util.SystemConstant;
import com.zheng.upms.dao.model.UpmsSystemExample;
-import com.zheng.upms.dao.model.UpmsUser;
-import com.zheng.upms.dao.model.UpmsUserExample;
import com.zheng.upms.rpc.api.UpmsSystemService;
import com.zheng.upms.rpc.api.UpmsUserService;
import org.apache.commons.lang.StringUtils;
@@ -34,8 +31,6 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import static org.apache.shiro.web.filter.mgt.DefaultFilter.user;
-
/**
* 单点登录管理
* Created by shuzheng on 2016/12/10.
@@ -167,6 +162,7 @@ public class SSOController {
Subject subject = SecurityUtils.getSubject();
UsernamePasswordToken usernamePasswordToken = new UsernamePasswordToken(username, password);
try {
+ usernamePasswordToken.setRememberMe(false);
subject.login(usernamePasswordToken);
} catch (UnknownAccountException e) {
result.put("result", false);
diff --git a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/manage/SystemController.java b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/manage/SystemController.java
index 628126c3..11fd5ac8 100644
--- a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/manage/SystemController.java
+++ b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/manage/SystemController.java
@@ -13,8 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
-import static com.sun.xml.internal.ws.api.message.Packet.Status.Request;
-
/**
* 系统controller
* Created by shuzheng on 2016/12/18.