删除zheng-upms-admin

zheng-upms/pom.xml

@@ -21,7 +21,7 @@
     <modules>
         <module>zheng-upms-dao</module>
         <module>zheng-upms-service</module>
-        <module>zheng-upms-admin</module>
         <module>zheng-upms-client</module>
+        <module>zheng-upms-server</module>
     </modules>
 </project>

zheng-upms/zheng-upms-admin/pom.xml

@@ -1,108 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.zheng</groupId>
-        <artifactId>zheng-upms</artifactId>
-        <version>1.0.0</version>
-    </parent>
-
-    <artifactId>zheng-upms-admin</artifactId>
-    <packaging>war</packaging>
-
-    <name>zheng-upms-admin Maven Webapp</name>
-    <url>http://www.zhangshuzheng.cn</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.zheng</groupId>
-            <artifactId>zheng-upms-service</artifactId>
-            <version>1.0.0</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>dev</id>
-            <properties>
-                <env>dev</env>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
-        <profile>
-            <id>test</id>
-            <properties>
-                <env>test</env>
-            </properties>
-        </profile>
-        <profile>
-            <id>prod</id>
-            <properties>
-                <env>prod</env>
-            </properties>
-        </profile>
-    </profiles>
-
-    <build>
-        <finalName>zheng-upms-admin</finalName>
-        <filters>
-            <filter>src/main/resources/profiles/${env}.properties</filter>
-        </filters>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <!-- jetty插件 -->
-            <plugin>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>9.0.0.v20130308</version>
-                <configuration>
-                    <scanIntervalSeconds>3</scanIntervalSeconds>
-                    <webApp>
-                        <contextPath>/zheng-upms-admin</contextPath>
-                    </webApp>
-                    <httpConnector>
-                        <port>8080</port>
-                    </httpConnector>
-                    <reload>automatic</reload>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.18.1</version>
-                <configuration>
-                    <!--是否跳过单元测试-->
-                    <skipTests>true</skipTests>
-                    <!--是否忽略单元测试错误-->
-                    <testFailureIgnore>true</testFailureIgnore>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

zheng-upms/zheng-upms-admin/src/main/java/com/zheng/upms/admin/controller/BaseController.java

@@ -1,15 +0,0 @@
-package com.zheng.upms.admin.controller;
-
-/**
- * 控制器基类
- * @author shuzheng
- * @date 2016年7月7日 上午10:08:47
- */
-public class BaseController {
-	
-	public static final String RESULT = "result";
-	public static final String DATA = "data";
-	public static final String SUCCESS = "success";
-	public static final String FAILED = "failed";
-
-}