merge zk

godaner · Jan 4, 2018 · 03bb797 · 03bb797
2 parents 22237e3 + b5f661e
commit 03bb797
Show file tree

Hide file tree

Showing 29 changed files with 585 additions and 523 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.vm</groupId>
-    <artifactId>core</artifactId>
+    <artifactId>server</artifactId>
     <packaging>pom</packaging>
     <version>${project.version}</version>
     <modules>
@@ -178,4 +178,29 @@
     </dependencies>
 
 
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <profileActive>dev</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profileActive>prod</profileActive>
+            </properties>
+        </profile>
+        <profile>
+            <id>bugfix</id>
+            <properties>
+                <profileActive>bugfix</profileActive>
+            </properties>
+        </profile>
+    </profiles>
+
 </project>
diff --git a/vm-backend/pom.xml b/vm-backend/pom.xml
@@ -1,7 +1,7 @@
 <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">
     <parent>
-        <artifactId>core</artifactId>
+        <artifactId>server</artifactId>
         <groupId>com.vm</groupId>
         <version>${project.version}</version>
     </parent>

diff --git a/vm-backend/src/main/java/com/vm/BackendApplication.java b/vm-backend/src/main/java/com/vm/BackendApplication.java
@@ -1,22 +1,15 @@
 package com.vm;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
 
-/**
- * Title:
- * Description:
- * Author:zhangke
- * Date:2017/11/16 14:47
- */
 @SpringBootApplication
-@MapperScan(basePackages = "com.vm.dao")
+@ServletComponentScan
 public class BackendApplication {
     public static void main(String[] args) {
 
         SpringApplication springApplication = new SpringApplication(BackendApplication.class);
-//        springApplication.addListeners(new ApplicationStartedListener());
         springApplication.run(args);
 
 

diff --git a/vm-backend/src/main/resources/config/application-bugfix.properties b/vm-backend/src/main/resources/config/application-bugfix.properties
@@ -1,4 +1,4 @@
-server.port=8889
+server.port=8887
 server.tomcat.max-threads=800
 # tomcat\u7684URI\u7F16\u7801
 server.tomcat.uri-encoding=UTF-8
@@ -17,10 +17,10 @@ spring.thymeleaf.cache=false
 #log
 logging.path=/usr/local/log/vm_logs
 logging.config=classpath:config/logback.xml
+
 #db
 #\u6620\u5C04\u6587\u4EF6\u914D\u7F6E
-mybatis.config-locations=classpath:mybatis/mybatis-config.xml
-mybatis.mapper-locations=classpath:sqlmap/*.xml
+#mybatis.config-locations=classpath:mybatis/mybatis-config.xml
 ##\u914D\u7F6Emybatis\u7684sql\u8BED\u53E5\u6267\u884C\u8FC7\u7A0B\uFF1B\u914D\u7F6E\uFF1Alogging.level.<mapper\u5305\u540D>=debug
 logging.level.dao.mapper=debug
 #connection
@@ -31,3 +31,29 @@ spring.datasource.password=123
 
 
 
+#http session
+#\u6CE8\u91CA\u4F1A\u8BDDcookie\u3002
+#server.session.cookie.comment =
+#\u4F1A\u8BDDcookie\u7684\u57DF\u3002
+#server.session.cookie.domain =
+#\u201CHttpOnly\u201D\u6807\u5FD7\u4E3A\u4F1A\u8BDDcookie\u3002
+#server.session.cookie.http-only =
+#\u4F1A\u8BDDcookie\u7684\u6700\u5927\u5E74\u9F84\uFF08\u4EE5\u79D2\u4E3A\u5355\u4F4D\uFF09\u3002
+#server.session.cookie.max-age =
+#\u4F1A\u8BDDcookie\u540D\u79F0\u3002
+#server.session.cookie.name =
+#\u4F1A\u8BDDcookie\u7684\u8DEF\u5F84\u3002
+#server.session.cookie.path =
+#\u201CSecure\u201D\u6807\u5FD7\u4E3A\u4F1A\u8BDDcookie\u3002
+#server.session.cookie.secure =
+#\u5728\u91CD\u65B0\u542F\u52A8\u4E4B\u95F4\u6301\u7EED\u4F1A\u8BDD\u6570\u636E\u3002
+#server.session.persistent=false
+#\u7528\u4E8E\u5B58\u50A8\u4F1A\u8BDD\u6570\u636E\u7684\u76EE\u5F55\u3002
+#server.session.store-dir =
+#\u4F1A\u8BDD\u8D85\u65F6\uFF08\u5206\uFF09\u3002
+server.session.timeout=2
+#\u4F1A\u8BDD\u8DDF\u8E2A\u6A21\u5F0F\uFF08\u4EE5\u4E0B\u4E00\u4E2A\u6216\u591A\u4E2A\uFF1A\u201Ccookie\u201D\uFF0C\u201Curl\u201D\uFF0C\u201Cssl\u201D\uFF09\u3002
+#server.session.tracking-modes =
+
+
+
diff --git a/vm-backend/src/main/resources/config/application-dev.properties b/vm-backend/src/main/resources/config/application-dev.properties
@@ -1,4 +1,4 @@
-server.port=8889
+server.port=8887
 server.tomcat.max-threads=800
 # tomcat\u7684URI\u7F16\u7801
 server.tomcat.uri-encoding=UTF-8
@@ -17,10 +17,10 @@ spring.thymeleaf.cache=false
 #log
 logging.path=/usr/local/log/vm_logs
 logging.config=classpath:config/logback.xml
+
 #db
 #\u6620\u5C04\u6587\u4EF6\u914D\u7F6E
-mybatis.config-locations=classpath:mybatis/mybatis-config.xml
-mybatis.mapper-locations=classpath:sqlmap/*.xml
+#mybatis.config-locations=classpath:mybatis/mybatis-config.xml
 ##\u914D\u7F6Emybatis\u7684sql\u8BED\u53E5\u6267\u884C\u8FC7\u7A0B\uFF1B\u914D\u7F6E\uFF1Alogging.level.<mapper\u5305\u540D>=debug
 logging.level.dao.mapper=debug
 #connection
@@ -31,3 +31,29 @@ spring.datasource.password=123
 
 
 
+#http session
+#\u6CE8\u91CA\u4F1A\u8BDDcookie\u3002
+#server.session.cookie.comment =
+#\u4F1A\u8BDDcookie\u7684\u57DF\u3002
+#server.session.cookie.domain =
+#\u201CHttpOnly\u201D\u6807\u5FD7\u4E3A\u4F1A\u8BDDcookie\u3002
+#server.session.cookie.http-only =
+#\u4F1A\u8BDDcookie\u7684\u6700\u5927\u5E74\u9F84\uFF08\u4EE5\u79D2\u4E3A\u5355\u4F4D\uFF09\u3002
+#server.session.cookie.max-age =
+#\u4F1A\u8BDDcookie\u540D\u79F0\u3002
+#server.session.cookie.name =
+#\u4F1A\u8BDDcookie\u7684\u8DEF\u5F84\u3002
+#server.session.cookie.path =
+#\u201CSecure\u201D\u6807\u5FD7\u4E3A\u4F1A\u8BDDcookie\u3002
+#server.session.cookie.secure =
+#\u5728\u91CD\u65B0\u542F\u52A8\u4E4B\u95F4\u6301\u7EED\u4F1A\u8BDD\u6570\u636E\u3002
+#server.session.persistent=false
+#\u7528\u4E8E\u5B58\u50A8\u4F1A\u8BDD\u6570\u636E\u7684\u76EE\u5F55\u3002
+#server.session.store-dir =
+#\u4F1A\u8BDD\u8D85\u65F6\uFF08\u5206\uFF09\u3002
+server.session.timeout=2
+#\u4F1A\u8BDD\u8DDF\u8E2A\u6A21\u5F0F\uFF08\u4EE5\u4E0B\u4E00\u4E2A\u6216\u591A\u4E2A\uFF1A\u201Ccookie\u201D\uFF0C\u201Curl\u201D\uFF0C\u201Cssl\u201D\uFF09\u3002
+#server.session.tracking-modes =
+
+
+
diff --git a/vm-backend/src/main/resources/config/application-prod.properties b/vm-backend/src/main/resources/config/application-prod.properties
@@ -1,4 +1,4 @@
-server.port=8889
+server.port=8887
 server.tomcat.max-threads=800
 # tomcat\u7684URI\u7F16\u7801
 server.tomcat.uri-encoding=UTF-8
@@ -17,10 +17,10 @@ spring.thymeleaf.cache=false
 #log
 logging.path=/usr/local/log/vm_logs
 logging.config=classpath:config/logback.xml
+
 #db
 #\u6620\u5C04\u6587\u4EF6\u914D\u7F6E
-mybatis.config-locations=classpath:mybatis/mybatis-config.xml
-mybatis.mapper-locations=classpath:sqlmap/*.xml
+#mybatis.config-locations=classpath:mybatis/mybatis-config.xml
 ##\u914D\u7F6Emybatis\u7684sql\u8BED\u53E5\u6267\u884C\u8FC7\u7A0B\uFF1B\u914D\u7F6E\uFF1Alogging.level.<mapper\u5305\u540D>=debug
 logging.level.dao.mapper=debug
 #connection
@@ -31,3 +31,29 @@ spring.datasource.password=123
 
 
 
+#http session
+#\u6CE8\u91CA\u4F1A\u8BDDcookie\u3002
+#server.session.cookie.comment =
+#\u4F1A\u8BDDcookie\u7684\u57DF\u3002
+#server.session.cookie.domain =
+#\u201CHttpOnly\u201D\u6807\u5FD7\u4E3A\u4F1A\u8BDDcookie\u3002
+#server.session.cookie.http-only =
+#\u4F1A\u8BDDcookie\u7684\u6700\u5927\u5E74\u9F84\uFF08\u4EE5\u79D2\u4E3A\u5355\u4F4D\uFF09\u3002
+#server.session.cookie.max-age =
+#\u4F1A\u8BDDcookie\u540D\u79F0\u3002
+#server.session.cookie.name =
+#\u4F1A\u8BDDcookie\u7684\u8DEF\u5F84\u3002
+#server.session.cookie.path =
+#\u201CSecure\u201D\u6807\u5FD7\u4E3A\u4F1A\u8BDDcookie\u3002
+#server.session.cookie.secure =
+#\u5728\u91CD\u65B0\u542F\u52A8\u4E4B\u95F4\u6301\u7EED\u4F1A\u8BDD\u6570\u636E\u3002
+#server.session.persistent=false
+#\u7528\u4E8E\u5B58\u50A8\u4F1A\u8BDD\u6570\u636E\u7684\u76EE\u5F55\u3002
+#server.session.store-dir =
+#\u4F1A\u8BDD\u8D85\u65F6\uFF08\u5206\uFF09\u3002
+server.session.timeout=2
+#\u4F1A\u8BDD\u8DDF\u8E2A\u6A21\u5F0F\uFF08\u4EE5\u4E0B\u4E00\u4E2A\u6216\u591A\u4E2A\uFF1A\u201Ccookie\u201D\uFF0C\u201Curl\u201D\uFF0C\u201Cssl\u201D\uFF09\u3002
+#server.session.tracking-modes =
+
+
+
diff --git a/vm-backend/vm-backend.iml b/vm-backend/vm-backend.iml
@@ -56,9 +56,6 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:1.4.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.4.0.RELEASE" level="project" />
@@ -87,6 +84,9 @@
     <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
+    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.1.15" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />

diff --git a/vm-base/pom.xml b/vm-base/pom.xml
@@ -1,7 +1,7 @@
 <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">
     <parent>
-        <artifactId>core</artifactId>
+        <artifactId>server</artifactId>
         <groupId>com.vm</groupId>
         <version>${project.version}</version>
     </parent>

diff --git a/vm-base/vm-base.iml b/vm-base/vm-base.iml
@@ -67,9 +67,6 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:1.4.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.4.0.RELEASE" level="project" />
@@ -98,6 +95,9 @@
     <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
+    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.1.15" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />

diff --git a/vm-dao/pom.xml b/vm-dao/pom.xml
@@ -1,7 +1,7 @@
 <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">
     <parent>
-        <artifactId>core</artifactId>
+        <artifactId>server</artifactId>
         <groupId>com.vm</groupId>
         <version>${project.version}</version>
     </parent>

diff --git a/vm-dao/vm-dao.iml b/vm-dao/vm-dao.iml
@@ -68,9 +68,6 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:1.4.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.4.0.RELEASE" level="project" />
@@ -99,6 +96,9 @@
     <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.22" level="project" />
+    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.1.15" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />

diff --git a/vm-frontend/pom.xml b/vm-frontend/pom.xml
@@ -1,7 +1,7 @@
 <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">
     <parent>
-        <artifactId>core</artifactId>
+        <artifactId>server</artifactId>
         <groupId>com.vm</groupId>
         <version>${project.version}</version>
     </parent>
@@ -47,27 +47,5 @@
 
         </plugins>
     </build>
-    <profiles>
-        <profile>
-            <id>dev</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <profileActive>dev</profileActive>
-            </properties>
-        </profile>
-        <profile>
-            <id>prod</id>
-            <properties>
-                <profileActive>prod</profileActive>
-            </properties>
-        </profile>
-        <profile>
-            <id>bugfix</id>
-            <properties>
-                <profileActive>bugfix</profileActive>
-            </properties>
-        </profile>
-    </profiles>
+
 </project>
diff --git a/vm-frontend/src/main/java/com/vm/FrontendApplication.java b/vm-frontend/src/main/java/com/vm/FrontendApplication.java
@@ -5,12 +5,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 
-/**
- * Title:
- * Description:
- * Author:zhangke
- * Date:2017/11/16 14:47
- */
+
 @SpringBootApplication
 @ServletComponentScan
 public class FrontendApplication {
@@ -20,6 +15,5 @@ public static void main(String[] args) {
         springApplication.addListeners(new ApplicationStartedListener());
         springApplication.run(args);
 
-
     }
 }