Skip to content

Commit 467a1ff

Browse files
author
zhangke
committed
解决冲突
2 parents 03bb797 + 39b6dd2 commit 467a1ff

File tree

12,424 files changed

+8705
-1328409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

12,424 files changed

+8705
-1328409
lines changed

‎doc/db/back-up/vm-2017-01-15.sql

Lines changed: 550 additions & 0 deletions
Large diffs are not rendered by default.

‎doc/db/back-up/vm-2018-01-10.sql

Lines changed: 499 additions & 0 deletions
Large diffs are not rendered by default.

‎doc/原型/user_head.png

247 KB
Loading

‎package-lock.json

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pom.xml

Lines changed: 60 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@
33

44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.vm</groupId>
6-
<artifactId>server</artifactId>
6+
<artifactId>engine</artifactId>
7+
<name>engine</name>
78
<packaging>pom</packaging>
89
<version>${project.version}</version>
910
<modules>
1011
<module>vm-dao</module>
1112
<module>vm-base</module>
1213
<module>vm-frontend</module>
1314
<module>vm-backend</module>
15+
<module>vm-redis</module>
1416
</modules>
15-
<name>vm</name>
1617
<parent>
1718
<groupId>org.springframework.boot</groupId>
1819
<artifactId>spring-boot-starter-parent</artifactId>
@@ -33,17 +34,18 @@
3334
</properties>
3435
<dependencies>
3536
<!--spring boot start-->
36-
<!--<dependency>
37+
<dependency>
3738
<groupId>org.springframework.boot</groupId>
3839
<artifactId>spring-boot-starter-web</artifactId>
39-
</dependency>-->
40+
</dependency>
4041
<!--spring boot end-->
4142

43+
4244
<!--thymeleaf start-->
43-
<dependency>
45+
<!--<dependency>
4446
<groupId>org.springframework.boot</groupId>
4547
<artifactId>spring-boot-starter-thymeleaf</artifactId>
46-
</dependency>
48+
</dependency>-->
4749
<!--thymeleaf end-->
4850

4951

@@ -54,6 +56,14 @@
5456
</dependency>
5557
<!--websocket end-->
5658

59+
<!--热部署 start-->
60+
<dependency>
61+
<groupId>org.springframework.boot</groupId>
62+
<artifactId>spring-boot-devtools</artifactId>
63+
<optional>true</optional>
64+
</dependency>
65+
66+
<!--热部署 end-->
5767
<!--spring-boot-starter-test start-->
5868
<dependency>
5969
<groupId>org.springframework.boot</groupId>
@@ -67,29 +77,43 @@
6777
<artifactId>spring-boot-starter-aop</artifactId>
6878
</dependency>
6979
<!--spring aop end-->
80+
<!-- 邮件 start -->
81+
<dependency>
82+
<groupId>javax.mail</groupId>
83+
<artifactId>mail</artifactId>
84+
<version>1.4.7</version>
85+
</dependency>
86+
<!-- 邮件 end -->
87+
<!-- 图片压缩 start -->
88+
<dependency>
89+
<groupId>net.coobird</groupId>
90+
<artifactId>thumbnailator</artifactId>
91+
<version>0.4.8</version>
92+
</dependency>
93+
<!-- 图片压缩 end -->
7094

71-
72-
<!--mybatis start-->
95+
<!--commons-io start-->
7396
<dependency>
74-
<groupId>org.mybatis.spring.boot</groupId>
75-
<artifactId>mybatis-spring-boot-starter</artifactId>
76-
<version>1.1.1</version>
97+
<groupId>commons-io</groupId>
98+
<artifactId>commons-io</artifactId>
99+
<version>1.3.2</version>
77100
</dependency>
78-
<!--mybatis end-->
101+
<!--commons-io end-->
79102

80103

81-
<!--thymeleaf不严格检查html start-->
82104
<dependency>
83-
<groupId>net.sourceforge.nekohtml</groupId>
84-
<artifactId>nekohtml</artifactId>
85-
<version>1.9.22</version>
105+
<groupId>com.google.guava</groupId>
106+
<artifactId>guava</artifactId>
107+
<version>20.0</version>
86108
</dependency>
87-
<!--thymeleaf不严格检查html end-->
88109

110+
<!--javassist start-->
89111
<dependency>
90-
<groupId>mysql</groupId>
91-
<artifactId>mysql-connector-java</artifactId>
112+
<groupId>javassist</groupId>
113+
<artifactId>javassist</artifactId>
114+
<version>3.11.0.GA</version>
92115
</dependency>
116+
<!--javassist end-->
93117

94118
<!--fastjson-->
95119
<dependency>
@@ -98,12 +122,6 @@
98122
<version>1.1.15</version>
99123
</dependency>
100124

101-
<dependency>
102-
<groupId>com.google.guava</groupId>
103-
<artifactId>guava</artifactId>
104-
<version>20.0</version>
105-
</dependency>
106-
107125
<dependency>
108126
<groupId>org.apache.commons</groupId>
109127
<artifactId>commons-lang3</artifactId>
@@ -113,70 +131,36 @@
113131
<dependency>
114132
<groupId>junit</groupId>
115133
<artifactId>junit</artifactId>
116-
<version>3.8.1</version>
117134
<scope>test</scope>
118135
</dependency>
119136
<!--junit end-->
120137

121-
<!-- mybatis逆向生成 -->
122-
<dependency>
123-
<groupId>org.mybatis.generator</groupId>
124-
<artifactId>mybatis-generator-core</artifactId>
125-
<version>1.3.5</version>
126-
</dependency>
127-
<!-- mybatis end -->
128-
<!--热部署 start-->
129-
<dependency>
130-
<groupId>org.springframework.boot</groupId>
131-
<artifactId>spring-boot-devtools</artifactId>
132-
<optional>true</optional>
133-
</dependency>
134138

135-
<!--热部署 end-->
136-
<!--junit start-->
137-
<dependency>
138-
<groupId>junit</groupId>
139-
<artifactId>junit</artifactId>
140-
<scope>test</scope>
141-
</dependency>
142-
<!--junit end-->
143-
<!-- 邮件 start -->
144-
<dependency>
145-
<groupId>javax.mail</groupId>
146-
<artifactId>mail</artifactId>
147-
<version>1.4.7</version>
148-
</dependency>
149-
<!-- 邮件 end -->
150-
<!-- 图片压缩 start -->
151-
<dependency>
152-
<groupId>net.coobird</groupId>
153-
<artifactId>thumbnailator</artifactId>
154-
<version>0.4.8</version>
155-
</dependency>
156-
<!-- 图片压缩 end -->
157-
<!-- redis的jar start -->
158-
<dependency>
159-
<groupId>redis.clients</groupId>
160-
<artifactId>jedis</artifactId>
161-
<version>2.2.1</version>
162-
</dependency>
163-
<!-- redis的jar end -->
164-
<!--commons-io start-->
165-
<dependency>
166-
<groupId>commons-io</groupId>
167-
<artifactId>commons-io</artifactId>
168-
<version>1.3.2</version>
169-
</dependency>
170-
<!--commons-io end-->
171139
<!--fileupload start-->
172140
<dependency>
173141
<groupId>commons-fileupload</groupId>
174142
<artifactId>commons-fileupload</artifactId>
175143
<version>1.2.1</version>
176144
</dependency>
177145
<!--fileupload start-->
178-
</dependencies>
179146

147+
<!--token start-->
148+
<dependency>
149+
<groupId>io.jsonwebtoken</groupId>
150+
<artifactId>jjwt</artifactId>
151+
<version>0.9.0</version>
152+
</dependency>
153+
<!--token end-->
154+
155+
156+
<!--thymeleaf不严格检查html start-->
157+
<!--<dependency>
158+
<groupId>net.sourceforge.nekohtml</groupId>
159+
<artifactId>nekohtml</artifactId>
160+
<version>1.9.22</version>
161+
</dependency>-->
162+
<!--thymeleaf不严格检查html end-->
163+
</dependencies>
180164

181165

182166
<profiles>

‎readme.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#VM
2+
##api url
3+
http://localhost:8888/swagger-ui.html/
4+
##frontend url
5+
http://localhost:8888/view/index.html

‎vm-backend/backend.iml

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="Spring" name="Spring">
5+
<configuration />
6+
</facet>
7+
<facet type="web" name="Web">
8+
<configuration>
9+
<webroots />
10+
</configuration>
11+
</facet>
12+
</component>
13+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
14+
<output url="file://$MODULE_DIR$/target/classes" />
15+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
16+
<content url="file://$MODULE_DIR$">
17+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
18+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
19+
<excludeFolder url="file://$MODULE_DIR$/target" />
20+
</content>
21+
<orderEntry type="inheritedJdk" />
22+
<orderEntry type="sourceFolder" forTests="false" />
23+
<orderEntry type="module" module-name="base" />
24+
<orderEntry type="module" module-name="dao" />
25+
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.1.1" level="project" />
26+
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.1.1" level="project" />
27+
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.0" level="project" />
28+
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.0" level="project" />
29+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.4.0.RELEASE" level="project" />
30+
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.5.4" level="project" />
31+
<orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.4" level="project" />
32+
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.2.RELEASE" level="project" />
33+
<orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.2.RELEASE" level="project" />
34+
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.39" level="project" />
35+
<orderEntry type="library" name="Maven: org.mybatis.generator:mybatis-generator-core:1.3.5" level="project" />
36+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.4.0.RELEASE" level="project" />
37+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.4.0.RELEASE" level="project" />
38+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.4.0.RELEASE" level="project" />
39+
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
40+
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
41+
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
42+
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
43+
<orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
44+
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
45+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.0.RELEASE" level="project" />
46+
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.4" level="project" />
47+
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.4" level="project" />
48+
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.4" level="project" />
49+
<orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
50+
<orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
51+
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
52+
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.1" level="project" />
53+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.1" level="project" />
54+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.1" level="project" />
55+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.1" level="project" />
56+
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.2.RELEASE" level="project" />
57+
<orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.2.RELEASE" level="project" />
58+
<orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.2.RELEASE" level="project" />
59+
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.2.RELEASE" level="project" />
60+
<orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.2.RELEASE" level="project" />
61+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:1.4.0.RELEASE" level="project" />
62+
<orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.2.RELEASE" level="project" />
63+
<orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.3.2.RELEASE" level="project" />
64+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:1.4.0.RELEASE" level="project" />
65+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.4.0.RELEASE" level="project" />
66+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.4.0.RELEASE" level="project" />
67+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.0.RELEASE" level="project" />
68+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:1.4.0.RELEASE" level="project" />
69+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.4.0.RELEASE" level="project" />
70+
<orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
71+
<orderEntry type="library" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
72+
<orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
73+
<orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.3" level="project" />
74+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
75+
<orderEntry type="library" name="Maven: org.assertj:assertj-core:2.5.0" level="project" />
76+
<orderEntry type="library" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
77+
<orderEntry type="library" scope="RUNTIME" name="Maven: org.objenesis:objenesis:2.1" level="project" />
78+
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
79+
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
80+
<orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.3.0" level="project" />
81+
<orderEntry type="library" name="Maven: org.json:json:20140107" level="project" />
82+
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.2.RELEASE" level="project" />
83+
<orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.2.RELEASE" level="project" />
84+
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.4.0.RELEASE" level="project" />
85+
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.2.RELEASE" level="project" />
86+
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
87+
<orderEntry type="library" name="Maven: javax.mail:mail:1.4.7" level="project" />
88+
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
89+
<orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" />
90+
<orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" />
91+
<orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
92+
<orderEntry type="library" name="Maven: javassist:javassist:3.11.0.GA" level="project" />
93+
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.1.15" level="project" />
94+
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
95+
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
96+
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
97+
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" />
98+
</component>
99+
</module>

‎vm-backend/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<parent>
4-
<artifactId>server</artifactId>
4+
<artifactId>engine</artifactId>
55
<groupId>com.vm</groupId>
66
<version>${project.version}</version>
77
</parent>

‎vm-backend/src/main/java/com/vm/BackendApplication.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
55
import org.springframework.boot.web.servlet.ServletComponentScan;
6+
import org.springframework.context.annotation.Bean;
7+
import org.springframework.web.cors.CorsConfiguration;
8+
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
9+
import org.springframework.web.filter.CorsFilter;
10+
import org.springframework.web.servlet.config.annotation.CorsRegistry;
11+
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
12+
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
613

714
@SpringBootApplication
815
@ServletComponentScan
@@ -14,4 +21,6 @@ public static void main(String[] args) {
1421

1522

1623
}
24+
25+
1726
}

‎vm-backend/src/main/java/com/vm/backend/controller/VmUsersController.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.vm.backend.controller;
2+
3+
import org.springframework.context.annotation.Scope;
4+
import org.springframework.stereotype.Controller;
5+
import org.springframework.web.bind.annotation.RequestBody;
6+
import org.springframework.web.bind.annotation.RequestMapping;
7+
import org.springframework.web.bind.annotation.RequestMethod;
8+
import org.springframework.web.bind.annotation.ResponseBody;
9+
10+
/**
11+
* Created by ZhangKe on 2018/1/16.
12+
*/
13+
@Controller
14+
@RequestMapping("/user")
15+
@Scope("prototype")
16+
public class VmUsersController {
17+
18+
@RequestMapping(value = "", method = RequestMethod.PUT)
19+
@ResponseBody
20+
public void userLogin() throws Exception {
21+
22+
}
23+
}

0 commit comments

Comments
 (0)