From 1d9706608c136e4d5cfff0f31ec3cdc4b173b360 Mon Sep 17 00:00:00 2001
From: shuzheng <469741414@qq.com>
Date: Fri, 3 Feb 2017 11:35:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4sso=E6=B5=8B=E8=AF=95?=
=?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
zheng-upms/pom.xml | 2 -
zheng-upms/zheng-upms-app1/pom.xml | 112 -----------------
.../upms/app1/controller/UserController.java | 29 -----
.../applicationContext-dubbo-consumer.xml | 16 ---
.../src/main/resources/log4j.properties | 23 ----
.../main/resources/profiles/dev.properties | 1 -
.../main/resources/profiles/prod.properties | 1 -
.../main/resources/profiles/test.properties | 1 -
.../src/main/webapp/WEB-INF/web.xml | 115 ------------------
zheng-upms/zheng-upms-app2/pom.xml | 112 -----------------
.../upms/app2/controller/UserController.java | 29 -----
.../applicationContext-dubbo-consumer.xml | 16 ---
.../src/main/resources/log4j.properties | 23 ----
.../main/resources/profiles/dev.properties | 1 -
.../main/resources/profiles/prod.properties | 1 -
.../main/resources/profiles/test.properties | 1 -
.../src/main/webapp/WEB-INF/web.xml | 115 ------------------
17 files changed, 598 deletions(-)
delete mode 100644 zheng-upms/zheng-upms-app1/pom.xml
delete mode 100644 zheng-upms/zheng-upms-app1/src/main/java/com/zheng/upms/app1/controller/UserController.java
delete mode 100644 zheng-upms/zheng-upms-app1/src/main/resources/applicationContext-dubbo-consumer.xml
delete mode 100644 zheng-upms/zheng-upms-app1/src/main/resources/log4j.properties
delete mode 100644 zheng-upms/zheng-upms-app1/src/main/resources/profiles/dev.properties
delete mode 100644 zheng-upms/zheng-upms-app1/src/main/resources/profiles/prod.properties
delete mode 100644 zheng-upms/zheng-upms-app1/src/main/resources/profiles/test.properties
delete mode 100644 zheng-upms/zheng-upms-app1/src/main/webapp/WEB-INF/web.xml
delete mode 100644 zheng-upms/zheng-upms-app2/pom.xml
delete mode 100644 zheng-upms/zheng-upms-app2/src/main/java/com/zheng/upms/app2/controller/UserController.java
delete mode 100644 zheng-upms/zheng-upms-app2/src/main/resources/applicationContext-dubbo-consumer.xml
delete mode 100644 zheng-upms/zheng-upms-app2/src/main/resources/log4j.properties
delete mode 100644 zheng-upms/zheng-upms-app2/src/main/resources/profiles/dev.properties
delete mode 100644 zheng-upms/zheng-upms-app2/src/main/resources/profiles/prod.properties
delete mode 100644 zheng-upms/zheng-upms-app2/src/main/resources/profiles/test.properties
delete mode 100644 zheng-upms/zheng-upms-app2/src/main/webapp/WEB-INF/web.xml
diff --git a/zheng-upms/pom.xml b/zheng-upms/pom.xml
index a21fbc58..8cbb9b5d 100644
--- a/zheng-upms/pom.xml
+++ b/zheng-upms/pom.xml
@@ -24,7 +24,5 @@
zheng-upms-rpc-service
zheng-upms-sso-client
zheng-upms-server
- zheng-upms-app1
- zheng-upms-app2
diff --git a/zheng-upms/zheng-upms-app1/pom.xml b/zheng-upms/zheng-upms-app1/pom.xml
deleted file mode 100644
index e1427611..00000000
--- a/zheng-upms/zheng-upms-app1/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-
- 4.0.0
-
-
- com.zheng
- zheng-upms
- 1.0.0
-
-
- zheng-upms-app1
- war
-
- zheng-upms-app1 Maven Webapp
- http://www.zhangshuzheng.cn
-
-
-
- com.zheng
- zheng-upms-rpc-api
- 1.0.0
-
-
- junit
- junit
- 4.12
- test
-
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
- javax.servlet
- jstl
- 1.2
-
-
-
- com.zheng
- zheng-upms-sso-client
- 1.0.0
-
-
-
-
-
- dev
-
- dev
-
-
- true
-
-
-
- test
-
- test
-
-
-
- prod
-
- prod
-
-
-
-
-
- zheng-upms-app1
-
- src/main/resources/profiles/${env}.properties
-
-
-
- src/main/resources
- true
-
-
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
-
- 9.2.7.v20150116
-
- 3
-
- /
-
-
- 1113
-
- automatic
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.18.1
-
- true
- true
-
-
-
-
-
diff --git a/zheng-upms/zheng-upms-app1/src/main/java/com/zheng/upms/app1/controller/UserController.java b/zheng-upms/zheng-upms-app1/src/main/java/com/zheng/upms/app1/controller/UserController.java
deleted file mode 100644
index d68f5921..00000000
--- a/zheng-upms/zheng-upms-app1/src/main/java/com/zheng/upms/app1/controller/UserController.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.zheng.upms.app1.controller;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * Created by shuzheng on 2016/12/12.
- */
-@Controller
-@RequestMapping("/user")
-public class UserController {
-
- private static Logger _log = LoggerFactory.getLogger(UserController.class);
-
- /**
- * 列表
- * @return
- */
- @RequestMapping(value = "/list", method = RequestMethod.GET)
- @ResponseBody
- public String list() {
- return "app1 : 退出登录";
- }
-
-}
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-app1/src/main/resources/applicationContext-dubbo-consumer.xml b/zheng-upms/zheng-upms-app1/src/main/resources/applicationContext-dubbo-consumer.xml
deleted file mode 100644
index 272312f9..00000000
--- a/zheng-upms/zheng-upms-app1/src/main/resources/applicationContext-dubbo-consumer.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-app1/src/main/resources/log4j.properties b/zheng-upms/zheng-upms-app1/src/main/resources/log4j.properties
deleted file mode 100644
index 25c82a95..00000000
--- a/zheng-upms/zheng-upms-app1/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#off/fatal/error/warn/info/debug/all
-log4j.debug=false
-log4j.rootLogger=info, stdout
-
-# Console output
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p [%c] - %m%n
-
-#Spring logging configuration
-log4j.category.org.springframework = warn
-
-#Druid logging configuration
-log4j.logger.druid.sql=warn,stdout
-log4j.logger.druid.sql.DataSource=warn,stdout
-log4j.logger.druid.sql.Connection=warn,stdout
-log4j.logger.druid.sql.Statement=warn,stdout
-log4j.logger.druid.sql.ResultSet=warn,stdout
-
-# MyBatis logging configuration
-log4j.logger.com.zheng.upms.dao.mapper=debug
-#log4j.logger.com.zheng.upms.dao.mapper.UserMapper=debug
-#log4j.logger.com.zheng.upms.dao.mapper.UserMapper.selectUser=debug
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-app1/src/main/resources/profiles/dev.properties b/zheng-upms/zheng-upms-app1/src/main/resources/profiles/dev.properties
deleted file mode 100644
index baede636..00000000
--- a/zheng-upms/zheng-upms-app1/src/main/resources/profiles/dev.properties
+++ /dev/null
@@ -1 +0,0 @@
-profile.env=dev
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-app1/src/main/resources/profiles/prod.properties b/zheng-upms/zheng-upms-app1/src/main/resources/profiles/prod.properties
deleted file mode 100644
index bb7a8fdf..00000000
--- a/zheng-upms/zheng-upms-app1/src/main/resources/profiles/prod.properties
+++ /dev/null
@@ -1 +0,0 @@
-profile.env=prod
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-app1/src/main/resources/profiles/test.properties b/zheng-upms/zheng-upms-app1/src/main/resources/profiles/test.properties
deleted file mode 100644
index 4ff006f4..00000000
--- a/zheng-upms/zheng-upms-app1/src/main/resources/profiles/test.properties
+++ /dev/null
@@ -1 +0,0 @@
-profile.env=test
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-app1/src/main/webapp/WEB-INF/web.xml b/zheng-upms/zheng-upms-app1/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index ae725501..00000000
--- a/zheng-upms/zheng-upms-app1/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,115 +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
-
-
-
-
- springMVC
- org.springframework.web.servlet.DispatcherServlet
-
- contextConfigLocation
- classpath*:springMVC-servlet.xml
-
- 1
-
-
- springMVC
- /
-
-
-
-
-
-
-
- DruidStatView
- com.alibaba.druid.support.http.StatViewServlet
-
-
- DruidStatView
- /druid/*
-
-
-
-
- zheng-upms-client
- com.zheng.upms.sso.client.filter.SSOFilter
-
- system_name
- zheng-upms-app1
-
-
- sso_server_url
- http://upms.zhangshuzheng.cn:1111
-
-
-
- zheng-upms-client
- /*
-
-
-
-
- 120
-
-
-
-
- index.html
- index.jsp
-
-
-
-
- 404
- /WEB-INF/jsp/404.jsp
-
-
- 500
- /WEB-INF/jsp/500.jsp
-
-
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-app2/pom.xml b/zheng-upms/zheng-upms-app2/pom.xml
deleted file mode 100644
index e97d8568..00000000
--- a/zheng-upms/zheng-upms-app2/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-
- 4.0.0
-
-
- com.zheng
- zheng-upms
- 1.0.0
-
-
- zheng-upms-app2
- war
-
- zheng-upms-app2 Maven Webapp
- http://www.zhangshuzheng.cn
-
-
-
- com.zheng
- zheng-upms-rpc-api
- 1.0.0
-
-
- junit
- junit
- 4.12
- test
-
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
- javax.servlet
- jstl
- 1.2
-
-
-
- com.zheng
- zheng-upms-sso-client
- 1.0.0
-
-
-
-
-
- dev
-
- dev
-
-
- true
-
-
-
- test
-
- test
-
-
-
- prod
-
- prod
-
-
-
-
-
- zheng-upms-app2
-
- src/main/resources/profiles/${env}.properties
-
-
-
- src/main/resources
- true
-
-
-
-
-
- org.eclipse.jetty
- jetty-maven-plugin
-
- 9.2.7.v20150116
-
- 3
-
- /
-
-
- 1114
-
- automatic
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.18.1
-
- true
- true
-
-
-
-
-
diff --git a/zheng-upms/zheng-upms-app2/src/main/java/com/zheng/upms/app2/controller/UserController.java b/zheng-upms/zheng-upms-app2/src/main/java/com/zheng/upms/app2/controller/UserController.java
deleted file mode 100644
index 0e1278ec..00000000
--- a/zheng-upms/zheng-upms-app2/src/main/java/com/zheng/upms/app2/controller/UserController.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.zheng.upms.app2.controller;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * Created by shuzheng on 2016/12/12.
- */
-@Controller
-@RequestMapping("/user")
-public class UserController {
-
- private static Logger _log = LoggerFactory.getLogger(UserController.class);
-
- /**
- * 列表
- * @return
- */
- @RequestMapping(value = "/list", method = RequestMethod.GET)
- @ResponseBody
- public String list() {
- return "app2 : 退出登录";
- }
-
-}
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-app2/src/main/resources/applicationContext-dubbo-consumer.xml b/zheng-upms/zheng-upms-app2/src/main/resources/applicationContext-dubbo-consumer.xml
deleted file mode 100644
index 0fe62b09..00000000
--- a/zheng-upms/zheng-upms-app2/src/main/resources/applicationContext-dubbo-consumer.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-app2/src/main/resources/log4j.properties b/zheng-upms/zheng-upms-app2/src/main/resources/log4j.properties
deleted file mode 100644
index 25c82a95..00000000
--- a/zheng-upms/zheng-upms-app2/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#off/fatal/error/warn/info/debug/all
-log4j.debug=false
-log4j.rootLogger=info, stdout
-
-# Console output
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p [%c] - %m%n
-
-#Spring logging configuration
-log4j.category.org.springframework = warn
-
-#Druid logging configuration
-log4j.logger.druid.sql=warn,stdout
-log4j.logger.druid.sql.DataSource=warn,stdout
-log4j.logger.druid.sql.Connection=warn,stdout
-log4j.logger.druid.sql.Statement=warn,stdout
-log4j.logger.druid.sql.ResultSet=warn,stdout
-
-# MyBatis logging configuration
-log4j.logger.com.zheng.upms.dao.mapper=debug
-#log4j.logger.com.zheng.upms.dao.mapper.UserMapper=debug
-#log4j.logger.com.zheng.upms.dao.mapper.UserMapper.selectUser=debug
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-app2/src/main/resources/profiles/dev.properties b/zheng-upms/zheng-upms-app2/src/main/resources/profiles/dev.properties
deleted file mode 100644
index baede636..00000000
--- a/zheng-upms/zheng-upms-app2/src/main/resources/profiles/dev.properties
+++ /dev/null
@@ -1 +0,0 @@
-profile.env=dev
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-app2/src/main/resources/profiles/prod.properties b/zheng-upms/zheng-upms-app2/src/main/resources/profiles/prod.properties
deleted file mode 100644
index bb7a8fdf..00000000
--- a/zheng-upms/zheng-upms-app2/src/main/resources/profiles/prod.properties
+++ /dev/null
@@ -1 +0,0 @@
-profile.env=prod
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-app2/src/main/resources/profiles/test.properties b/zheng-upms/zheng-upms-app2/src/main/resources/profiles/test.properties
deleted file mode 100644
index 4ff006f4..00000000
--- a/zheng-upms/zheng-upms-app2/src/main/resources/profiles/test.properties
+++ /dev/null
@@ -1 +0,0 @@
-profile.env=test
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-app2/src/main/webapp/WEB-INF/web.xml b/zheng-upms/zheng-upms-app2/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 924211d8..00000000
--- a/zheng-upms/zheng-upms-app2/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,115 +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
-
-
-
-
- springMVC
- org.springframework.web.servlet.DispatcherServlet
-
- contextConfigLocation
- classpath*:springMVC-servlet.xml
-
- 1
-
-
- springMVC
- /
-
-
-
-
-
-
-
- DruidStatView
- com.alibaba.druid.support.http.StatViewServlet
-
-
- DruidStatView
- /druid/*
-
-
-
-
- zheng-upms-client
- com.zheng.upms.sso.client.filter.SSOFilter
-
- system_name
- zheng-upms-app2
-
-
- sso_server_url
- http://upms.zhangshuzheng.cn:1111
-
-
-
- zheng-upms-client
- /*
-
-
-
-
- 120
-
-
-
-
- index.html
- index.jsp
-
-
-
-
- 404
- /WEB-INF/jsp/404.jsp
-
-
- 500
- /WEB-INF/jsp/500.jsp
-
-
\ No newline at end of file