删除无需跟踪文件

.mvn/jvm.config

@@ -1 +0,0 @@
--Xmx1536m

.mvn/wrapper/maven-wrapper.properties

@@ -1 +0,0 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip

CHANGELOG.md

@@ -0,0 +1,6 @@
+## 修改记录
+
+### 1.0.0
+- 将秒杀项目进行模块化划分
+- 基础依赖版本升级
+- 新增.mvn等无需跟踪文件

miaosha-admin/miaosha-admin-api/.settings/org.eclipse.core.resources.prefs

@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8

miaosha-admin/miaosha-admin-api/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8

miaosha-admin/miaosha-admin-api/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

miaosha-admin/miaosha-admin-api/.settings/org.eclipse.wst.common.component

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="imooc-dubbo-order-api">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
-    </wb-module>
-</project-modules>

miaosha-admin/miaosha-admin-api/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="java" version="1.8"/>
-  <installed facet="jst.utility" version="1.0"/>
-</faceted-project>

miaosha-admin/miaosha-admin-api/.settings/org.eclipse.wst.validation.prefs

@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1

miaosha-admin/miaosha-admin-api/pom.xml

@@ -9,36 +9,22 @@
 	<artifactId>miaosha-admin-api</artifactId>
 
 	<dependencies>
-		<!--lombook引用-->
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.2</version>
 			<scope>provided</scope>
 		</dependency>
-		<!-- servlet-api -->
-		<!--<dependency>-->
-			<!--<groupId>javax.servlet</groupId>-->
-			<!--<artifactId>servlet-api</artifactId>-->
-			<!--<version>2.5</version>-->
-			<!--<scope>provided</scope>-->
-		<!--</dependency>-->
-		<!--<dependency>-->
-			<!--<groupId>org.springframework</groupId>-->
-			<!--<artifactId>spring-web</artifactId>-->
-			<!--<version>4.0.0.RELEASE</version>-->
-		<!--</dependency>-->
 		<dependency>
 			<groupId>com.geekq</groupId>
 			<artifactId>miaosha-admin-common</artifactId>
-			<version>${revision}</version>
 		</dependency>
-
-
 		<dependency>
 			<groupId>org.mybatis</groupId>
 			<artifactId>mybatis-spring</artifactId>
-			<version>1.2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mybatis</groupId>
+			<artifactId>mybatis</artifactId>
 		</dependency>
 	</dependencies>
 

miaosha-admin/miaosha-admin-common/pom.xml

@@ -8,13 +8,7 @@
     </parent>
     <artifactId>miaosha-admin-common</artifactId>
     <version>${revision}</version>
-	<properties>
-		<org.mybatis.version>3.2.3</org.mybatis.version>
-		<org.springframework.version>4.0.0.RELEASE</org.springframework.version>
-	</properties>
-	<!-- jar包的依赖 -->
     <dependencies>
-		<!-- Apache工具组件 -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -28,39 +22,27 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-
         <!-- 校验处理工具包 -->
-
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
             <version>2.0.1.Final</version>
         </dependency>
-
-		<!--lombook引用-->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-			<version>1.18.2</version>
             <scope>provided</scope>
         </dependency>
-
-		<!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-validator -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
-			<version>5.3.5.Final</version>
+            <version>7.0.1.Final</version>
         </dependency>
         <!-- httpclient -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
-		<dependency>
-		    <groupId>commons-httpclient</groupId>
-		    <artifactId>commons-httpclient</artifactId>
-		</dependency>
-		
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -74,29 +56,10 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-			<version>1.2.7</version>
         </dependency>
-
-		<!-- mybatis -->
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis</artifactId>
-			<version>${org.mybatis.version}</version>
-		</dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-			<version>${org.springframework.version}</version>
         </dependency>
-		<!-- 日志处理 -->
-		<!--<dependency>-->
-			<!--<groupId>org.slf4j</groupId>-->
-			<!--<artifactId>slf4j-api</artifactId>-->
-		<!--</dependency>-->
-		<!--<dependency>-->
-			<!--<groupId>org.slf4j</groupId>-->
-			<!--<artifactId>slf4j-log4j12</artifactId>-->
-		<!--</dependency>-->
     </dependencies>
 </project>

miaosha-admin/miaosha-admin-service/.settings/.jsdtscope

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="src/main/webapp"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>

miaosha-admin/miaosha-admin-service/.settings/org.eclipse.core.resources.prefs

@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8

miaosha-admin/miaosha-admin-service/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8

miaosha-admin/miaosha-admin-service/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.common.component

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="imooc-dubbo-order-service">
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="imooc-dubbo-order-api-${revision}.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/imooc-dubbo-order-api/imooc-dubbo-order-api">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <property name="context-root" value="imooc-dubbo-order-service"/>
-        <property name="java-output-path" value="/imooc-dubbo-order-service/target/classes"/>
-    </wb-module>
-</project-modules>

miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="1.8"/>
-  <installed facet="jst.web" version="2.5"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-</faceted-project>

miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary

miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -1 +0,0 @@
-Window

miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.validation.prefs

@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1

miaosha-admin/miaosha-admin-service/pom.xml

@@ -11,29 +11,22 @@
 	<packaging>war</packaging>
 	
 	<dependencies>
-
-		<!-- jedis依赖 -->
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-redis</artifactId>
-			<version>1.8.4.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>com.geekq</groupId>
 			<artifactId>miaosha-admin-api</artifactId>
-			<version>${revision}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.geekq</groupId>
+			<artifactId>miaosha-admin-common</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>dubbo</artifactId>
-			<version>2.6.0</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.zookeeper</groupId>
@@ -43,7 +36,6 @@
 			<groupId>com.github.sgroschupf</groupId>
 			<artifactId>zkclient</artifactId>
 		</dependency>
-
 		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -68,16 +60,6 @@
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
-			<version>2.9.0</version>
-		</dependency>
-		<!-- Mybatis -->
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis-spring</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.github.miemiedev</groupId>
@@ -100,9 +82,7 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
 		</dependency>
-
 	</dependencies>
 	
 	<build>

miaosha-admin/miaosha-admin-web/.settings/.jsdtscope

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="**/bower_components/*|**/node_modules/*|**/*.min.js" kind="src" path="src/main/webapp"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>

miaosha-admin/miaosha-admin-web/.settings/org.eclipse.core.resources.prefs

@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8

miaosha-admin/miaosha-admin-web/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8

miaosha-admin/miaosha-admin-web/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.common.component

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="imooc-dubbo-web">
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="imooc-dubbo-common-${revision}.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/imooc-dubbo-common/imooc-dubbo-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="imooc-dubbo-item-api-${revision}.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/imooc-dubbo-item-api/imooc-dubbo-item-api">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="imooc-dubbo-order-api-${revision}.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/imooc-dubbo-order-api/imooc-dubbo-order-api">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <property name="context-root" value="imooc-dubbo-web"/>
-        <property name="java-output-path" value="/imooc-dubbo-web/target/classes"/>
-    </wb-module>
-</project-modules>

miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="1.8"/>
-  <installed facet="jst.web" version="2.5"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-</faceted-project>

miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary

miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -1 +0,0 @@
-Window

miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.validation.prefs

@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1

miaosha-admin/miaosha-admin-web/pom.xml

@@ -11,32 +11,13 @@
 	<packaging>war</packaging>
 	
 	<dependencies>
-		<dependency>
-			<groupId>com.geekq</groupId>
-			<artifactId>miaosha-admin-common</artifactId>
-			<version>${revision}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.geekq</groupId>
-			<artifactId>miaosha-admin-api</artifactId>
-			<version>${revision}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.geekq</groupId>
-			<artifactId>miaosha-admin-service</artifactId>
-			<version>${revision}</version>
-		</dependency>
-		<!-- freemarker -->
 		<dependency>
 			<groupId>org.freemarker</groupId>
 			<artifactId>freemarker</artifactId>
-			<version>2.3.23</version>
 		</dependency>
-		<!-- 引入dubbo -->
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>dubbo</artifactId>
-			<version>2.6.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.zookeeper</groupId>
@@ -83,7 +64,6 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context-support</artifactId>
-			<version>3.2.4.RELEASE</version>
 		</dependency>
 
 		<!-- JSP相关 -->
@@ -101,7 +81,18 @@
 			<artifactId>jsp-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
-
+		<dependency>
+			<groupId>com.geekq</groupId>
+			<artifactId>miaosha-admin-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.geekq</groupId>
+			<artifactId>miaosha-admin-common</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.geekq</groupId>
+			<artifactId>miaosha-admin-service</artifactId>
+		</dependency>
 	</dependencies>
 	
 	<build>

miaosha-admin/miaosha-admin-web/src/main/java/com/geekq/web/controller/LoginController.java

@@ -5,18 +5,15 @@ import com.geekq.admin.service.ILogininfoService;
 import com.geekq.admin.service.RedisCacheStorageService;
 import com.geekq.common.enums.Constants;
 import com.geekq.common.utils.resultbean.ResultGeekQ;
-import com.geekq.common.vo.LoginVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 
 /**
  * @author 邱润泽
@@ -35,8 +32,7 @@ public class LoginController  extends BaseController {
     private RedisCacheStorageService redisCacheStorageService;
 
 
-
+    @RequestMapping("/login")
-    @RequestMapping("/login" )
     @ResponseBody
     public ResultGeekQ<Logininfo> dologin(HttpServletResponse response,
                                           HttpServletRequest request,
@@ -45,10 +41,10 @@ public class LoginController  extends BaseController {
 
 
         ResultGeekQ<Logininfo> login = this.iLogininfoService.login(username, password,
-                Constants.USERTYPE_NORMAL,request.getRemoteAddr());
+                Constants.USERTYPE_NORMAL, request.getRemoteAddr());
         result.setData(login.getData());
-        if(!ResultGeekQ.isSuccess(login)){
+        if (!ResultGeekQ.isSuccess(login)) {
-            result.withError(login.getCode(),login.getMessage());
+            result.withError(login.getCode(), login.getMessage());
         }
         return result;
     }

miaosha-admin/miaosha-admin-web/src/main/java/com/geekq/web/controller/PersonController.java

@@ -4,7 +4,6 @@ import com.geekq.admin.entity.Logininfo;
 import com.geekq.admin.service.IAccountService;
 import com.geekq.admin.service.IUserService;
 import com.geekq.admin.service.RedisCacheStorageService;
-import com.geekq.admin.utils.UserContext;
 import com.geekq.web.interceptor.RequiredLogin;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -23,7 +22,6 @@ public class PersonController extends BaseController {
     private IAccountService accountService;
 
 
-
     @Autowired
     private RedisCacheStorageService redisService;
 
@@ -32,7 +30,7 @@ public class PersonController extends BaseController {
     public String personal(Model model, HttpServletRequest request) {
         //从中拿到 用户信息对象
         String username = request.getParameter("username");
-        Logininfo info = redisService.get("Login"+username);
+        Logininfo info = redisService.get("Login" + username);
         model.addAttribute("userinfo", userinfoService.get(info.getId()));
         model.addAttribute("account", accountService.get(info.getId()));
         model.addAttribute("logininfo", info);

miaosha-admin/pom.xml

@@ -13,7 +13,6 @@
 	</parent>
 	<!-- 集中定义依赖版本号 -->
 	<properties>
-		<spring.version>4.3.13.RELEASE</spring.version>
 		<spring-data-redis.version>1.8.7.RELEASE</spring-data-redis.version>
 		<apache-commons-pool2>2.4.2</apache-commons-pool2>
 		<mybatis.version>3.2.8</mybatis.version>
@@ -43,6 +42,21 @@
 	<!-- 只定义依赖的版本，不会实际依赖 -->
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>com.geekq</groupId>
+				<artifactId>miaosha-admin-common</artifactId>
+				<version>${revision}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.geekq</groupId>
+				<artifactId>miaosha-admin-api</artifactId>
+				<version>${revision}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.geekq</groupId>
+				<artifactId>miaosha-admin-service</artifactId>
+				<version>${revision}</version>
+			</dependency>
 			<dependency>
 				<groupId>commons-net</groupId>
 				<artifactId>commons-net</artifactId>
@@ -70,18 +84,6 @@
 				<artifactId>httpclient</artifactId>
 				<version>${httpclient.version}</version>
 			</dependency>
-
-			<!-- Mybatis -->
-			<dependency>
-				<groupId>org.mybatis</groupId>
-				<artifactId>mybatis</artifactId>
-				<version>${mybatis.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.mybatis</groupId>
-				<artifactId>mybatis-spring</artifactId>
-				<version>${mybatis.spring.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>com.github.miemiedev</groupId>
 				<artifactId>mybatis-paginator</artifactId>
@@ -92,67 +94,6 @@
 				<artifactId>pagehelper</artifactId>
 				<version>${pagehelper.version}</version>
 			</dependency>
-			<!-- MySql -->
-			<dependency>
-				<groupId>mysql</groupId>
-				<artifactId>mysql-connector-java</artifactId>
-				<version>${mysql.version}</version>
-			</dependency>
-
-			<!-- 连接池 阿里巴巴数据源 全世界最牛逼的data source 没有之一 -->
-			<dependency>
-				<groupId>com.alibaba</groupId>
-				<artifactId>druid</artifactId>
-				<version>${druid.version}</version>
-			</dependency>
-			<!-- Spring -->
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-core</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-context</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-context-support</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-beans</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-webmvc</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-jdbc</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-aspects</artifactId>
-				<version>${spring.version}</version>
-			</dependency>
-			<!--<dependency>-->
-			    <!--<groupId>org.springframework.data</groupId>-->
-			    <!--<artifactId>spring-data-redis</artifactId>-->
-			    <!--<version>${spring-data-redis.version}</version>-->
-			<!--</dependency>-->
-			<!-- 用于jedis-spring-data redisTemplate -->
-			<dependency>
-	            <groupId>org.apache.commons</groupId>
-	            <artifactId>commons-pool2</artifactId>
-	            <version>${apache-commons-pool2}</version>
-	        </dependency>
-			<!-- JSP相关 -->
 			<dependency>
 				<groupId>jstl</groupId>
 				<artifactId>jstl</artifactId>
@@ -170,71 +111,8 @@
 				<version>${jsp-api.version}</version>
 				<scope>provided</scope>
 			</dependency>
-			<!-- Redis客户端 -->
-			<dependency>
-				<groupId>redis.clients</groupId>
-				<artifactId>jedis</artifactId>
-				<version>${jedis.version}</version>
-			</dependency>
-
-			<!-- httpclient -->
-			<dependency>
-				<groupId>commons-httpclient</groupId>
-				<artifactId>commons-httpclient</artifactId>
-				<version>${commons.httpclient.version}</version>
-			</dependency>
-
-			<!-- 日志处理 -->
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-api</artifactId>
-				<version>${slf4j.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-log4j12</artifactId>
-				<version>${slf4j.version}</version>
-			</dependency>
-
-			<!-- 引入dubbo -->
-			<dependency>
-				<groupId>com.alibaba</groupId>
-				<artifactId>dubbo</artifactId>
-				<version>${dubbo.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.zookeeper</groupId>
-				<artifactId>zookeeper</artifactId>
-				<version>${zookeeper.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.github.sgroschupf</groupId>
-				<artifactId>zkclient</artifactId>
-				<version>${zkclient.version}</version>
-			</dependency>
-			
-			<!-- zk 客户端依赖 -->
-			<dependency>
-				<groupId>org.apache.curator</groupId>
-				<artifactId>curator-framework</artifactId>
-				<version>${apache.curator.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.curator</groupId>
-				<artifactId>curator-recipes</artifactId>
-				<version>${apache.curator.version}</version>
-			</dependency>
-			
 		</dependencies>
-
 	</dependencyManagement>
-
 	<build>
 		<finalName>${project.artifactId}</finalName>
 		<plugins>

miaosha-order/.mvn/wrapper/maven-wrapper.properties

@@ -1 +0,0 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip

miaosha-order/miaosha-order-api/.mvn/wrapper/maven-wrapper.properties

@@ -1 +0,0 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip

miaosha-order/miaosha-order-provider/.mvn/wrapper/maven-wrapper.properties

@@ -1 +0,0 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip

miaosha-order/pom.xml

@@ -24,8 +24,8 @@
         <java.version>1.8</java.version>
         <curator-framework.version>4.0.1</curator-framework.version>
         <zookeeper.version>3.4.13</zookeeper.version>
-        <dubbo.starter.version>0.2.0</dubbo.starter.version>
+        <dubbo.starter.version>0.2.1.RELEASE</dubbo.starter.version>
-        <org.mybatis.version>1.3.2</org.mybatis.version>
+        <org.mybatis.version>2.2.0</org.mybatis.version>
         <com.alibaba.druid>1.1.10</com.alibaba.druid>
     </properties>
 
@@ -38,7 +38,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

miaosha-v2/.gitignore

@@ -1,4 +1,4 @@
-/target/
+target/
 !.mvn/wrapper/maven-wrapper.jar
 
 ### STS ###
@@ -15,7 +15,7 @@
 *.iws
 *.iml
 *.ipr
-
+.mvn/
 ### NetBeans ###
 /nbproject/private/
 /nbbuild/

miaosha-v2/miaosha-common/pom.xml

@@ -10,14 +10,4 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>miaosha-common</artifactId>
     <version>${revision}</version>
-    <dependencies>
-        <!--lombook引用-->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.2</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
 </project>

miaosha-v2/miaosha-service/pom.xml

@@ -3,34 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>miaosha-v2</artifactId>
         <groupId>com.geekq.v2</groupId>
+        <artifactId>miaosha-v2</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>miaosha-service</artifactId>
     <version>${revision}</version>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                    <include>**/*.xml</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                    <include>**/*.xml</include>
-                    <include>**/*.ini</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
-    </build>
     <dependencies>
         <dependency>
             <groupId>com.geekq.v2</groupId>

miaosha-v2/pom.xml

@@ -27,7 +27,7 @@
         <com.dubbo>1.0.0</com.dubbo>
         <com.zk.version>3.4.6</com.zk.version>
         <com.zk.client>0.1</com.zk.client>
-        <curator-framework.version>4.0.1</curator-framework.version>
+        <curator-framework.version>5.1.0</curator-framework.version>
         <dubbo.starter.version>0.2.0</dubbo.starter.version>
     </properties>
     <dependencyManagement>
@@ -70,7 +70,6 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>${org.mybatis.version}</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -79,35 +78,27 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
-            <version>${com.alibaba.druid}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
-
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
-
-
         <dependency>
             <groupId>net.sourceforge.nekohtml</groupId>
             <artifactId>nekohtml</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
-
-
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
@@ -119,69 +110,26 @@
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            <version>2.3</version>
         </dependency>
-
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.38</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba.boot</groupId>
             <artifactId>dubbo-spring-boot-starter</artifactId>
-            <version>${dubbo.starter.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
-            <version>${curator-framework.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.sgroschupf</groupId>
             <artifactId>zkclient</artifactId>
-            <version>${com.zk.client}</version>
         </dependency>
         <dependency>
             <groupId>com.geekq.api</groupId>
             <artifactId>miaosha-order-api</artifactId>
-            <version>${revision}</version>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                    <include>**/*.xml</include>
-                </includes>
-                <filtering>true</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <!--<includes>-->
-                <!--<include>**/*.properties</include>-->
-                <!--<include>**/*.xml</include>-->
-                <!--<include>**/*.ini</include>-->
-                <!--</includes>-->
-                <filtering>false</filtering>
-            </resource>
-            <resource> <!--配置文件路径 -->
-                <directory>src/main/resources</directory> <!--这里对应项目存放配置文件的目录--> <!--开启filtering功能 -->
-                <filtering>true</filtering>
-                <includes>
-                    <!--<include>application-${activatedProperties}.properties</include>-->
-                    <include>application.properties</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
 </project>

pom.xml

@@ -20,6 +20,11 @@
         <jmh.version>1.33</jmh.version>
         <reflections.version>0.10.2</reflections.version>
         <spring-boot.version>2.6.1</spring-boot.version>
+        <dubbo.starter.version>0.2.1.RELEASE</dubbo.starter.version>
+        <mybatis.starter.version>2.2.0</mybatis.starter.version>
+        <zookeeper.version>3.4.6</zookeeper.version>
+        <com.zk.client>0.1</com.zk.client>
+        <curator-framework.version>5.1.0</curator-framework.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -42,6 +47,16 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.mybatis.spring.boot</groupId>
+                <artifactId>mybatis-spring-boot-starter</artifactId>
+                <version>${mybatis.starter.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba.boot</groupId>
+                <artifactId>dubbo-spring-boot-starter</artifactId>
+                <version>${dubbo.starter.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.reflections</groupId>
                 <artifactId>reflections</artifactId>
@@ -87,11 +102,51 @@
                 <artifactId>fastjson</artifactId>
                 <version>1.2.78</version>
             </dependency>
+            <dependency>
+                <groupId>joda-time</groupId>
+                <artifactId>joda-time</artifactId>
+                <version>2.10.13</version>
+            </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>druid</artifactId>
                 <version>1.2.8</version>
             </dependency>
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>dubbo</artifactId>
+                <version>2.6.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-framework</artifactId>
+                <version>${curator-framework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-recipes</artifactId>
+                <version>${curator-framework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.zookeeper</groupId>
+                <artifactId>zookeeper</artifactId>
+                <version>${zookeeper.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.sgroschupf</groupId>
+                <artifactId>zkclient</artifactId>
+                <version>${com.zk.client}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mybatis</groupId>
+                <artifactId>mybatis</artifactId>
+                <version>3.4.6</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mybatis</groupId>
+                <artifactId>mybatis-spring</artifactId>
+                <version>1.2.3</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <build>