diff --git a/.mvn/jvm.config b/.mvn/jvm.config
deleted file mode 100755
index f432c96..0000000
--- a/.mvn/jvm.config
+++ /dev/null
@@ -1 +0,0 @@
--Xmx1536m
\ No newline at end of file
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100755
index 9cc84ea..0000000
Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
deleted file mode 100755
index cd0d451..0000000
--- a/.mvn/wrapper/maven-wrapper.properties
+++ /dev/null
@@ -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
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..49180d1
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,6 @@
+## 修改记录
+
+### 1.0.0
+- 将秒杀项目进行模块化划分
+- 基础依赖版本升级
+- 新增.mvn等无需跟踪文件
diff --git a/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.core.resources.prefs b/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index dc1b414..0000000
--- a/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -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
diff --git a/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.jdt.core.prefs b/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6e80039..0000000
--- a/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -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
diff --git a/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.m2e.core.prefs b/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.wst.common.component b/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index a4fb6cc..0000000
--- a/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.wst.common.project.facet.core.xml b/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index fb95c45..0000000
--- a/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.wst.validation.prefs b/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8c..0000000
--- a/miaosha-admin/miaosha-admin-api/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/miaosha-admin/miaosha-admin-api/pom.xml b/miaosha-admin/miaosha-admin-api/pom.xml
index 4b03f11..d012739 100644
--- a/miaosha-admin/miaosha-admin-api/pom.xml
+++ b/miaosha-admin/miaosha-admin-api/pom.xml
@@ -9,36 +9,22 @@
miaosha-admin-api
-
org.projectlombok
lombok
- 1.18.2
provided
-
-
-
-
-
-
-
-
-
-
-
-
com.geekq
miaosha-admin-common
- ${revision}
-
-
org.mybatis
mybatis-spring
- 1.2.3
+
+
+ org.mybatis
+ mybatis
diff --git a/miaosha-admin/miaosha-admin-common/pom.xml b/miaosha-admin/miaosha-admin-common/pom.xml
index 0e43a4d..e89870a 100644
--- a/miaosha-admin/miaosha-admin-common/pom.xml
+++ b/miaosha-admin/miaosha-admin-common/pom.xml
@@ -1,102 +1,65 @@
- 4.0.0
-
- com.geekq
- miaosha-admin
- ${revision}
-
- miaosha-admin-common
- ${revision}
-
- 3.2.3
- 4.0.0.RELEASE
-
-
-
-
-
- org.apache.commons
- commons-lang3
-
-
- commons-net
- commons-net
-
-
-
- com.fasterxml.jackson.core
- jackson-databind
-
-
-
-
-
- javax.validation
- validation-api
- 2.0.1.Final
-
-
-
-
- org.projectlombok
- lombok
- 1.18.2
- provided
-
-
-
-
- org.hibernate
- hibernate-validator
- 5.3.5.Final
-
-
-
- org.apache.httpcomponents
- httpclient
-
-
- commons-httpclient
- commons-httpclient
-
-
-
- javax.servlet
- servlet-api
- provided
-
-
- javax.servlet
- jsp-api
- provided
-
-
- com.alibaba
- fastjson
- 1.2.7
-
-
-
-
- org.mybatis
- mybatis
- ${org.mybatis.version}
-
-
-
- org.springframework
- spring-context
- ${org.springframework.version}
-
-
-
-
-
-
-
-
-
-
-
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ 4.0.0
+
+ com.geekq
+ miaosha-admin
+ ${revision}
+
+ miaosha-admin-common
+ ${revision}
+
+
+ org.apache.commons
+ commons-lang3
+
+
+ commons-net
+ commons-net
+
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+
+ javax.validation
+ validation-api
+ 2.0.1.Final
+
+
+ org.projectlombok
+ lombok
+ provided
+
+
+ org.hibernate
+ hibernate-validator
+ 7.0.1.Final
+
+
+
+ org.apache.httpcomponents
+ httpclient
+
+
+ javax.servlet
+ servlet-api
+ provided
+
+
+ javax.servlet
+ jsp-api
+ provided
+
+
+ com.alibaba
+ fastjson
+
+
+ org.springframework
+ spring-context
+
+
\ No newline at end of file
diff --git a/miaosha-admin/miaosha-admin-service/.settings/.jsdtscope b/miaosha-admin/miaosha-admin-service/.settings/.jsdtscope
deleted file mode 100644
index 81672d4..0000000
--- a/miaosha-admin/miaosha-admin-service/.settings/.jsdtscope
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.core.resources.prefs b/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index dc1b414..0000000
--- a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -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
diff --git a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.jdt.core.prefs b/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6e80039..0000000
--- a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -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
diff --git a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.m2e.core.prefs b/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.common.component b/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index ba977e2..0000000
--- a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
- uses
-
-
-
-
-
diff --git a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.common.project.facet.core.xml b/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index e1de9b3..0000000
--- a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.jsdt.ui.superType.container b/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a..0000000
--- a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.jsdt.ui.superType.name b/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b..0000000
--- a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.validation.prefs b/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8c..0000000
--- a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/miaosha-admin/miaosha-admin-service/pom.xml b/miaosha-admin/miaosha-admin-service/pom.xml
index 51ed283..47589dd 100644
--- a/miaosha-admin/miaosha-admin-service/pom.xml
+++ b/miaosha-admin/miaosha-admin-service/pom.xml
@@ -11,29 +11,22 @@
war
-
-
org.springframework.data
spring-data-redis
- 1.8.4.RELEASE
com.geekq
miaosha-admin-api
- ${revision}
+
+
+ com.geekq
+ miaosha-admin-common
com.alibaba
dubbo
- 2.6.0
-
-
- org.springframework
- spring
-
-
org.apache.zookeeper
@@ -43,7 +36,6 @@
com.github.sgroschupf
zkclient
-
org.springframework
@@ -68,16 +60,6 @@
redis.clients
jedis
- 2.9.0
-
-
-
- org.mybatis
- mybatis
-
-
- org.mybatis
- mybatis-spring
com.github.miemiedev
@@ -100,9 +82,7 @@
javax.servlet
servlet-api
- 2.5
-
diff --git a/miaosha-admin/miaosha-admin-web/.settings/.jsdtscope b/miaosha-admin/miaosha-admin-web/.settings/.jsdtscope
deleted file mode 100644
index 81672d4..0000000
--- a/miaosha-admin/miaosha-admin-web/.settings/.jsdtscope
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.core.resources.prefs b/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index dc1b414..0000000
--- a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -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
diff --git a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.jdt.core.prefs b/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6e80039..0000000
--- a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -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
diff --git a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.m2e.core.prefs b/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.common.component b/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index e34c054..0000000
--- a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
- uses
-
-
- uses
-
-
- uses
-
-
-
-
-
diff --git a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.common.project.facet.core.xml b/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index e1de9b3..0000000
--- a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.jsdt.ui.superType.container b/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a..0000000
--- a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.jsdt.ui.superType.name b/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b..0000000
--- a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.validation.prefs b/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8c..0000000
--- a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/miaosha-admin/miaosha-admin-web/pom.xml b/miaosha-admin/miaosha-admin-web/pom.xml
index c7bdc52..47e045d 100644
--- a/miaosha-admin/miaosha-admin-web/pom.xml
+++ b/miaosha-admin/miaosha-admin-web/pom.xml
@@ -11,32 +11,13 @@
war
-
- com.geekq
- miaosha-admin-common
- ${revision}
-
-
- com.geekq
- miaosha-admin-api
- ${revision}
-
-
- com.geekq
- miaosha-admin-service
- ${revision}
-
-
org.freemarker
freemarker
- 2.3.23
-
com.alibaba
dubbo
- 2.6.0
org.apache.zookeeper
@@ -83,7 +64,6 @@
org.springframework
spring-context-support
- 3.2.4.RELEASE
@@ -101,7 +81,18 @@
jsp-api
provided
-
+
+ com.geekq
+ miaosha-admin-api
+
+
+ com.geekq
+ miaosha-admin-common
+
+
+ com.geekq
+ miaosha-admin-service
+
diff --git a/miaosha-admin/miaosha-admin-web/src/main/java/com/geekq/web/controller/LoginController.java b/miaosha-admin/miaosha-admin-web/src/main/java/com/geekq/web/controller/LoginController.java
index ebe7e4c..8ba2088 100644
--- a/miaosha-admin/miaosha-admin-web/src/main/java/com/geekq/web/controller/LoginController.java
+++ b/miaosha-admin/miaosha-admin-web/src/main/java/com/geekq/web/controller/LoginController.java
@@ -5,25 +5,22 @@ 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 邱润泽
* 登录模块
*/
@Controller
-public class LoginController extends BaseController {
+public class LoginController extends BaseController {
private static Logger logger = LoggerFactory.getLogger(LoginController.class);
@@ -35,20 +32,19 @@ public class LoginController extends BaseController {
private RedisCacheStorageService redisCacheStorageService;
-
- @RequestMapping("/login" )
+ @RequestMapping("/login")
@ResponseBody
public ResultGeekQ dologin(HttpServletResponse response,
- HttpServletRequest request,
- String username, String password) {
+ HttpServletRequest request,
+ String username, String password) {
ResultGeekQ result = ResultGeekQ.build();
- ResultGeekQ login = this.iLogininfoService.login(username, password,
- Constants.USERTYPE_NORMAL,request.getRemoteAddr());
+ ResultGeekQ login = this.iLogininfoService.login(username, password,
+ Constants.USERTYPE_NORMAL, request.getRemoteAddr());
result.setData(login.getData());
- if(!ResultGeekQ.isSuccess(login)){
- result.withError(login.getCode(),login.getMessage());
+ if (!ResultGeekQ.isSuccess(login)) {
+ result.withError(login.getCode(), login.getMessage());
}
return result;
}
diff --git a/miaosha-admin/miaosha-admin-web/src/main/java/com/geekq/web/controller/PersonController.java b/miaosha-admin/miaosha-admin-web/src/main/java/com/geekq/web/controller/PersonController.java
index d6a0c19..53f355b 100644
--- a/miaosha-admin/miaosha-admin-web/src/main/java/com/geekq/web/controller/PersonController.java
+++ b/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;
@@ -31,8 +29,8 @@ public class PersonController extends BaseController {
@RequestMapping("/personal")
public String personal(Model model, HttpServletRequest request) {
//从中拿到 用户信息对象
- String username = request.getParameter("username");
- Logininfo info = redisService.get("Login"+username);
+ String username = request.getParameter("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);
diff --git a/miaosha-admin/pom.xml b/miaosha-admin/pom.xml
index 19d2105..5f057bb 100644
--- a/miaosha-admin/pom.xml
+++ b/miaosha-admin/pom.xml
@@ -13,7 +13,6 @@
- 4.3.13.RELEASE
1.8.7.RELEASE
2.4.2
3.2.8
@@ -43,6 +42,21 @@
+
+ com.geekq
+ miaosha-admin-common
+ ${revision}
+
+
+ com.geekq
+ miaosha-admin-api
+ ${revision}
+
+
+ com.geekq
+ miaosha-admin-service
+ ${revision}
+
commons-net
commons-net
@@ -70,18 +84,6 @@
httpclient
${httpclient.version}
-
-
-
- org.mybatis
- mybatis
- ${mybatis.version}
-
-
- org.mybatis
- mybatis-spring
- ${mybatis.spring.version}
-
com.github.miemiedev
mybatis-paginator
@@ -92,67 +94,6 @@
pagehelper
${pagehelper.version}
-
-
- mysql
- mysql-connector-java
- ${mysql.version}
-
-
-
-
- com.alibaba
- druid
- ${druid.version}
-
-
-
- org.springframework
- spring-core
- ${spring.version}
-
-
- org.springframework
- spring-context
- ${spring.version}
-
-
- org.springframework
- spring-context-support
- ${spring.version}
-
-
- org.springframework
- spring-beans
- ${spring.version}
-
-
- org.springframework
- spring-webmvc
- ${spring.version}
-
-
- org.springframework
- spring-jdbc
- ${spring.version}
-
-
- org.springframework
- spring-aspects
- ${spring.version}
-
-
-
-
-
-
-
-
- org.apache.commons
- commons-pool2
- ${apache-commons-pool2}
-
-
jstl
jstl
@@ -170,71 +111,8 @@
${jsp-api.version}
provided
-
-
- redis.clients
- jedis
- ${jedis.version}
-
-
-
-
- commons-httpclient
- commons-httpclient
- ${commons.httpclient.version}
-
-
-
-
- org.slf4j
- slf4j-api
- ${slf4j.version}
-
-
- org.slf4j
- slf4j-log4j12
- ${slf4j.version}
-
-
-
-
- com.alibaba
- dubbo
- ${dubbo.version}
-
-
- org.springframework
- spring
-
-
-
-
- org.apache.zookeeper
- zookeeper
- ${zookeeper.version}
-
-
- com.github.sgroschupf
- zkclient
- ${zkclient.version}
-
-
-
-
- org.apache.curator
- curator-framework
- ${apache.curator.version}
-
-
- org.apache.curator
- curator-recipes
- ${apache.curator.version}
-
-
-
-
${project.artifactId}
diff --git a/miaosha-order/.mvn/wrapper/maven-wrapper.jar b/miaosha-order/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index 9cc84ea..0000000
Binary files a/miaosha-order/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
diff --git a/miaosha-order/.mvn/wrapper/maven-wrapper.properties b/miaosha-order/.mvn/wrapper/maven-wrapper.properties
deleted file mode 100644
index b573bb5..0000000
--- a/miaosha-order/.mvn/wrapper/maven-wrapper.properties
+++ /dev/null
@@ -1 +0,0 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip
diff --git a/miaosha-order/miaosha-order-api/.mvn/wrapper/maven-wrapper.jar b/miaosha-order/miaosha-order-api/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index 9cc84ea..0000000
Binary files a/miaosha-order/miaosha-order-api/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
diff --git a/miaosha-order/miaosha-order-api/.mvn/wrapper/maven-wrapper.properties b/miaosha-order/miaosha-order-api/.mvn/wrapper/maven-wrapper.properties
deleted file mode 100644
index b573bb5..0000000
--- a/miaosha-order/miaosha-order-api/.mvn/wrapper/maven-wrapper.properties
+++ /dev/null
@@ -1 +0,0 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip
diff --git a/miaosha-order/miaosha-order-provider/.mvn/wrapper/maven-wrapper.jar b/miaosha-order/miaosha-order-provider/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index 9cc84ea..0000000
Binary files a/miaosha-order/miaosha-order-provider/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
diff --git a/miaosha-order/miaosha-order-provider/.mvn/wrapper/maven-wrapper.properties b/miaosha-order/miaosha-order-provider/.mvn/wrapper/maven-wrapper.properties
deleted file mode 100644
index b573bb5..0000000
--- a/miaosha-order/miaosha-order-provider/.mvn/wrapper/maven-wrapper.properties
+++ /dev/null
@@ -1 +0,0 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip
diff --git a/miaosha-order/pom.xml b/miaosha-order/pom.xml
index f20532c..a3387fb 100644
--- a/miaosha-order/pom.xml
+++ b/miaosha-order/pom.xml
@@ -24,8 +24,8 @@
1.8
4.0.1
3.4.13
- 0.2.0
- 1.3.2
+ 0.2.1.RELEASE
+ 2.2.0
1.1.10
@@ -38,7 +38,6 @@
org.projectlombok
lombok
- 1.18.2
provided
diff --git a/miaosha-v2/.gitignore b/miaosha-v2/.gitignore
index c456c4a..fc01583 100644
--- a/miaosha-v2/.gitignore
+++ b/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/
diff --git a/miaosha-v2/miaosha-common/pom.xml b/miaosha-v2/miaosha-common/pom.xml
index 98639b4..1f8c680 100644
--- a/miaosha-v2/miaosha-common/pom.xml
+++ b/miaosha-v2/miaosha-common/pom.xml
@@ -10,14 +10,4 @@
4.0.0
miaosha-common
${revision}
-
-
-
- org.projectlombok
- lombok
- 1.18.2
- provided
-
-
-
\ No newline at end of file
diff --git a/miaosha-v2/miaosha-service/pom.xml b/miaosha-v2/miaosha-service/pom.xml
index 7989fa2..4867aab 100644
--- a/miaosha-v2/miaosha-service/pom.xml
+++ b/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">
- miaosha-v2
com.geekq.v2
+ miaosha-v2
${revision}
4.0.0
miaosha-service
${revision}
-
-
-
- src/main/java
-
- **/*.properties
- **/*.xml
-
- false
-
-
- src/main/resources
-
- **/*.properties
- **/*.xml
- **/*.ini
-
- false
-
-
-
com.geekq.v2
diff --git a/miaosha-v2/pom.xml b/miaosha-v2/pom.xml
index d083500..344db19 100644
--- a/miaosha-v2/pom.xml
+++ b/miaosha-v2/pom.xml
@@ -27,7 +27,7 @@
1.0.0
3.4.6
0.1
- 4.0.1
+ 5.1.0
0.2.0
@@ -70,7 +70,6 @@
org.mybatis.spring.boot
mybatis-spring-boot-starter
- ${org.mybatis.version}
mysql
@@ -79,35 +78,27 @@
com.alibaba
druid
- ${com.alibaba.druid}
org.springframework.boot
spring-boot-starter-thymeleaf
-
redis.clients
jedis
-
org.springframework.boot
spring-boot-starter-validation
-
-
net.sourceforge.nekohtml
nekohtml
-
org.springframework.boot
spring-boot-starter-amqp
-
-
commons-codec
commons-codec
@@ -119,69 +110,26 @@
joda-time
joda-time
- 2.3
-
com.alibaba
fastjson
- 1.2.38
com.alibaba.boot
dubbo-spring-boot-starter
- ${dubbo.starter.version}
org.apache.curator
curator-framework
- ${curator-framework.version}
com.github.sgroschupf
zkclient
- ${com.zk.client}
com.geekq.api
miaosha-order-api
- ${revision}
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
-
- src/main/java
-
- **/*.properties
- **/*.xml
-
- true
-
-
- src/main/resources
-
-
-
-
-
- false
-
-
- src/main/resources
- true
-
-
- application.properties
-
-
-
-
diff --git a/pom.xml b/pom.xml
index 194fa42..7d63f63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,11 @@
1.33
0.10.2
2.6.1
+ 0.2.1.RELEASE
+ 2.2.0
+ 3.4.6
+ 0.1
+ 5.1.0
UTF-8
1.8
1.8
@@ -42,6 +47,16 @@
pom
import
+
+ org.mybatis.spring.boot
+ mybatis-spring-boot-starter
+ ${mybatis.starter.version}
+
+
+ com.alibaba.boot
+ dubbo-spring-boot-starter
+ ${dubbo.starter.version}
+
org.reflections
reflections
@@ -87,11 +102,51 @@
fastjson
1.2.78
+
+ joda-time
+ joda-time
+ 2.10.13
+
com.alibaba
druid
1.2.8
+
+ com.alibaba
+ dubbo
+ 2.6.0
+
+
+ org.apache.curator
+ curator-framework
+ ${curator-framework.version}
+
+
+ org.apache.curator
+ curator-recipes
+ ${curator-framework.version}
+
+
+ org.apache.zookeeper
+ zookeeper
+ ${zookeeper.version}
+
+
+ com.github.sgroschupf
+ zkclient
+ ${com.zk.client}
+
+
+ org.mybatis
+ mybatis
+ 3.4.6
+
+
+ org.mybatis
+ mybatis-spring
+ 1.2.3
+