9 лет назад · 7bda2f9ea4
--- a/zheng-demo/pom.xml
+++ b/zheng-demo/pom.xml
@@ -2,16 +2,12 @@
 
				          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-test</artifactId>
			
 
				+    <groupId>com.zheng</groupId>
			
 
				+    <artifactId>zheng-demo</artifactId>
			
 
				+    <version>1.0.0</version>
			
 
				     <packaging>war</packaging>
			
 
				 
			
 
				-    <name>zheng-test Maven Webapp</name>
			
 
				+    <name>zheng-demo Maven Webapp</name>
			
 
				     <url>http://www.zhangshuzheng.cn</url>
			
 
				 
			
 
				     <dependencies>
			
@@ -69,7 +65,7 @@
 
				     </profiles>
			
 
				 
			
 
				     <build>
			
 
				-        <finalName>zheng-test</finalName>
			
 
				+        <finalName>zheng-demo</finalName>
			
 
				         <filters>
			
 
				             <filter>src/main/resources/profiles/${env}.properties</filter>
			
 
				         </filters>
			
--- a/zheng-demo/src/main/java/com/zheng/demo/controller/IndexController.java
+++ b/zheng-demo/src/main/java/com/zheng/demo/controller/IndexController.java
@@ -1,7 +1,7 @@
 
				-package com.zheng.test.controller;
			
 
				+package com.zheng.demo.controller;
			
 
				 
			
 
				 import com.zheng.common.base.BaseController;
			
 
				-import com.zheng.test.model.User;
			
 
				+import com.zheng.demo.model.User;
			
 
				 import org.slf4j.Logger;
			
 
				 import org.slf4j.LoggerFactory;
			
 
				 import org.springframework.stereotype.Controller;
			
--- a/zheng-demo/src/main/java/com/zheng/demo/model/User.java
+++ b/zheng-demo/src/main/java/com/zheng/demo/model/User.java
@@ -1,4 +1,4 @@
 
				-package com.zheng.test.model;
			
 
				+package com.zheng.demo.model;
			
 
				 
			
 
				 import javax.persistence.Column;
			
 
				 import javax.persistence.Entity;
			
--- a/zheng-demo/src/main/resources/config.properties
+++ b/zheng-demo/src/main/resources/config.properties
--- a/zheng-demo/src/main/resources/i18n/messages_en_US.properties
+++ b/zheng-demo/src/main/resources/i18n/messages_en_US.properties
--- a/zheng-demo/src/main/resources/i18n/messages_zh_CN.properties
+++ b/zheng-demo/src/main/resources/i18n/messages_zh_CN.properties
--- a/zheng-demo/src/main/resources/log4j.properties
+++ b/zheng-demo/src/main/resources/log4j.properties
--- a/zheng-demo/src/main/resources/profiles/dev.properties
+++ b/zheng-demo/src/main/resources/profiles/dev.properties
--- a/zheng-demo/src/main/resources/profiles/pre.properties
+++ b/zheng-demo/src/main/resources/profiles/pre.properties
--- a/zheng-demo/src/main/resources/profiles/prod.properties
+++ b/zheng-demo/src/main/resources/profiles/prod.properties
--- a/zheng-demo/src/main/resources/profiles/test.properties
+++ b/zheng-demo/src/main/resources/profiles/test.properties
--- a/zheng-demo/src/main/resources/springMVC-servlet.xml
+++ b/zheng-demo/src/main/resources/springMVC-servlet.xml
--- a/zheng-demo/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/zheng-demo/src/main/webapp/WEB-INF/jsp/index.jsp
--- a/zheng-demo/src/main/webapp/WEB-INF/thymeleaf/index.html
+++ b/zheng-demo/src/main/webapp/WEB-INF/thymeleaf/index.html
--- a/zheng-demo/src/main/webapp/WEB-INF/web.xml
+++ b/zheng-demo/src/main/webapp/WEB-INF/web.xml
--- a/zheng-test/src/main/webapp/index.jsp
+++ b/zheng-test/src/main/webapp/index.jsp
@@ -1,5 +0,0 @@
 
				-<html>
			
 
				-<body>
			
 
				-<h2>Hello World!</h2>
			
 
				-</body>
			
 
				-</html>