From c700c1a307efea0e98eb48a444ec34f54ae088d4 Mon Sep 17 00:00:00 2001
From: qiurunze <qiurunze@youxin.com>
Date: Wed, 5 Dec 2018 11:48:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9=20token=20?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ..._tomcat_embed_tomcat_embed_core_8_5_23.xml |  13 -
 ...at_embed_tomcat_embed_websocket_8_5_23.xml |  13 -
 ...e_tomcat_tomcat_annotations_api_8_5_23.xml |  13 -
 ...ring_boot_starter_tomcat_1_5_8_RELEASE.xml |  13 -
 .idea/misc.xml                                |   2 +-
 .idea/workspace.xml                           | 929 +++++++++---------
 README.md                                     |   4 +-
 miaosha.iml                                   |  32 +-
 pom.xml                                       |  26 +-
 .../miaosha/config/UserArgumentResolver.java  |  12 -
 .../miaosha/controller/MiaoshaController.java |   6 +-
 .../redis/RedissonAutoConfiguration.java      | 152 +--
 .../redis/RedissonDistributedLocker.java      |  78 +-
 .../miaosha/redis/RedissonProperties.java     | 196 ++--
 .../geekq/miaosha/redis/RedissonService.java  | 292 +++---
 .../miaosha/service/MiaoShaUserService.java   |  22 +-
 .../miaosha/timeTask/OrderCloseTask.java      | 222 ++---
 src/main/resources/application.properties     |  14 +-
 target/classes/application.properties         |  14 +-
 .../com/geekq/miaosha/DemoTask$1.class        | Bin 871 -> 874 bytes
 .../com/geekq/miaosha/DemoTask$2.class        | Bin 871 -> 874 bytes
 .../classes/com/geekq/miaosha/DemoTask.class  | Bin 2051 -> 2054 bytes
 .../geekq/miaosha/GeekQMainApplication.class  | Bin 836 -> 837 bytes
 .../com/geekq/miaosha/Md5Utils/MD5Utils.class | Bin 1657 -> 1657 bytes
 .../miaosha/access/AccessInterceptor.class    | Bin 5501 -> 5552 bytes
 .../geekq/miaosha/common/ResponseCode.class   | Bin 1519 -> 1520 bytes
 .../miaosha/config/UserArgumentResolver.class | Bin 2656 -> 2710 bytes
 .../miaosha/controller/DemoController.class   | Bin 3405 -> 3406 bytes
 .../miaosha/controller/GoodsController.class  | Bin 6833 -> 6828 bytes
 .../miaosha/controller/LoginController.class  | Bin 3895 -> 3896 bytes
 .../controller/MiaoshaController.class        | Bin 8351 -> 8413 bytes
 .../com/geekq/miaosha/rabbitmq/MQConfig.class | Bin 4277 -> 4277 bytes
 .../geekq/miaosha/rabbitmq/MQReceiver.class   | Bin 2940 -> 2942 bytes
 .../com/geekq/miaosha/rabbitmq/MQSender.class | Bin 1524 -> 1484 bytes
 .../miaosha/redis/RedisPoolFactory.class      | Bin 1464 -> 1460 bytes
 .../geekq/miaosha/redis/RedisService.class    | Bin 9494 -> 9405 bytes
 .../miaosha/service/MiaoShaUserService.class  | Bin 5180 -> 5182 bytes
 .../miaosha/service/MiaoshaService.class      | Bin 6853 -> 6855 bytes
 .../geekq/miaosha/service/OrderService.class  | Bin 4648 -> 4687 bytes
 .../miaosha/validator/IsMobileValidator.class | Bin 1592 -> 1689 bytes
 40 files changed, 999 insertions(+), 1054 deletions(-)
 delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_23.xml
 delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_23.xml
 delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_23.xml
 delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_5_8_RELEASE.xml

diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_23.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_23.xml
deleted file mode 100644
index 99e8c9e..0000000
--- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_23.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.23">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.23/tomcat-embed-core-8.5.23.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.23/tomcat-embed-core-8.5.23-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.23/tomcat-embed-core-8.5.23-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_23.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_23.xml
deleted file mode 100644
index 6a989bb..0000000
--- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_23.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.23/tomcat-embed-websocket-8.5.23.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.23/tomcat-embed-websocket-8.5.23-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.23/tomcat-embed-websocket-8.5.23-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_23.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_23.xml
deleted file mode 100644
index 4aba27a..0000000
--- a/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_23.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.tomcat:tomcat-annotations-api:8.5.23">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-annotations-api/8.5.23/tomcat-annotations-api-8.5.23.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-annotations-api/8.5.23/tomcat-annotations-api-8.5.23-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/tomcat-annotations-api/8.5.23/tomcat-annotations-api-8.5.23-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_5_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_5_8_RELEASE.xml
deleted file mode 100644
index d4fd605..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_5_8_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.5.8.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/1.5.8.RELEASE/spring-boot-starter-tomcat-1.5.8.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/1.5.8.RELEASE/spring-boot-starter-tomcat-1.5.8.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/1.5.8.RELEASE/spring-boot-starter-tomcat-1.5.8.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d30d09e..40d5ffa 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,7 +7,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a571675..999326f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,34 +2,46 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="59bd24de-7908-4982-927f-6d236db7e416" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/common/Constanst.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/DistributedLocker.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissLockUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/utils/DateTimeUtils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_23.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_23.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_23.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_5_8_RELEASE.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/miaosha.iml" beforeDir="false" afterPath="$PROJECT_DIR$/miaosha.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/GeekQMainApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/GeekQMainApplication.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/dao/OrderDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/dao/OrderDao.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedisService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedisService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/OrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/OrderService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application-dev.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-dev.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/DemoTask$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/DemoTask$1.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/DemoTask$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/DemoTask$2.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/DemoTask.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/DemoTask.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/GeekQMainApplication.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/GeekQMainApplication.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/dao/OrderDao.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/dao/OrderDao.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/Md5Utils/MD5Utils.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/Md5Utils/MD5Utils.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/access/AccessInterceptor.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/access/AccessInterceptor.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/common/ResponseCode.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/common/ResponseCode.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/config/UserArgumentResolver.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/config/UserArgumentResolver.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/controller/DemoController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/controller/DemoController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/controller/GoodsController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/controller/GoodsController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/controller/LoginController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/controller/LoginController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/controller/MiaoshaController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/controller/MiaoshaController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/rabbitmq/MQConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/rabbitmq/MQConfig.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/rabbitmq/MQReceiver.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/rabbitmq/MQReceiver.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/rabbitmq/MQSender.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/rabbitmq/MQSender.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/redis/RedisPoolFactory.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/redis/RedisPoolFactory.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/redis/RedisService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/redis/RedisService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/service/MiaoShaUserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/service/MiaoShaUserService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/service/MiaoshaService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/service/MiaoshaService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/service/OrderService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/service/OrderService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/miaosha.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/miaosha.jar.original" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/validator/IsMobileValidator.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/validator/IsMobileValidator.class" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/springcloud-server/target/" />
@@ -192,35 +204,141 @@
         </counts>
       </usages-collector>
     </session>
+    <session id="341167218">
+      <usages-collector id="statistics.lifecycle.project">
+        <counts>
+          <entry key="project.closed" value="7" />
+          <entry key="project.open.time.1" value="4" />
+          <entry key="project.open.time.2" value="3" />
+          <entry key="project.open.time.26" value="1" />
+          <entry key="project.open.time.3" value="1" />
+          <entry key="project.opened" value="9" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="java" value="17" />
+          <entry key="md" value="9" />
+          <entry key="properties" value="23" />
+          <entry key="xml" value="29" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="17" />
+          <entry key="Markdown" value="9" />
+          <entry key="Properties" value="23" />
+          <entry key="XML" value="29" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.open">
+        <counts>
+          <entry key="class" value="2" />
+          <entry key="java" value="36" />
+          <entry key="md" value="1" />
+          <entry key="properties" value="8" />
+          <entry key="xml" value="3" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.open">
+        <counts>
+          <entry key="CLASS" value="2" />
+          <entry key="JAVA" value="36" />
+          <entry key="Markdown" value="1" />
+          <entry key="Properties" value="8" />
+          <entry key="XML" value="3" />
+        </counts>
+      </usages-collector>
+    </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.properties">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="56" column="24" selection-start-line="56" selection-start-column="24" selection-end-line="56" selection-end-column="24" />
+            <state relative-caret-position="1121">
+              <caret line="59" column="32" selection-start-line="59" selection-start-column="32" selection-end-line="59" selection-end-column="32" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/config/WebConfig.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="22">
-              <caret line="56" column="15" lean-forward="true" selection-start-line="56" selection-start-column="15" selection-end-line="56" selection-end-column="15" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="95">
+              <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/README.md">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="498">
-              <caret line="151" lean-forward="true" selection-start-line="151" selection-end-line="151" />
+            <state relative-caret-position="456">
+              <caret line="165" column="12" selection-start-line="165" selection-start-column="12" selection-end-line="165" selection-end-column="12" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/LoginController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="138">
+              <caret line="55" column="17" lean-forward="true" selection-start-line="55" selection-start-column="17" selection-end-line="55" selection-end-column="17" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="613">
+              <caret line="82" column="33" selection-start-line="82" selection-start-column="33" selection-end-line="82" selection-end-column="33" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="108" column="20" selection-start-line="108" selection-start-column="20" selection-end-line="108" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedisService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="456">
+              <caret line="111" column="23" selection-start-line="111" selection-start-column="23" selection-end-line="111" selection-end-column="23" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.23/tomcat-embed-core-8.5.23.jar!/javax/servlet/http/HttpServletResponse.class">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="300">
+              <caret line="54" column="9" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="558">
+              <caret line="40" column="1" lean-forward="true" selection-start-line="40" selection-start-column="1" selection-end-line="40" selection-end-column="1" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/UserController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="114">
+              <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
             </state>
           </provider>
         </entry>
@@ -237,7 +355,6 @@
   <component name="FindInProjectRecents">
     <findStrings>
       <find>m</find>
-      <find>getByToken</find>
       <find>商品已经秒杀完毕</find>
       <find>refreshVerifyCode</find>
       <find>path</find>
@@ -257,6 +374,10 @@
       <find>joda</find>
       <find>expire</find>
       <find>redssionProperties</find>
+      <find>redisson</find>
+      <find>getBy</find>
+      <find>addC</find>
+      <find>getByToken</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -266,10 +387,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mybatis-config.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/mybatis/mapper/userMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/mybatis/mapper/mybatis-config.xml" />
         <option value="$PROJECT_DIR$/src/main/resources/mybatis/userMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/ＧeekQMainApplication.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mybatis/UserMapper.xml" />
@@ -295,7 +412,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/dao/MiaoShaUserDao.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application-local.properties" />
         <option value="$PROJECT_DIR$/src/main/resources/application-prod.properties" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/resources/application-test.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/GeekQMainApplication.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/mmall/util/DateTimeUtils.java" />
@@ -304,19 +420,24 @@
         <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/OrderService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/common/Constanst.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedisService.java" />
-        <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application-dev.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/redissonService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonConfig.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/DistributedLocker.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissLockUtil.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedssionProperties.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java" />
         <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java" />
       </list>
     </option>
   </component>
@@ -354,10 +475,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="184" />
-    <option name="y" value="118" />
-    <option name="width" value="1440" />
-    <option name="height" value="900" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1936" />
+    <option name="height" value="1056" />
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
@@ -589,8 +710,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -622,15 +742,6 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="miaosha" type="b2602c69:ProjectViewProjectNode" />
-              <item name="miaosha" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="miaosha" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -639,7 +750,15 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="miaosha" type="462c0819:PsiDirectoryNode" />
+              <item name="access" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="miaosha" type="b2602c69:ProjectViewProjectNode" />
+              <item name="miaosha" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="miaosha" type="462c0819:PsiDirectoryNode" />
               <item name="common" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -649,7 +768,24 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="miaosha" type="462c0819:PsiDirectoryNode" />
+              <item name="config" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="miaosha" type="b2602c69:ProjectViewProjectNode" />
+              <item name="miaosha" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="miaosha" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="miaosha" type="b2602c69:ProjectViewProjectNode" />
+              <item name="miaosha" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="miaosha" type="462c0819:PsiDirectoryNode" />
               <item name="redis" type="462c0819:PsiDirectoryNode" />
             </path>
@@ -659,19 +795,8 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="miaosha" type="462c0819:PsiDirectoryNode" />
-              <item name="timeTask" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="miaosha" type="b2602c69:ProjectViewProjectNode" />
-              <item name="miaosha" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="miaosha" type="462c0819:PsiDirectoryNode" />
-              <item name="utils" type="462c0819:PsiDirectoryNode" />
+              <item name="validator" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="miaosha" type="b2602c69:ProjectViewProjectNode" />
@@ -680,11 +805,15 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="miaosha" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -696,8 +825,8 @@
     <property name="RequestMappingsPanelWidth2" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541903737533" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../mmallv4.0" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1543977853627" />
+    <property name="last_opened_file_path" value="D:/BaiduNetdiskDownload/miaosha" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="project.structure.last.edited" value="Modules" />
@@ -887,11 +1016,20 @@
       <workItem from="1540606982230" duration="4826000" />
       <workItem from="1540650366969" duration="4401000" />
       <workItem from="1541773616591" duration="21851000" />
+      <workItem from="1542888032858" duration="451000" />
+      <workItem from="1542889820227" duration="3000" />
+      <workItem from="1542941102465" duration="4189000" />
+      <workItem from="1542960547833" duration="222000" />
+      <workItem from="1543025807527" duration="939000" />
+      <workItem from="1543027175397" duration="617000" />
+      <workItem from="1543920354012" duration="1229000" />
+      <workItem from="1543975090090" duration="2397000" />
+      <workItem from="1543980459100" duration="1129000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="223226000" />
+    <option name="totallyTimeSpent" value="234402000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -903,9 +1041,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-1" y="29" width="1922" height="1025" extended-state="6" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23375931" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24813631" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -915,15 +1054,15 @@
       <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" sideWeight="0.6996805" weight="0.26815644" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.89243877" weight="0.35642457" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.7838126" visible="true" weight="0.36536312" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.89243877" weight="0.20629922" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.7838126" weight="0.45405406" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32960895" />
       <window_info anchor="bottom" id="Spring" order="7" />
-      <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49733758" weight="0.32960895" />
+      <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49733758" visible="true" weight="0.1881081" />
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5026624" side_tool="true" weight="0.32960895" />
-      <window_info anchor="bottom" id="Messages" order="10" sideWeight="0.4978701" weight="0.37988827" />
+      <window_info anchor="bottom" id="Messages" order="10" sideWeight="0.4978701" weight="0.37945947" />
       <window_info anchor="bottom" id="Java Enterprise" order="11" />
       <window_info anchor="bottom" id="Database Changes" order="12" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="13" show_stripe_button="false" />
@@ -1030,12 +1169,6 @@
           <properties />
           <option name="timeStamp" value="21" />
         </line-breakpoint>
-        <line-breakpoint type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java</url>
-          <line>31</line>
-          <properties />
-          <option name="timeStamp" value="24" />
-        </line-breakpoint>
         <line-breakpoint type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java</url>
           <line>94</line>
@@ -1079,11 +1212,17 @@
           <option name="timeStamp" value="37" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java</url>
-          <line>81</line>
+          <url>file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java</url>
+          <line>148</line>
           <properties />
           <option name="timeStamp" value="38" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java</url>
+          <line>31</line>
+          <properties />
+          <option name="timeStamp" value="39" />
+        </line-breakpoint>
       </breakpoints>
       <breakpoints-dialog>
         <breakpoints-dialog />
@@ -1129,182 +1268,16 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/target/classes/application-test.properties" />
-    <entry file="file://$PROJECT_DIR$/src/main/resources/config/application-test.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1562">
-          <caret line="71" column="42" selection-start-line="71" selection-start-column="23" selection-end-line="71" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/target/classes/application.properties">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/target/classes/application-local.properties" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="26" column="24" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/dao/DruidConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="15" column="50" selection-start-line="15" selection-start-column="40" selection-end-line="15" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/target/classes/application-dev.properties">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gitignore" />
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.5.8.RELEASE/spring-boot-autoconfigure-1.5.8.RELEASE.jar!/org/springframework/boot/autoconfigure/amqp/RabbitProperties.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2750">
-          <caret line="159" column="16" selection-start-line="159" selection-start-column="16" selection-end-line="159" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1584">
-          <caret line="72" column="1" selection-start-line="72" selection-start-column="1" selection-end-line="72" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/Test.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1210">
-          <caret line="56" column="47" selection-start-line="56" selection-start-column="47" selection-end-line="56" selection-end-column="47" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/MiaoshaService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/Userkey.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="44">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-test.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="723">
-          <caret line="72" column="14" selection-start-line="72" selection-start-column="14" selection-end-line="72" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/GeekQMainApplication.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/dao/GoodsDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/dao/MiaoShaUserDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="11" column="18" selection-start-line="11" selection-start-column="18" selection-end-line="11" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/domain/OrderInfo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/OrderKey.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="9" column="66" lean-forward="true" selection-start-line="9" selection-start-column="66" selection-end-line="9" selection-end-column="66" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="5" column="11" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/BasePrefix.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar:///usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar!/java/lang/Enum.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="21" />
-          <folding>
-            <element signature="e#542#543#0" expanded="true" />
-            <element signature="e#577#578#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/mmall/util/DateTimeUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret lean-forward="true" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
+    <entry file="jar:///usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar!/java/lang/Enum.class" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/mmall/util/DateTimeUtils.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/dao/OrderDao.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="212">
           <caret line="25" column="77" selection-start-line="25" selection-start-column="77" selection-end-line="25" selection-end-column="77" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.3/joda-time-2.3.jar!/org/joda/time/DateTime.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="90" column="28" selection-start-line="90" selection-start-column="28" selection-end-line="90" selection-end-column="28" />
-          <folding>
-            <element signature="e#1952#1953#0" expanded="true" />
-            <element signature="e#1997#1998#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/joda-time/joda-time/2.3/joda-time-2.3.jar!/org/joda/time/DateTime.class" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/utils/DateTimeUtils.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="260">
@@ -1330,21 +1303,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="66">
           <caret line="3" column="25" selection-start-line="3" selection-start-column="25" selection-end-line="3" selection-end-column="25" />
-          <folding>
-            <element signature="e#161#162#0" expanded="true" />
-            <element signature="e#199#200#0" expanded="true" />
-            <element signature="e#184#185#0" expanded="true" />
-            <element signature="e#219#220#0" expanded="true" />
-            <element signature="e#263#264#0" expanded="true" />
-            <element signature="e#303#304#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="130" selection-start-line="130" selection-end-line="130" />
         </state>
       </provider>
     </entry>
@@ -1355,88 +1313,12 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="498">
-          <caret line="73" column="26" selection-start-line="73" selection-start-column="26" selection-end-line="73" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="188">
-          <caret line="57" column="24" lean-forward="true" selection-start-line="57" selection-start-column="24" selection-end-line="57" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="6" column="40" selection-start-line="6" selection-start-column="40" selection-end-line="6" selection-end-column="40" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#800#801#0" expanded="true" />
-            <element signature="e#830#831#0" expanded="true" />
-            <element signature="e#873#874#0" expanded="true" />
-            <element signature="e#911#912#0" expanded="true" />
-            <element signature="e#958#959#0" expanded="true" />
-            <element signature="e#1004#1005#0" expanded="true" />
-            <element signature="e#1197#1198#0" expanded="true" />
-            <element signature="e#1244#1245#0" expanded="true" />
-            <element signature="e#1439#1440#0" expanded="true" />
-            <element signature="e#1479#1480#0" expanded="true" />
-            <element signature="e#1651#1652#0" expanded="true" />
-            <element signature="e#1684#1685#0" expanded="true" />
-            <element signature="e#1736#1737#0" expanded="true" />
-            <element signature="e#1780#1781#0" expanded="true" />
-            <element signature="e#1815#1816#0" expanded="true" />
-            <element signature="e#1846#1847#0" expanded="true" />
-            <element signature="e#1894#1895#0" expanded="true" />
-            <element signature="e#1934#1935#0" expanded="true" />
-            <element signature="e#1968#1969#0" expanded="true" />
-            <element signature="e#1998#1999#0" expanded="true" />
-            <element signature="e#2044#2045#0" expanded="true" />
-            <element signature="e#2082#2083#0" expanded="true" />
-            <element signature="e#2124#2125#0" expanded="true" />
-            <element signature="e#2165#2166#0" expanded="true" />
-            <element signature="e#2230#2231#0" expanded="true" />
-            <element signature="e#2290#2291#0" expanded="true" />
-            <element signature="e#2339#2340#0" expanded="true" />
-            <element signature="e#2387#2388#0" expanded="true" />
-            <element signature="e#2572#2573#0" expanded="true" />
-            <element signature="e#2603#2604#0" expanded="true" />
-            <element signature="e#2648#2649#0" expanded="true" />
-            <element signature="e#2688#2689#0" expanded="true" />
-            <element signature="e#2756#2757#0" expanded="true" />
-            <element signature="e#2814#2815#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/redisson/redisson/2.14.0/redisson-2.14.0.jar!/org/redisson/api/RedissonClient.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedisService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="11" column="8" lean-forward="true" selection-start-line="11" selection-start-column="8" selection-end-line="43" selection-end-column="20" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonManager.java" />
+    <entry file="jar://$MAVEN_REPOSITORY$/org/redisson/redisson/2.14.0/redisson-2.14.0.jar!/org/redisson/api/RedissonClient.class" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedisConfig.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="110">
           <caret line="5" column="10" lean-forward="true" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1447,26 +1329,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="474">
-          <caret line="74" column="30" lean-forward="true" selection-start-line="74" selection-start-column="30" selection-end-line="74" selection-end-column="30" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="1" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonConfig.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="342">
@@ -1474,25 +1337,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissLockUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
-          <folding>
-            <element signature="e#1180#1181#0" expanded="true" />
-            <element signature="e#1215#1216#0" expanded="true" />
-            <element signature="e#1262#1263#0" expanded="true" />
-            <element signature="e#1302#1303#0" expanded="true" />
-            <element signature="e#1351#1352#0" expanded="true" />
-            <element signature="e#1393#1394#0" expanded="true" />
-            <element signature="e#1538#1539#0" expanded="true" />
-            <element signature="e#1587#1588#0" expanded="true" />
-            <element signature="e#1764#1765#0" expanded="true" />
-            <element signature="e#1819#1820#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/DistributedLocker.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="286">
@@ -1500,72 +1344,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="9" column="25" selection-start-line="9" selection-start-column="25" selection-end-line="18" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#841#842#0" expanded="true" />
-            <element signature="e#893#894#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="57">
-          <caret line="5" column="31" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="31" />
-          <folding>
-            <element signature="e#494#495#0" expanded="true" />
-            <element signature="e#524#525#0" expanded="true" />
-            <element signature="e#567#568#0" expanded="true" />
-            <element signature="e#605#606#0" expanded="true" />
-            <element signature="e#652#653#0" expanded="true" />
-            <element signature="e#698#699#0" expanded="true" />
-            <element signature="e#891#892#0" expanded="true" />
-            <element signature="e#938#939#0" expanded="true" />
-            <element signature="e#1133#1134#0" expanded="true" />
-            <element signature="e#1173#1174#0" expanded="true" />
-            <element signature="e#1345#1346#0" expanded="true" />
-            <element signature="e#1378#1379#0" expanded="true" />
-            <element signature="e#1430#1431#0" expanded="true" />
-            <element signature="e#1474#1475#0" expanded="true" />
-            <element signature="e#1509#1510#0" expanded="true" />
-            <element signature="e#1540#1541#0" expanded="true" />
-            <element signature="e#1588#1589#0" expanded="true" />
-            <element signature="e#1628#1629#0" expanded="true" />
-            <element signature="e#1662#1663#0" expanded="true" />
-            <element signature="e#1692#1693#0" expanded="true" />
-            <element signature="e#1738#1739#0" expanded="true" />
-            <element signature="e#1776#1777#0" expanded="true" />
-            <element signature="e#1818#1819#0" expanded="true" />
-            <element signature="e#1859#1860#0" expanded="true" />
-            <element signature="e#1924#1925#0" expanded="true" />
-            <element signature="e#1984#1985#0" expanded="true" />
-            <element signature="e#2033#2034#0" expanded="true" />
-            <element signature="e#2081#2082#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
-          <caret line="56" column="24" selection-start-line="56" selection-start-column="24" selection-end-line="56" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="395">
-          <caret line="75" selection-start-line="75" selection-end-line="75" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/OrderService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
@@ -1573,23 +1351,244 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.12.RELEASE/spring-web-4.3.12.RELEASE.jar!/org/springframework/web/bind/annotation/RequestMapping.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="56" column="15" lean-forward="true" selection-start-line="56" selection-start-column="15" selection-end-line="56" selection-end-column="15" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="190">
+          <caret line="18" column="18" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/DemoController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="95">
+          <caret line="18" column="11" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/GoodsController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="627">
+          <caret line="74" column="17" selection-start-line="73" selection-start-column="3" selection-end-line="74" selection-end-column="17" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="text-editor">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="FIRST">
+          <first_editor relative-caret-position="520">
+            <caret line="79" column="25" lean-forward="true" selection-start-line="79" selection-start-column="25" selection-end-line="79" selection-end-column="25" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+      <provider editor-type-id="text-editor">
         <state relative-caret-position="498">
           <caret line="151" lean-forward="true" selection-start-line="151" selection-end-line="151" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/KeyPrefix.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="38">
+          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/BasePrefix.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="475">
+          <caret line="29" column="46" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="76">
+          <caret line="5" column="11" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/AccessKey.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="76">
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/AccessLimit.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="10" column="18" selection-start-line="10" selection-start-column="18" selection-end-line="10" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/OrderController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/UserContext.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="76">
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="266">
+          <caret line="17" column="15" lean-forward="true" selection-start-column="2" selection-end-line="38" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="241">
+          <caret line="65" column="32" selection-end-line="76" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="266">
+          <caret line="16" lean-forward="true" selection-end-line="98" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="499">
+          <caret line="100" column="9" lean-forward="true" selection-end-line="114" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissLockUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="19" column="32" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="360">
+          <caret line="68" column="13" lean-forward="true" selection-start-column="2" selection-end-line="145" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/config/application-test.properties">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-980">
+          <caret line="146" selection-start-line="141" selection-start-column="6" selection-end-line="146" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/GeekQMainApplication.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="95">
+          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1064">
+          <caret line="56" column="24" selection-start-line="56" selection-start-column="24" selection-end-line="56" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.properties">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-test.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="950">
+          <caret line="50" column="23" selection-start-line="50" selection-start-column="23" selection-end-line="50" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1121">
+          <caret line="59" column="32" selection-start-line="59" selection-start-column="32" selection-end-line="59" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/UserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/LoginController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="55" column="17" lean-forward="true" selection-start-line="55" selection-start-column="17" selection-end-line="55" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.23/tomcat-embed-core-8.5.23.jar!/javax/servlet/http/HttpServletResponse.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="54" column="9" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedisService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="456">
+          <caret line="111" column="23" selection-start-line="111" selection-start-column="23" selection-end-line="111" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="613">
+          <caret line="82" column="33" selection-start-line="82" selection-start-column="33" selection-end-line="82" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="108" column="20" selection-start-line="108" selection-start-column="20" selection-end-line="108" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="558">
+          <caret line="40" column="1" lean-forward="true" selection-start-line="40" selection-start-column="1" selection-end-line="40" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/config/WebConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="95">
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="456">
+          <caret line="165" column="12" selection-start-line="165" selection-start-column="12" selection-end-line="165" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="ideajad">
     <property name="annotate" value="false" />
diff --git a/README.md b/README.md
index c1b0d9c..8a03647 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@
 监控工具：１.nginx_status并发统计,Ngxtop缓存统计
 ### nginx负载均衡
 
-![整体流程](http://i2.bvimg.com/601558/23f54a389b2b23e8.png)
+![整体流程](https://raw.githubusercontent.com/qiurunze123/imageall/master/miaosha2.png)
 
 
 ### <font color=#0099ff size=3 >8.服务降级--服务熔断(过载保护)</font><br>
@@ -97,7 +97,7 @@ redis的数量不是库存,他的作用仅仅只是为了阻挡多余的请求
 
 ### <font color=#0099ff size=3 >15.为什么threadlocal存储user对象，原理？？</font><br>
 
-![整体流程](http://i2.bvimg.com/601558/3293e36cc2c7e303.png)
+![整体流程](https://raw.githubusercontent.com/qiurunze123/imageall/master/miaosha1.png)
 
 1.并发编程中重要的问题就是数据共享，当你在一个线程中改变任意属性时，所有的线程都会因此受到影响，同时会看到第一个线程修改后的值<br>
 有时我们希望如此，比如：多个线程增大或减小同一个计数器变量<br>
diff --git a/miaosha.iml b/miaosha.iml
index e612dd1..615e47e 100644
--- a/miaosha.iml
+++ b/miaosha.iml
@@ -40,23 +40,25 @@
     <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.25" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.12.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.5.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.23" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:8.5.23" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.3.5.Final" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.1.Final" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.10" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.10" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.12.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.12.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.12.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.12.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.12.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.5.8.RELEASE" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.23" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat:tomcat-annotations-api:8.5.23" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.23" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:2.1.5.RELEASE" level="project" />
@@ -81,7 +83,6 @@
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:1.5.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.23" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:1.5.8.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.12.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:1.7.4.RELEASE" level="project" />
@@ -93,25 +94,6 @@
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:1.7.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.12.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.redisson:redisson:2.14.0" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.30.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.30.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.30.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.30.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.30.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.30.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.30.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.30.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.cache:cache-api:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-stream:2.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:2.0.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex.rxjava2:rxjava:2.1.13" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.10" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.10" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.8.17" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-bean:3.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-core:3.7.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.2" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index af795bc..44878d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,10 +46,26 @@
             </exclusions>
 
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <!--打包的时候可以不用包进去，别的设施会提供。事实上该依赖理论上可以参与编译，测试，运行等周期。
+                相当于compile，但是打包阶段做了exclude操作-->
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -123,11 +139,11 @@
             <version>2.3</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.redisson/redisson -->
-        <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson</artifactId>
-            <version>2.14.0</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.redisson</groupId>-->
+            <!--<artifactId>redisson</artifactId>-->
+            <!--<version>2.14.0</version>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java b/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java
index 0e192fb..5c9517e 100644
--- a/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java
+++ b/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java
@@ -11,9 +11,6 @@ import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-
 @Service
 public class UserArgumentResolver implements HandlerMethodArgumentResolver {
 
@@ -41,13 +38,4 @@ public class UserArgumentResolver implements HandlerMethodArgumentResolver {
         return UserContext.getUser();
     }
 
-    private String getCookieValue(HttpServletRequest request, String cookiName) {
-        Cookie[]  cookies = request.getCookies();
-        for(Cookie cookie : cookies) {
-            if(cookie.getName().equals(cookiName)) {
-                return cookie.getValue();
-            }
-        }
-        return null;
-    }
 }
diff --git a/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java b/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java
index 9b8db4a..24239b4 100644
--- a/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java
+++ b/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java
@@ -93,7 +93,7 @@ public class MiaoshaController implements InitializingBean {
 			return Result.error(CodeMsg.MIAO_SHA_OVER);
 		}
 			//预见库存
-			long stock = redisService.decr(GoodsKey.getMiaoshaGoodsStock,""+goodsId) ;
+			Long stock = redisService.decr(GoodsKey.getMiaoshaGoodsStock,""+goodsId) ;
 			if(stock <0){
 				localOverMap.put(goodsId, true);
 				return Result.error(CodeMsg.MIAO_SHA_OVER);
@@ -162,6 +162,10 @@ public class MiaoshaController implements InitializingBean {
 		}
 	}
 
+	/**
+	 * 系统初始化
+	 * @throws Exception
+	 */
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		List<GoodsVo>  goodsList=  goodsService.listGoodsVo();
diff --git a/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java b/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java
index b26fb69..b025159 100644
--- a/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java
+++ b/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java
@@ -1,76 +1,76 @@
-package com.geekq.miaosha.redis;
-
-import org.apache.commons.lang3.StringUtils;
-import org.redisson.Redisson;
-import org.redisson.api.RedissonClient;
-import org.redisson.config.Config;
-import org.redisson.config.SentinelServersConfig;
-import org.redisson.config.SingleServerConfig;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConditionalOnClass(Config.class)
-@EnableConfigurationProperties(RedissonProperties.class)
-public class RedissonAutoConfiguration {
-
-    @Autowired
-    private RedissonProperties redssionProperties;
-
-    /**
-     * 哨兵模式自动装配
-     * @return
-     */
-    @Bean
-    @ConditionalOnProperty(name="redisson.master-name")
-    RedissonClient redissonSentinel() {
-        Config config = new Config();
-        SentinelServersConfig serverConfig = config.useSentinelServers().addSentinelAddress(redssionProperties.getSentinelAddresses())
-                .setMasterName(redssionProperties.getMasterName())
-                .setTimeout(redssionProperties.getTimeout())
-                .setMasterConnectionPoolSize(redssionProperties.getMasterConnectionPoolSize())
-                .setSlaveConnectionPoolSize(redssionProperties.getSlaveConnectionPoolSize());
-
-        if(StringUtils.isNotBlank(redssionProperties.getPassword())) {
-            serverConfig.setPassword(redssionProperties.getPassword());
-        }
-        return Redisson.create(config);
-    }
-
-    /**
-     * 单机模式自动装配
-     * @return
-     */
-    @Bean
-    @ConditionalOnProperty(name="redisson.address")
-    RedissonClient redissonSingle() {
-        Config config = new Config();
-        SingleServerConfig serverConfig = config.useSingleServer()
-                .setAddress(redssionProperties.getAddress())
-                .setTimeout(redssionProperties.getTimeout())
-                .setConnectionPoolSize(redssionProperties.getConnectionPoolSize())
-                .setConnectionMinimumIdleSize(redssionProperties.getConnectionMinimumIdleSize());
-
-        if(StringUtils.isNotBlank(redssionProperties.getPassword())) {
-            serverConfig.setPassword(redssionProperties.getPassword());
-        }
-
-        return Redisson.create(config);
-    }
-
-    /**
-     * 装配locker类，并将实例注入到RedissLockUtil中
-     * @return
-     */
-    @Bean
-    DistributedLocker distributedLocker(RedissonClient redissonSingle) {
-        RedissonDistributedLocker locker = new RedissonDistributedLocker();
-        locker.setRedissonClient(redissonSingle);
-        RedissLockUtil.setLocker(locker);
-        return locker;
-    }
-}
+//package com.geekq.miaosha.redis;
+//
+//import org.apache.commons.lang3.StringUtils;
+//import org.redisson.Redisson;
+//import org.redisson.api.RedissonClient;
+//import org.redisson.config.Config;
+//import org.redisson.config.SentinelServersConfig;
+//import org.redisson.config.SingleServerConfig;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+//import org.springframework.boot.context.properties.EnableConfigurationProperties;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+//@Configuration
+//@ConditionalOnClass(Config.class)
+//@EnableConfigurationProperties(RedissonProperties.class)
+//public class RedissonAutoConfiguration {
+//
+//    @Autowired
+//    private RedissonProperties redssionProperties;
+//
+//    /**
+//     * 哨兵模式自动装配
+//     * @return
+//     */
+//    @Bean
+//    @ConditionalOnProperty(name="redisson.master-name")
+//    RedissonClient redissonSentinel() {
+//        Config config = new Config();
+//        SentinelServersConfig serverConfig = config.useSentinelServers().addSentinelAddress(redssionProperties.getSentinelAddresses())
+//                .setMasterName(redssionProperties.getMasterName())
+//                .setTimeout(redssionProperties.getTimeout())
+//                .setMasterConnectionPoolSize(redssionProperties.getMasterConnectionPoolSize())
+//                .setSlaveConnectionPoolSize(redssionProperties.getSlaveConnectionPoolSize());
+//
+//        if(StringUtils.isNotBlank(redssionProperties.getPassword())) {
+//            serverConfig.setPassword(redssionProperties.getPassword());
+//        }
+//        return Redisson.create(config);
+//    }
+//
+//    /**
+//     * 单机模式自动装配
+//     * @return
+//     */
+//    @Bean
+//    @ConditionalOnProperty(name="redisson.address")
+//    RedissonClient redissonSingle() {
+//        Config config = new Config();
+//        SingleServerConfig serverConfig = config.useSingleServer()
+//                .setAddress(redssionProperties.getAddress())
+//                .setTimeout(redssionProperties.getTimeout())
+//                .setConnectionPoolSize(redssionProperties.getConnectionPoolSize())
+//                .setConnectionMinimumIdleSize(redssionProperties.getConnectionMinimumIdleSize());
+//
+//        if(StringUtils.isNotBlank(redssionProperties.getPassword())) {
+//            serverConfig.setPassword(redssionProperties.getPassword());
+//        }
+//
+//        return Redisson.create(config);
+//    }
+//
+//    /**
+//     * 装配locker类，并将实例注入到RedissLockUtil中
+//     * @return
+//     */
+//    @Bean
+//    DistributedLocker distributedLocker(RedissonClient redissonSingle) {
+//        RedissonDistributedLocker locker = new RedissonDistributedLocker();
+//        locker.setRedissonClient(redissonSingle);
+//        RedissLockUtil.setLocker(locker);
+//        return locker;
+//    }
+//}
diff --git a/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java b/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java
index dd99253..4ffd72f 100644
--- a/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java
+++ b/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java
@@ -1,39 +1,39 @@
-package com.geekq.miaosha.redis;
-
-import org.redisson.api.RLock;
-import org.redisson.api.RedissonClient;
-
-import java.util.concurrent.TimeUnit;
-
-public class RedissonDistributedLocker implements DistributedLocker {
-
-    private RedissonClient redissonClient;
-
-    @Override
-    public void lock(String lockKey) {
-        RLock lock = redissonClient.getLock(lockKey);
-        lock.lock();
-    }
-
-    @Override
-    public void unlock(String lockKey) {
-        RLock lock = redissonClient.getLock(lockKey);
-        lock.unlock();
-    }
-
-    @Override
-    public void lock(String lockKey, int leaseTime) {
-        RLock lock = redissonClient.getLock(lockKey);
-        lock.lock(leaseTime, TimeUnit.SECONDS);
-    }
-
-    @Override
-    public void lock(String lockKey, TimeUnit unit ,int timeout) {
-        RLock lock = redissonClient.getLock(lockKey);
-        lock.lock(timeout, unit);
-    }
-
-    public void setRedissonClient(RedissonClient redissonClient) {
-        this.redissonClient = redissonClient;
-    }
-}
\ No newline at end of file
+//package com.geekq.miaosha.redis;
+//
+//import org.redisson.api.RLock;
+//import org.redisson.api.RedissonClient;
+//
+//import java.util.concurrent.TimeUnit;
+//
+//public class RedissonDistributedLocker implements DistributedLocker {
+//
+//    private RedissonClient redissonClient;
+//
+//    @Override
+//    public void lock(String lockKey) {
+//        RLock lock = redissonClient.getLock(lockKey);
+//        lock.lock();
+//    }
+//
+//    @Override
+//    public void unlock(String lockKey) {
+//        RLock lock = redissonClient.getLock(lockKey);
+//        lock.unlock();
+//    }
+//
+//    @Override
+//    public void lock(String lockKey, int leaseTime) {
+//        RLock lock = redissonClient.getLock(lockKey);
+//        lock.lock(leaseTime, TimeUnit.SECONDS);
+//    }
+//
+//    @Override
+//    public void lock(String lockKey, TimeUnit unit ,int timeout) {
+//        RLock lock = redissonClient.getLock(lockKey);
+//        lock.lock(timeout, unit);
+//    }
+//
+//    public void setRedissonClient(RedissonClient redissonClient) {
+//        this.redissonClient = redissonClient;
+//    }
+//}
\ No newline at end of file
diff --git a/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java b/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java
index b2e2ec8..150ae3d 100644
--- a/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java
+++ b/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java
@@ -1,98 +1,98 @@
-package com.geekq.miaosha.redis;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "redisson")
-public class RedissonProperties {
-
-    private int timeout = 3000;
-
-    private String address;
-
-    private String password;
-
-    private int connectionPoolSize = 64;
-
-    private int connectionMinimumIdleSize=10;
-
-    private int slaveConnectionPoolSize = 250;
-
-    private int masterConnectionPoolSize = 250;
-
-    private String[] sentinelAddresses;
-
-    private String masterName;
-
-    public int getTimeout() {
-        return timeout;
-    }
-
-    public void setTimeout(int timeout) {
-        this.timeout = timeout;
-    }
-
-    public int getSlaveConnectionPoolSize() {
-        return slaveConnectionPoolSize;
-    }
-
-    public void setSlaveConnectionPoolSize(int slaveConnectionPoolSize) {
-        this.slaveConnectionPoolSize = slaveConnectionPoolSize;
-    }
-
-    public int getMasterConnectionPoolSize() {
-        return masterConnectionPoolSize;
-    }
-
-    public void setMasterConnectionPoolSize(int masterConnectionPoolSize) {
-        this.masterConnectionPoolSize = masterConnectionPoolSize;
-    }
-
-    public String[] getSentinelAddresses() {
-        return sentinelAddresses;
-    }
-
-    public void setSentinelAddresses(String sentinelAddresses) {
-        this.sentinelAddresses = sentinelAddresses.split(",");
-    }
-
-    public String getMasterName() {
-        return masterName;
-    }
-
-    public void setMasterName(String masterName) {
-        this.masterName = masterName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public int getConnectionPoolSize() {
-        return connectionPoolSize;
-    }
-
-    public void setConnectionPoolSize(int connectionPoolSize) {
-        this.connectionPoolSize = connectionPoolSize;
-    }
-
-    public int getConnectionMinimumIdleSize() {
-        return connectionMinimumIdleSize;
-    }
-
-    public void setConnectionMinimumIdleSize(int connectionMinimumIdleSize) {
-        this.connectionMinimumIdleSize = connectionMinimumIdleSize;
-    }
-}
-
+//package com.geekq.miaosha.redis;
+//
+//import org.springframework.boot.context.properties.ConfigurationProperties;
+//
+//@ConfigurationProperties(prefix = "redisson")
+//public class RedissonProperties {
+//
+//    private int timeout = 3000;
+//
+//    private String address;
+//
+//    private String password;
+//
+//    private int connectionPoolSize = 64;
+//
+//    private int connectionMinimumIdleSize=10;
+//
+//    private int slaveConnectionPoolSize = 250;
+//
+//    private int masterConnectionPoolSize = 250;
+//
+//    private String[] sentinelAddresses;
+//
+//    private String masterName;
+//
+//    public int getTimeout() {
+//        return timeout;
+//    }
+//
+//    public void setTimeout(int timeout) {
+//        this.timeout = timeout;
+//    }
+//
+//    public int getSlaveConnectionPoolSize() {
+//        return slaveConnectionPoolSize;
+//    }
+//
+//    public void setSlaveConnectionPoolSize(int slaveConnectionPoolSize) {
+//        this.slaveConnectionPoolSize = slaveConnectionPoolSize;
+//    }
+//
+//    public int getMasterConnectionPoolSize() {
+//        return masterConnectionPoolSize;
+//    }
+//
+//    public void setMasterConnectionPoolSize(int masterConnectionPoolSize) {
+//        this.masterConnectionPoolSize = masterConnectionPoolSize;
+//    }
+//
+//    public String[] getSentinelAddresses() {
+//        return sentinelAddresses;
+//    }
+//
+//    public void setSentinelAddresses(String sentinelAddresses) {
+//        this.sentinelAddresses = sentinelAddresses.split(",");
+//    }
+//
+//    public String getMasterName() {
+//        return masterName;
+//    }
+//
+//    public void setMasterName(String masterName) {
+//        this.masterName = masterName;
+//    }
+//
+//    public String getPassword() {
+//        return password;
+//    }
+//
+//    public void setPassword(String password) {
+//        this.password = password;
+//    }
+//
+//    public String getAddress() {
+//        return address;
+//    }
+//
+//    public void setAddress(String address) {
+//        this.address = address;
+//    }
+//
+//    public int getConnectionPoolSize() {
+//        return connectionPoolSize;
+//    }
+//
+//    public void setConnectionPoolSize(int connectionPoolSize) {
+//        this.connectionPoolSize = connectionPoolSize;
+//    }
+//
+//    public int getConnectionMinimumIdleSize() {
+//        return connectionMinimumIdleSize;
+//    }
+//
+//    public void setConnectionMinimumIdleSize(int connectionMinimumIdleSize) {
+//        this.connectionMinimumIdleSize = connectionMinimumIdleSize;
+//    }
+//}
+//
diff --git a/src/main/java/com/geekq/miaosha/redis/RedissonService.java b/src/main/java/com/geekq/miaosha/redis/RedissonService.java
index 7124c3d..16739ad 100644
--- a/src/main/java/com/geekq/miaosha/redis/RedissonService.java
+++ b/src/main/java/com/geekq/miaosha/redis/RedissonService.java
@@ -1,146 +1,146 @@
-package com.geekq.miaosha.redis;
-
-import org.redisson.api.*;
-import org.redisson.config.Config;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-
-/**
- * redisson操作类
- */
-@Service("redissonService")
-public class RedissonService {
-
-    @Autowired
-    private RedissonClient redissonClient;
-
-    public void getRedissonClient() throws IOException {
-        Config config = redissonClient.getConfig();
-        System.out.println(config.toJSON().toString());
-    }
-
-    /**`
-     * 获取字符串对象
-     *
-     * @param objectName
-     * @return
-     */
-    public <T> RBucket<T> getRBucket(String objectName) {
-        RBucket<T> bucket = redissonClient.getBucket(objectName);
-        return bucket;
-    }
-
-    /**
-     * 获取Map对象
-     *
-     * @param objectName
-     * @return
-     */
-    public <K, V> RMap<K, V> getRMap(String objectName) {
-        RMap<K, V> map = redissonClient.getMap(objectName);
-        return map;
-    }
-
-    /**
-     * 获取有序集合
-     *
-     * @param objectName
-     * @return
-     */
-    public <V> RSortedSet<V> getRSortedSet(String objectName) {
-        RSortedSet<V> sortedSet = redissonClient.getSortedSet(objectName);
-        return sortedSet;
-    }
-
-    /**
-     * 获取集合
-     *
-     * @param objectName
-     * @return
-     */
-    public <V> RSet<V> getRSet(String objectName) {
-        RSet<V> rSet = redissonClient.getSet(objectName);
-        return rSet;
-    }
-
-    /**
-     * 获取列表
-     *
-     * @param objectName
-     * @return
-     */
-    public <V> RList<V> getRList(String objectName) {
-        RList<V> rList = redissonClient.getList(objectName);
-        return rList;
-    }
-
-    /**
-     * 获取队列
-     *
-     * @param objectName
-     * @return
-     */
-    public <V> RQueue<V> getRQueue(String objectName) {
-        RQueue<V> rQueue = redissonClient.getQueue(objectName);
-        return rQueue;
-    }
-
-    /**
-     * 获取双端队列
-     *
-     * @param objectName
-     * @return
-     */
-    public <V> RDeque<V> getRDeque(String objectName) {
-        RDeque<V> rDeque = redissonClient.getDeque(objectName);
-        return rDeque;
-    }
-
-
-    /**
-     * 获取锁
-     *
-     * @param objectName
-     * @return
-     */
-    public RLock getRLock(String objectName) {
-        RLock rLock = redissonClient.getLock(objectName);
-        return rLock;
-    }
-
-    /**
-     * 获取读取锁
-     *
-     * @param objectName
-     * @return
-     */
-    public RReadWriteLock getRWLock(String objectName) {
-        RReadWriteLock rwlock = redissonClient.getReadWriteLock(objectName);
-        return rwlock;
-    }
-
-    /**
-     * 获取原子数
-     *
-     * @param objectName
-     * @return
-     */
-    public RAtomicLong getRAtomicLong(String objectName) {
-        RAtomicLong rAtomicLong = redissonClient.getAtomicLong(objectName);
-        return rAtomicLong;
-    }
-
-    /**
-     * 获取记数锁
-     *
-     * @param objectName
-     * @return
-     */
-    public RCountDownLatch getRCountDownLatch(String objectName) {
-        RCountDownLatch rCountDownLatch = redissonClient.getCountDownLatch(objectName);
-        return rCountDownLatch;
-    }
-
-}
\ No newline at end of file
+//package com.geekq.miaosha.redis;
+//
+//import org.redisson.api.*;
+//import org.redisson.config.Config;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Service;
+//
+//import java.io.IOException;
+//
+///**
+// * redisson操作类
+// */
+//@Service("redissonService")
+//public class RedissonService {
+//
+//    @Autowired
+//    private RedissonClient redissonClient;
+//
+//    public void getRedissonClient() throws IOException {
+//        Config config = redissonClient.getConfig();
+//        System.out.println(config.toJSON().toString());
+//    }
+//
+//    /**`
+//     * 获取字符串对象
+//     *
+//     * @param objectName
+//     * @return
+//     */
+//    public <T> RBucket<T> getRBucket(String objectName) {
+//        RBucket<T> bucket = redissonClient.getBucket(objectName);
+//        return bucket;
+//    }
+//
+//    /**
+//     * 获取Map对象
+//     *
+//     * @param objectName
+//     * @return
+//     */
+//    public <K, V> RMap<K, V> getRMap(String objectName) {
+//        RMap<K, V> map = redissonClient.getMap(objectName);
+//        return map;
+//    }
+//
+//    /**
+//     * 获取有序集合
+//     *
+//     * @param objectName
+//     * @return
+//     */
+//    public <V> RSortedSet<V> getRSortedSet(String objectName) {
+//        RSortedSet<V> sortedSet = redissonClient.getSortedSet(objectName);
+//        return sortedSet;
+//    }
+//
+//    /**
+//     * 获取集合
+//     *
+//     * @param objectName
+//     * @return
+//     */
+//    public <V> RSet<V> getRSet(String objectName) {
+//        RSet<V> rSet = redissonClient.getSet(objectName);
+//        return rSet;
+//    }
+//
+//    /**
+//     * 获取列表
+//     *
+//     * @param objectName
+//     * @return
+//     */
+//    public <V> RList<V> getRList(String objectName) {
+//        RList<V> rList = redissonClient.getList(objectName);
+//        return rList;
+//    }
+//
+//    /**
+//     * 获取队列
+//     *
+//     * @param objectName
+//     * @return
+//     */
+//    public <V> RQueue<V> getRQueue(String objectName) {
+//        RQueue<V> rQueue = redissonClient.getQueue(objectName);
+//        return rQueue;
+//    }
+//
+//    /**
+//     * 获取双端队列
+//     *
+//     * @param objectName
+//     * @return
+//     */
+//    public <V> RDeque<V> getRDeque(String objectName) {
+//        RDeque<V> rDeque = redissonClient.getDeque(objectName);
+//        return rDeque;
+//    }
+//
+//
+//    /**
+//     * 获取锁
+//     *
+//     * @param objectName
+//     * @return
+//     */
+//    public RLock getRLock(String objectName) {
+//        RLock rLock = redissonClient.getLock(objectName);
+//        return rLock;
+//    }
+//
+//    /**
+//     * 获取读取锁
+//     *
+//     * @param objectName
+//     * @return
+//     */
+//    public RReadWriteLock getRWLock(String objectName) {
+//        RReadWriteLock rwlock = redissonClient.getReadWriteLock(objectName);
+//        return rwlock;
+//    }
+//
+//    /**
+//     * 获取原子数
+//     *
+//     * @param objectName
+//     * @return
+//     */
+//    public RAtomicLong getRAtomicLong(String objectName) {
+//        RAtomicLong rAtomicLong = redissonClient.getAtomicLong(objectName);
+//        return rAtomicLong;
+//    }
+//
+//    /**
+//     * 获取记数锁
+//     *
+//     * @param objectName
+//     * @return
+//     */
+//    public RCountDownLatch getRCountDownLatch(String objectName) {
+//        RCountDownLatch rCountDownLatch = redissonClient.getCountDownLatch(objectName);
+//        return rCountDownLatch;
+//    }
+//
+//}
\ No newline at end of file
diff --git a/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java b/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java
index c29d3fd..2a7649a 100644
--- a/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java
+++ b/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java
@@ -37,7 +37,7 @@ public class MiaoShaUserService {
         }
         MiaoshaUser user =redisService.get(MiaoShaUserKey.token,token,MiaoshaUser.class) ;
         if(user!=null) {
-            addCookie(response, user);
+            addCookie(response, token, user);
         }
         return user ;
 
@@ -105,17 +105,25 @@ public class MiaoShaUserService {
         if(!calcPass.equals(dbPass)){
             throw new GlobleException(CodeMsg.PASSWORD_ERROR);
         }
-       //生成cookie
-        addCookie(response,user);
+        //生成cookie
+        String token= UUIDUtil.uuid();
+        addCookie(response, token, user);
         return true ;
     }
 
-    private void addCookie(HttpServletResponse response ,MiaoshaUser user){
-        String token = UUIDUtil.uuid();
-        redisService.set(MiaoShaUserKey.token,token,user) ;
-        Cookie cookie = new Cookie(COOKIE_NAME_TOKEN , token) ;
+    private void addCookie(HttpServletResponse response, String token, MiaoshaUser user) {
+        redisService.set(MiaoShaUserKey.token, token, user);
+        Cookie cookie = new Cookie(COOKIE_NAME_TOKEN, token);
         cookie.setMaxAge(MiaoShaUserKey.token.expireSeconds());
         cookie.setPath("/");
         response.addCookie(cookie);
     }
+//    private void addCookie(HttpServletResponse response ,MiaoshaUser user){
+//        String token = UUIDUtil.uuid();
+//        redisService.set(MiaoShaUserKey.token,token,user) ;
+//        Cookie cookie = new Cookie(COOKIE_NAME_TOKEN , token) ;
+//        cookie.setMaxAge(MiaoShaUserKey.token.expireSeconds());
+//        cookie.setPath("/");
+//        response.addCookie(cookie);
+//    }
 }
diff --git a/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java b/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java
index 5995a78..0bc0165 100644
--- a/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java
+++ b/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java
@@ -1,114 +1,114 @@
-package com.geekq.miaosha.timeTask;
-
-import com.geekq.miaosha.dao.OrderDao;
-import com.geekq.miaosha.redis.RedisService;
-import com.geekq.miaosha.redis.RedissonService;
-import com.geekq.miaosha.service.OrderService;
-import jodd.util.PropertiesUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.redisson.api.RLock;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.concurrent.TimeUnit;
-
-import static com.geekq.miaosha.common.Constanst.CLOSE_ORDER_INFO_TASK_LOCK;
-
-@Component
-@Slf4j
-public class OrderCloseTask {
-
-    @Autowired
-    private OrderDao orderDao ;
-    @Autowired
-    private RedisService redisService;
-
-    @Autowired
-    private OrderService orderService;
-    @Autowired
-    private RedissonService redissonService;
-
-
-//    @Scheduled(cron = "0/1 * * * * ?")
-    private void closeOrderTaskv1(){
-        int hour = 2;
-        orderService.closeOrder(hour);
-        log.info("关闭订单定时任务结束");
-    }
-//    @Scheduled(cron = "0/1 * * * * ?")
-//    public void closeOrderTaskV2(){
-//        log.info("关闭订单定时任务启动");
-//        long lockTime = 5000;
-//        Long setnxResult = redisService.setnx(CLOSE_ORDER_INFO_TASK_LOCK,String.valueOf(System.currentTimeMillis()+lockTime));
-//        //代表获取了锁
-//        if(setnxResult !=null && setnxResult ==1){
-//            closeOrder(CLOSE_ORDER_INFO_TASK_LOCK);
-//        }else {
-//            log.info("没有获得分布式锁:{}",CLOSE_ORDER_INFO_TASK_LOCK);
-//        }
-//        log.info("关闭订单定时任务结束");
-//    }
-
-//    @Scheduled(cron = "0/1 * * * * ?")
-//    public void closeOrderTaskV3(){
-//        log.info("关闭订单定时任务启动");
-//        long lockTime = 5000;
-//        Long setnxResult = redisService.setnx(CLOSE_ORDER_INFO_TASK_LOCK,String.valueOf(System.currentTimeMillis()+lockTime));
-//        //代表获取了锁
-//        if(setnxResult !=null && setnxResult ==1){
-//            closeOrder(CLOSE_ORDER_INFO_TASK_LOCK);
-//        }else {
-//            log.info("没有获得分布式锁:{}",CLOSE_ORDER_INFO_TASK_LOCK);
-//            String lockValueStr = redisService.get(CLOSE_ORDER_INFO_TASK_LOCK);
-//            if(lockValueStr!=null&&System.currentTimeMillis() > Long.parseLong(lockValueStr)){
-//            //把之前的释放在新加入锁
-//            String getSetResult = redisService.getset(CLOSE_ORDER_INFO_TASK_LOCK,String.valueOf(System.currentTimeMillis()+lockTime));
+//package com.geekq.miaosha.timeTask;
 //
-//            if(getSetResult == null || (getSetResult != null && StringUtils.equals(lockValueStr,getSetResult))){
-//                closeOrder(CLOSE_ORDER_INFO_TASK_LOCK);
-//            }else {
-//                log.info("没有获取到分布式锁:{}",CLOSE_ORDER_INFO_TASK_LOCK);
-//            }
-//            }else {
-//                log.info("没有获取到分布式锁:{}",CLOSE_ORDER_INFO_TASK_LOCK);
-//            }
-//        }
+//import com.geekq.miaosha.dao.OrderDao;
+//import com.geekq.miaosha.redis.RedisService;
+//import com.geekq.miaosha.redis.RedissonService;
+//import com.geekq.miaosha.service.OrderService;
+//import jodd.util.PropertiesUtil;
+//import lombok.extern.slf4j.Slf4j;
+//import org.apache.commons.lang3.StringUtils;
+//import org.redisson.api.RLock;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.concurrent.TimeUnit;
+//
+//import static com.geekq.miaosha.common.Constanst.CLOSE_ORDER_INFO_TASK_LOCK;
+//
+//@Component
+//@Slf4j
+//public class OrderCloseTask {
+//
+//    @Autowired
+//    private OrderDao orderDao ;
+//    @Autowired
+//    private RedisService redisService;
+//
+//    @Autowired
+//    private OrderService orderService;
+//    @Autowired
+//    private RedissonService redissonService;
+//
+//
+////    @Scheduled(cron = "0/1 * * * * ?")
+//    private void closeOrderTaskv1(){
+//        int hour = 2;
+//        orderService.closeOrder(hour);
 //        log.info("关闭订单定时任务结束");
 //    }
-    @Scheduled(cron="0 */1 * * * ?")
-    public void closeOrderTaskV4(){
-        RLock lock = redissonService.getRLock(CLOSE_ORDER_INFO_TASK_LOCK);
-        boolean getLock = false;
-        try {
-            if(getLock = lock.tryLock(0,50, TimeUnit.SECONDS)){
-                log.info("Redisson获取到分布式锁:{},ThreadName:{}",CLOSE_ORDER_INFO_TASK_LOCK,Thread.currentThread().getName());
-                int hour = 2;
-//                iOrderService.closeOrder(hour);
-            }else{
-                log.info("Redisson没有获取到分布式锁:{},ThreadName:{}",CLOSE_ORDER_INFO_TASK_LOCK,Thread.currentThread().getName());
-            }
-        } catch (InterruptedException e) {
-            log.error("Redisson分布式锁获取异常",e);
-        } finally {
-            if(!getLock){
-                return;
-            }
-            lock.unlock();
-            log.info("Redisson分布式锁释放锁");
-        }
-    }
-
-
-
-    private void closeOrder(String lockName){
-        redisService.expire(lockName,5);
-        log.info("获取{},当前线程名称！" ,lockName,Thread.currentThread().getName());
-        int hour = 2;
-        orderService.closeOrder(hour);
-        redisService.del(CLOSE_ORDER_INFO_TASK_LOCK);
-        log.info("===============================");
-
-    }
-}
+////    @Scheduled(cron = "0/1 * * * * ?")
+////    public void closeOrderTaskV2(){
+////        log.info("关闭订单定时任务启动");
+////        long lockTime = 5000;
+////        Long setnxResult = redisService.setnx(CLOSE_ORDER_INFO_TASK_LOCK,String.valueOf(System.currentTimeMillis()+lockTime));
+////        //代表获取了锁
+////        if(setnxResult !=null && setnxResult ==1){
+////            closeOrder(CLOSE_ORDER_INFO_TASK_LOCK);
+////        }else {
+////            log.info("没有获得分布式锁:{}",CLOSE_ORDER_INFO_TASK_LOCK);
+////        }
+////        log.info("关闭订单定时任务结束");
+////    }
+//
+////    @Scheduled(cron = "0/1 * * * * ?")
+////    public void closeOrderTaskV3(){
+////        log.info("关闭订单定时任务启动");
+////        long lockTime = 5000;
+////        Long setnxResult = redisService.setnx(CLOSE_ORDER_INFO_TASK_LOCK,String.valueOf(System.currentTimeMillis()+lockTime));
+////        //代表获取了锁
+////        if(setnxResult !=null && setnxResult ==1){
+////            closeOrder(CLOSE_ORDER_INFO_TASK_LOCK);
+////        }else {
+////            log.info("没有获得分布式锁:{}",CLOSE_ORDER_INFO_TASK_LOCK);
+////            String lockValueStr = redisService.get(CLOSE_ORDER_INFO_TASK_LOCK);
+////            if(lockValueStr!=null&&System.currentTimeMillis() > Long.parseLong(lockValueStr)){
+////            //把之前的释放在新加入锁
+////            String getSetResult = redisService.getset(CLOSE_ORDER_INFO_TASK_LOCK,String.valueOf(System.currentTimeMillis()+lockTime));
+////
+////            if(getSetResult == null || (getSetResult != null && StringUtils.equals(lockValueStr,getSetResult))){
+////                closeOrder(CLOSE_ORDER_INFO_TASK_LOCK);
+////            }else {
+////                log.info("没有获取到分布式锁:{}",CLOSE_ORDER_INFO_TASK_LOCK);
+////            }
+////            }else {
+////                log.info("没有获取到分布式锁:{}",CLOSE_ORDER_INFO_TASK_LOCK);
+////            }
+////        }
+////        log.info("关闭订单定时任务结束");
+////    }
+////    @Scheduled(cron="0 */1 * * * ?")
+////    public void closeOrderTaskV4(){
+////        RLock lock = redissonService.getRLock(CLOSE_ORDER_INFO_TASK_LOCK);
+////        boolean getLock = false;
+////        try {
+////            if(getLock = lock.tryLock(0,50, TimeUnit.SECONDS)){
+////                log.info("Redisson获取到分布式锁:{},ThreadName:{}",CLOSE_ORDER_INFO_TASK_LOCK,Thread.currentThread().getName());
+////                int hour = 2;
+//////                iOrderService.closeOrder(hour);
+////            }else{
+////                log.info("Redisson没有获取到分布式锁:{},ThreadName:{}",CLOSE_ORDER_INFO_TASK_LOCK,Thread.currentThread().getName());
+////            }
+////        } catch (InterruptedException e) {
+////            log.error("Redisson分布式锁获取异常",e);
+////        } finally {
+////            if(!getLock){
+////                return;
+////            }
+////            lock.unlock();
+////            log.info("Redisson分布式锁释放锁");
+////        }
+////    }
+//
+//
+//
+//    private void closeOrder(String lockName){
+//        redisService.expire(lockName,5);
+//        log.info("获取{},当前线程名称！" ,lockName,Thread.currentThread().getName());
+//        int hour = 2;
+//        orderService.closeOrder(hour);
+//        redisService.del(CLOSE_ORDER_INFO_TASK_LOCK);
+//        log.info("===============================");
+//
+//    }
+//}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index c90492a..af03501 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -16,9 +16,9 @@ mybatis.mapperLocations=classpath:mybatis/mapper/*.xml
 #add mybatis
 mybatis.config-locations=classpath:mybatis/config.xml
 #datasource
-spring.datasource.url=jdbc:mysql://localhost:3306/miaosha?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
+spring.datasource.url=jdbc:mysql://39.107.245.253:3306/miaosha?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
 spring.datasource.username=root
-spring.datasource.password=aixiyue11
+spring.datasource.password=root
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 #druid
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
@@ -44,7 +44,7 @@ spring.resources.chain.gzipped=true
 spring.resources.chain.html-application-cache=true
 spring.resources.static-locations=classpath:/static/
 #redis
-redis.host=192.168.1.116
+redis.host=39.107.245.253
 redis.port=6379
 redis.timeout=100
 redis.password=123456
@@ -54,10 +54,10 @@ redis.poolMaxWait=500
 #server.port=8003
 
 #rabbitmq
-spring.rabbitmq.host=localhost
+spring.rabbitmq.host=39.107.245.253
 spring.rabbitmq.port=5672
-spring.rabbitmq.username=guest
-spring.rabbitmq.password=guest
+spring.rabbitmq.username=mqadmin
+spring.rabbitmq.password=mqadmin
 spring.rabbitmq.virtual-host=/
 spring.rabbitmq.listener.simple.concurrency= 10
 spring.rabbitmq.listener.simple.max-concurrency= 10
@@ -71,4 +71,4 @@ spring.rabbitmq.template.retry.max-interval=10000
 spring.rabbitmq.template.retry.multiplier=1.0
 
 ## maven隔离
-spring.profiles.active=dev
\ No newline at end of file
+#spring.profiles.active=dev
\ No newline at end of file
diff --git a/target/classes/application.properties b/target/classes/application.properties
index c90492a..af03501 100644
--- a/target/classes/application.properties
+++ b/target/classes/application.properties
@@ -16,9 +16,9 @@ mybatis.mapperLocations=classpath:mybatis/mapper/*.xml
 #add mybatis
 mybatis.config-locations=classpath:mybatis/config.xml
 #datasource
-spring.datasource.url=jdbc:mysql://localhost:3306/miaosha?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
+spring.datasource.url=jdbc:mysql://39.107.245.253:3306/miaosha?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
 spring.datasource.username=root
-spring.datasource.password=aixiyue11
+spring.datasource.password=root
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 #druid
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
@@ -44,7 +44,7 @@ spring.resources.chain.gzipped=true
 spring.resources.chain.html-application-cache=true
 spring.resources.static-locations=classpath:/static/
 #redis
-redis.host=192.168.1.116
+redis.host=39.107.245.253
 redis.port=6379
 redis.timeout=100
 redis.password=123456
@@ -54,10 +54,10 @@ redis.poolMaxWait=500
 #server.port=8003
 
 #rabbitmq
-spring.rabbitmq.host=localhost
+spring.rabbitmq.host=39.107.245.253
 spring.rabbitmq.port=5672
-spring.rabbitmq.username=guest
-spring.rabbitmq.password=guest
+spring.rabbitmq.username=mqadmin
+spring.rabbitmq.password=mqadmin
 spring.rabbitmq.virtual-host=/
 spring.rabbitmq.listener.simple.concurrency= 10
 spring.rabbitmq.listener.simple.max-concurrency= 10
@@ -71,4 +71,4 @@ spring.rabbitmq.template.retry.max-interval=10000
 spring.rabbitmq.template.retry.multiplier=1.0
 
 ## maven隔离
-spring.profiles.active=dev
\ No newline at end of file
+#spring.profiles.active=dev
\ No newline at end of file
diff --git a/target/classes/com/geekq/miaosha/DemoTask$1.class b/target/classes/com/geekq/miaosha/DemoTask$1.class
index d5a3e7a1267c1d524a7e7ad797c186fb5111b64e..4fcfd95106664dc7d3f1d9bb6e2d81d1904dc478 100644
GIT binary patch
delta 175
zcmaFP_KHpO)W2Q(7#J9g7<9N8*cqg_7$g~_xfo;^WVsmR805Ja*ccSp85G$WlqPDr
zF)~cdy``+o!@$A7$-|(+pvumm#>1e_pux_d$-|(<pv}V|$RNbXATxO(qtxaWMpH&k
z0if9|AkoQ(m@Gj&0T&=ocrpvKi9SS51gL_EL6kuZOp7x}fOSX$Nq!*aVqgS10R%Vz
DkYp0|

delta 166
zcmaFG_MA=g)W2Q(7#J9g7__+<*cl|b7$g{^xEQ1vWVje)8RWPa*cjy585GzV6enuB
zO)R>hpv1$#!NAGGpv<7c&Y;S}pvIui&Y;1=pvj=c!yv#QxH*e4h>?>YXe0}WJNYP+
uC5R{B0^|uzW@k3hhsX&7RWLD#Fo=R_F$Qt44hbO12gF<qj6j<~fCB)j#1U-(

diff --git a/target/classes/com/geekq/miaosha/DemoTask$2.class b/target/classes/com/geekq/miaosha/DemoTask$2.class
index 024b9067fc87b280222f969626a77ac6d2cc5a55..7af6ecf9d635b431845e8a72995bb58d9bb88164 100644
GIT binary patch
delta 237
zcmaFP_KMBv)W2Q(7#J9g7>u|Wco`JA7!(+kKrCf;1{E#_76w&z1~pco0tS{vrwh3l
z*cjA71W+9hg9bZ;COd=HL?<^!hKX%YT(o%@_!#(k7<3qPc^LE<q!<|lvl7b^^>Y&Q
z()B&_N>bBPi+C9H84MU1_`njSC7C(;E{P?nAdQAR4B`wDlh-jm<P-y02j<OSiV_0x
zB!QTjfl*q(1t=^vnT6RzAEHPaD8a-a!ypT$<rw6FGz-uV3=E<`%*DV6bSDUK007D`
BA_M>c

delta 235
zcmaFG_MFY>)W2Q(7#J9g7!0`>co`J97~~lgK`bS924yY=76uh|231y|0tS{vrwh3l
z*cjA61W+9hgE~8d20Mf1L?^e2-H%+fco_H?_<0z#8FY9UbQvTW83eNu%M$f-67$ma
zJ@ZOZ(^HFh81xwQ85#J%5~U@XIr=V%C8;2d20RR64C0eFGCt%K1z85>&1Q-c0`Vk(
zn3;i5TEGP;EIFB-*+d_rND3&y#30Qe1Eyse<bX5_&<6|*B0$W=zzB3D2yg%ZrZ^$#

diff --git a/target/classes/com/geekq/miaosha/DemoTask.class b/target/classes/com/geekq/miaosha/DemoTask.class
index 0f779194df6e4ba6c5083ecefeba117e62c2ddd9..2e010f004fcbb2261d3b5fdd2b4ad026e6cdac7b 100644
GIT binary patch
delta 658
zcmZXPyKYlK5Qe`!w$IqBwQvv@ISC;ULx>3&8!&e;*N}ue;TmoRj3F2U!J&15L_>pg
zXn6-5B#<b002(?TfszVQBIejuf|M<0{@MLz=HFMT*Qw^WzhAxr1?Cd0;b0gJSrU{i
zhdCk~wZu4<;5aAZj0q>L664|JM95BBPH{TH8O~bHao#Uwbef*9x?uJGqA+Dy!KFBt
zg)5fTTotZa(v*Z{*DZaam=<mrXuWx7%v3Pwy)6!rajav#V}z`5({YR2hMt-7%W|$(
zu2*y8^+u&ynRVPDFO(g3xflHO@`Y{W9rvj?hRFyI9913)j~p{R7HW<s)E!TG=6KGm
zVIcTr24apEWP@5{!XKew=nq<^_v4SqAJbGD`lnvh6NU|{JvM5s;}_~p_^Q>b#?4CP
zH0zIuWj_;XwOd9th7br_G`bGJR)tZmzBPu;yEKPfavt-EVA4+xFE*$DYfdgS7do4R
zrr$85!Eb-48Ln8RPK!j@&W`rL=`O!h-vn<?C`MCp-M72DxxbA;bRO@6LWae~qU0X-
mE+x$pk~p%j>*&4Y)zNoZxpuz}^f<tv=H;sTG^1#`lm7ukW=u=~

delta 611
zcmZXR+fGwa5Qe|C+wN(X3sZyE;Gw8h0Z~g)@rWQI2r8g>##7Z=MJS5ZTM|vYG{)@%
z_y`{E4DkVY6YuoOJL9Y^Ax&5plldoK{`n{CZT3xeVd?MpA3!(t3|r~-<)kG;pQWEu
z!hj{k=?sIMNi!r2TP4o=;fQBPE$29&;R0ipaVEn4o$98~tBY3WmxM{ndM>BAB3!j>
z<eG5Z(n6o$Zdf+^=B6<9<=sbPCZj^|zGnvo$2PV*+UXE(Ic{^uux`5is$85Y*Q&*l
zTD?-O%scMVCERnAxgY%uO5H`e91nQt*iAvGI37_I9y^{eEj)G1Fzcu>=Xl0*Lq7U#
z@+rqW9noB3G||qBZ;OfMprrftl1*qB4F0fyU8>c0MYj=ZuOYSW`4HyXIu-LH5cX<y
zai3xz`&Ah<o=2nJFyFwoG_Xx8Z0Wyk^g67Y&gf5ASn!THjnP9=|Lj2QJ+;gqjCTev
zg+s|~T9Lzkkq)=S7$m<Ee2zmjgjDhfM^}?(6-gR7ww&mblv=&XS`u0<YiMGFE($oV
MI^YDY(J#sU1JuMurT_o{

diff --git a/target/classes/com/geekq/miaosha/GeekQMainApplication.class b/target/classes/com/geekq/miaosha/GeekQMainApplication.class
index 0e81ae567ee354ca3e89f71d4c5d52cc3878b9ec..2eee7e37fc4b13322818f315e7b1accd755b1125 100644
GIT binary patch
delta 62
zcmX@Yc9d<yOC}?81||kZ1_lOBVFo6x9SqFj8-W}q1`Z&}1*91mcz|qP22L;wtZ=dv
Gvlaj?bq3e~

delta 61
zcmX@gc7$!iOD01z1||kZ1_lNWAttRI49wvhfovuQ4j{<|q!}1^7}yzj892c#u)4|8
G%vt~_<p$FL

diff --git a/target/classes/com/geekq/miaosha/Md5Utils/MD5Utils.class b/target/classes/com/geekq/miaosha/Md5Utils/MD5Utils.class
index 3ccffb233a3f70c2475d2b8f530ab390b0e180b8..ac35aa59c002b8a9b8033593b5f1568fb4c34687 100644
GIT binary patch
delta 229
zcmey#^OI+SiU|jU85e^&g9R4@GlM0Fu;OA6Vz34gHXy>5lfjO`o`b;w#Bt<eaAI&~
z-x$HfG`WGvi&1&vMdi&Wn1UI_g&2ex7#J8CBpE~)M1iyzkjKQpKG}$6zCJtiHU^Gu
z44gvjtPqCQHU>5!cAyYMlpVs@#=zyHy@P>!5^J~yNJ1M)wKi0-HbSkh4p8mnde#tj
f9$y`xKHkZ<Sd+Q=g!qNncQ6QSV-TF|!Da{mzWFKC

delta 229
zcmey#^OI+SiU~V|83%(o7lQ?ZB^LuTgB6Id=3-!HumKUaAi|E5!Jff^gTWERapGcd
z-Wb8e#Hc*+qVnVjCZElxm;xEa*%^cx7#J8CBpE~)M1iyzkjKQpG1-V^zCH)@HU`dZ
z3|vAStPqCQHU>5!4i1<oJA|=~f!jxW2LsO})^H7wa&08l+EB&X2(`XCK(&+WSwq-)
eeRY8P_$J?CP3Gno5)k6p!63MeL1?lEn;`&+wkekY

diff --git a/target/classes/com/geekq/miaosha/access/AccessInterceptor.class b/target/classes/com/geekq/miaosha/access/AccessInterceptor.class
index 44922dddf89417f84a0aa2e9882757a8e4aab839..bc8a91c9c234fa4dc88fcb00231ee74921c0eca2 100644
GIT binary patch
delta 1669
zcmZ9L2~?C-6vuyWwl{q9%pJw@csh{i42zJZp^#-*q*A%GnHAAQqlk*Qw2q}|*<$v!
zh-IZ^+K!>1R;bygrEO+v*>0=tSy}?!H*h%BIWza&@4dVH|NnPiW4I;~-`2FD0mxNe
zhg@cBZg9xqMu$1f)!gLZVO|J7^R2nrnp;9F;MOE=<8~W*hi0KeJ7!yRXOKk>cj4NP
zyREs$;a=`blEB59YKJA<?~u#`)?4ZjPv$}EK4j}X9AsID<ve1|qYf*0%wZ*~f;{f<
z1W!6V#naY2W6iTcrdlX97R73Z=cu)9);O%C&K}e|tYf{+++e-uH7{shRD`Bai&l<~
zR?di(Mr)NS_hvK*Z6TWo*r?g0*{pd<vqc~)oWfb9(J582$raNyFV|N4_9(xvq_Q&2
zofqh36u$CkMVi7BOLM0LlD(Rl?yA6O?@8pjO@W-FCQ+ez#qcVxDbn0U-d;H)Vv}N3
zhS%9@ID>75Gp!lU8=8%VH`%V)VR(y};R?zW-Q0puxABIzc}Jlx(KHy|<vqKx)9}8H
z-(uLs2ZjL*RCJtBGNUBByriNmyQrcnS{AL;>^AISui-;JGVJ4H!zZ@sr+jAkoS3VE
zsqsyQFZj~1pRY7u8@}ON&3A_HIiT>59WyL*py*=wfgd$L8Ghy$!>{BSezWFx4jL*E
zmHsgN$sxn>^w%6V{KemfBQ$E749#p8)s!;I!*)fubn>L^vS@VTRCkFtxpseWcEBwS
zX1b;A55{w3CXo@uRzh)tcmY{YloiYMe|vuU7Tv`TlJjg?m8|}7J!-W$9tMlG1)wYW
zVogf`1)MBjiXogLQIhQGhmX{Dvbi^NGoEU8h9epEc=LQIzIFIAH{r?ir}#VL9_~=(
zk)@*Ja5dQ7(DCSaI>(VgZ?fnk5c^8aFhxW-M|RI8lW}rVD&V3rt#gFZ0->{1B9{xD
zwE};m5ZEC|cL~DXl5KI$m8aC6t(?kG!PSEXPNPsBV>+uD#_7Uo0Lx^SiqLUMSu7J(
zL{R<<WvoV!B+chDl42ZbSIk+QO-Py!lKoL4g0O6rz<Q$@laOUEV+F7$ae5x-<K+VJ
ziwQK5rMXZuPIFPSpbu%rYcAHvXkI$B?MNx5DS@7i<Y+F_ly+|xD87G3OTo+K?~{g6
zX(i)s^>>py=Zl(SI;X}h`~JcdQLp8etY?AQTg>1}Vv^CGo=jk(K<rKz$_1qFKXv61
zO1vG4EfN!uH9yiReLa0V6o<vDr*F&6hO04|>yX8-YQ%|)7fkW3lq=8khu09vNb%Q^
zQ6m++iD~MQs5Vk~71K$CJyxVm6;X3VMvJ|mrCS^J{5E;>Tjfm>ev>8JEBO(oB(Ueo
z^-LAd-!Gwg2fU4>ikR{X4Y8tn>_cm%bU?m>(yB1Bo=kT|m&h?$8Fge=la!+C=vOm0
zpjI~TQ>~cY16|S+s*aMRi1e&tI$GXC7BiTcn6AFelF{*troFjJJgZk>8-v0&28CQL
r7(J3*z%`QFG9X>?AEAThTGfPO7uD;K6!UPMl<{!AjC@kdD~!WGo^d%h

delta 1600
zcmZ9L2~?Fu6vuz_wt0MS3_)BdJ)Dy#m$!(JnPJZ~Lvx8Nwau(Z$sh$oG;Q&jnq`YE
zUuk5Pw%Hzr0h*F#X)bA*8CJIMyV+tX&>cWdb<TVD-kG`Iz5oAz?o>qT!-;JTYiogQ
zg~N%=)+8LVnd5LHb2alEJj@T_=O$|wSaWlTTUeOHt=wi)Z`a)6(1zL8EDCa`!(H5M
z7x!4>I^4^BNs_o&v&7+k${jlJfQ^<qBs%b*4VT$^4+VKR#Bx?x^N7QvJm&B?PXt-%
z@FY(;Jk2xKJZsH!n&*R*S~M?MAQcX)c+qyMbm-1%d+?G&71j3R8XK+Atkt}%2u+_>
zP&&GxbjGT~CEn;dVJ%#n4%cgHHLqwkXf_IB(It20go3GMg(bz)G_O`J_U%*dia?rA
z(RrLZ$dl$Kx7A+FEVm{w+M7dv_ZXcODyBrU$?zJly9bgwyBVH9*2uysg=L1#Y%vVu
z4Z{d)MzU42-ms1BnjMBWDKbprN<~MvB-C-dVJEv3>Qc=*!&|&<H+CD|vH2SfdwAE-
zk5d#WMfo%GGbiU4Ps$utTvjltpj5Nh@E&!BeY|h@fDaA(ZPSnV*zgHOZc4Cgyw>n3
zpBX;q3(c2?ulQQ?jp19qQ~1Y@84~L!au~kn2hER$pZMAE3;hiTgzeDe%)W+SIcS(h
zndUdc@BCrt!%2oeIb`^Yzcq&qN7!ztr@_$3c174-<jttu8k`ewXC@y^WXt#=(}w*L
zMPG>m;!hTjCHTKRzpO=Vv8T#;rg$aZAFf8NlE6b;tStcT86eg)CvX}AWu+Lz>5?TM
zdwSvH_%^ax7u$%ZoZaC_v>I=YFWpyzFSY?sjz8U>>b6NKQ>pH}lo2ZK?n*f>(Tx*`
z(2W>91a42M9Og{f8AX(_vU?G|xLlx3B#XI1YN2E;6++8}PNfi9F9dc7f<1zDub{Fh
z=gXT(W($KkLr@*dI&v8zudW*v43+8usj*zfXE-_`4VTCe4JRlEi)50{B1xJrAdj=<
zIWLs;D9#}yP5W~$qeTMY*dl<9#t2L+P#x!Sev|ffT)>5R1v*kC&_GNxPIIwle4}&@
zX)e*oC|;(?AKZGRl+wbKF7@=*Owdg1)F@DV|IU_z1@iYv!z-kfOt@9wjkJr4nuYDU
zCM^3t!W2=j`HpO4fmw)A3MrB=lIg-#OcscpNMni+_5G)=JUq#_Be6+x0^;M5)E;Z-
z=^-yHQ8nS_dySN1Vl{~Ks|pFaNEA%>t&|JT@rPFvji&pnh*d}hFLAd=T1FGX0nIgA
z5yo3ZjJJrGBrK*1E-$Gv3s*NG%$7?imB`;DY+JnbbQQ(q7aC}l^Vql3f_tZ|g3>iN
zvW8xYyx3-fvD#($-OXtkoin3V^e!hUU00D+F+ZSIHtttPL8|uMi;l_|k@nM>fwrYu
z;pVo&&E*;a<dO3M%w(3pwRheg{}I}1u2l^<)~Sp`g4)A%a_HfDnSth4bp!kZeSa{L

diff --git a/target/classes/com/geekq/miaosha/common/ResponseCode.class b/target/classes/com/geekq/miaosha/common/ResponseCode.class
index 303ef69fa591a98a781753ce2d636f8814c55e90..669eb9ba57a9de5a112a1d872f998ab3d8974a81 100644
GIT binary patch
delta 30
lcmaFQ{egRfDhszM0}}%y0|NuMFvDbh78OSB%^@ta83AR%1<e2e

delta 29
kcmeys{hoV+Dhrnh0}}%y0|Nt>&}0J^6-KVjp)9i*0b*AL$^ZZW

diff --git a/target/classes/com/geekq/miaosha/config/UserArgumentResolver.class b/target/classes/com/geekq/miaosha/config/UserArgumentResolver.class
index f72388522b42d25601130d94878732bef1bcbed8..146f5ee912c21550c50739c737eca0fb4eba1b60 100644
GIT binary patch
delta 416
zcmX|-KTnfU6o;RC`@TKx%Udi}OvKtUykZDYDvGuh|DZyxh(h_JSZKk-!AKlBxa!2f
zdJ|>_zkq4NV4@$uPhs5M92|&x+M&rEPM&j~-#NKI&K(VxzyJO64Vd9oK)}6#dF~4j
z0v@t3z#`RvN7Moyv(&Ag2+P7#;o0Z%FJo3ZS8U3fRX6J$`rcl<9l5NZPaC}b*Y6^O
zsTu5>$bI!%Vb81!YeLag{YG*<WP?pZ<n|@HEIbc+!In@Dc}YXq4%wlpLP(3<kUg56
z-~O>3dXFWhM`tEZu*;KYai0?7r3}NISE`%~j9~CdagnS}Us4+ONlr;#Nq{{i?fm3N
z^V1z9-+ri*U{v)f3W&A~OjE?;4C7qYKk~IV#x<?ts#p38D_mz*<GbtzH#J^#s-$kL
lw<t&KpQ<91g^F-XnA2y}$p6t)%WZY-Aa@wlBCb();XmvHHiiHI

delta 364
zcmX|-xlTes7)H+>xQtxJ1p+22i;0CH?g|RH?<=@(AiRKumA$p4H?cInf+4XmMjI;|
zU%?l!G_f%1j|G`YW^(3yU;fN><UO2y{dsr-hN(C>OgKz3rI~h^VK%@V^9~CvIxMkV
zyRB$eHEWvnyX=Q$ZB)Beqq6dD+I#7KddpsmXz9uhyKh>Xf3=|5)TG>sUGi-iw%Ku?
z?PS-kVUK-H!EnH#=E!hNQCvfb6GNF|HQ>8dE$1jaGGMUh9+mG6xsMIWOppkz0tM4X
zI~F#E4x%E*gqk{u3rPrZP~SAWG5>}2;@<dA&r%ZUBt#$mXc2Pt${Yg>N<obc$;T*p
pACZ-kIcimLJiijunzUwAGp5PNwj`1Gl2%1lEG6kCIepSJ4u7gbF+u<U

diff --git a/target/classes/com/geekq/miaosha/controller/DemoController.class b/target/classes/com/geekq/miaosha/controller/DemoController.class
index 65633e7d3fb86031d5e7a94fafd8f6449b80a104..937ad099f8f2ba8029584c42a22a2f72e2fd64a5 100644
GIT binary patch
delta 64
zcmX>rbxvx-ZXS^U1{MY;1_lNRtt|{fn;3+JxP%!dpW~4e7iREcPytGaL8KW}8PtG0
O;mOmvlqak4ssjL&*$Scn

delta 63
zcmX>nbyjM_ZXRKO1{MY;1_lOktt|{fn;3+JxP&I3=aCZ^V(?;60g8)3WEoT$)POvp
N$<w)%C#&<S0|1U#3Y`D|

diff --git a/target/classes/com/geekq/miaosha/controller/GoodsController.class b/target/classes/com/geekq/miaosha/controller/GoodsController.class
index adbdb3afd75262c94861bc5cad995cd248d63268..8400e3993be408a839c0c03dd00f72e10f122c8f 100644
GIT binary patch
delta 524
zcmXw$$uC1;6vcmiZOv1w#ITS^kTfAdnkWqt#1LbRr4$uY4HXNKknSWRv1wu@5tc$?
zT-fkW*jw1ySlV>qc&*&LoAbVVzjM#I-@WI?a~E<|^pT-}<65UtYJ0(IWzzkG?E$+p
zt&sSk>mXJ~wmO=Wo2j6M8hp5ErI9w}c0zQpO(%PFaYVNQ{7F`N=+&S2>1P0oi3S<M
zFwrn0SWV<-6r0%B8Dku~xF-~oq!FspuqgthGp*JfktB;VDh74pz)0YZUlw^Y!<y;@
zOL_dWsM?VHtl~s$oicR|O8yA-66Vz?pUAsK?-y@SyvxiGVU{iC*pZ=q<~d-26BdaR
z=8PrI)pfxNSFCX-p|5Q6A>-df`C-RW!merkl)OI)|JGxIDepol??Nf>LP_s`S5`%B
zm&h-33+bYJ*Pw`81$kpb)l7+a*5EbSiActlP_FW=gha`g_-lPp3M9>Et}Vx5Zm9u#
V0^g&nBw%D$nhyb4+R$EE^Dj2zQ&<21

delta 529
zcmXYuyGvVP7{-6OCpM<$ptX%4xCjvnB@l>-wiT_dVA5*UG)>#|Vp9{X^#UR&W)j4q
zLl2z_0avj!^)fh=F8vdn#o3{wQwE=N5<bqy^L_98J(u?!#DB+Yh4$_=el6I!YdG(?
zPjR`(_8sFs#AA33bE|!`5+kUF1UE?1O^RLyh;pA84;bVjBMk9|VHSnfc*Hi3wP3PA
z%oE0Rk_6+Vao8xsQ=B$>#sn@KP4XPK6v|97jYs@5TG=RG(f9F!96nyEH7JrsF|XPy
z-Gp)0iJH}p{y<Tx1~?+-MMtm0F#Wgcl|{PLlu?2S?#Wj|N-1%VlGRO)yl6jaFY}tu
z5?i9cI&azF9lN~e8z1=2EI%kx<r909_@(YY>i(zP=X~M6UR|;5=w#JS|CNyC!b)F}
zxCNW>g_`k&n(>7i@vXi&(R*a{(jJ6QHqRtBuV8upvY=`}c26W;Qlv69St!w}^G_LB
n;-<cRmbJIZ+5m0V=)(4(VtDGLjzYI{&XykgUqHYxS0c%4ZB10s

diff --git a/target/classes/com/geekq/miaosha/controller/LoginController.class b/target/classes/com/geekq/miaosha/controller/LoginController.class
index 684d5e40d46c87948a91e67a3c59d64e646e5488..3d02cc8b5b17793bf55a5c56ddec5f2a3e585074 100644
GIT binary patch
delta 23
ccmdlkw?l5jXFhHv21W)D;1Xt-{Fl!P08Fd}fB*mh

delta 22
bcmdlXw_R?-XFe`P21W)D;1rttkIxDKNZ|#2

diff --git a/target/classes/com/geekq/miaosha/controller/MiaoshaController.class b/target/classes/com/geekq/miaosha/controller/MiaoshaController.class
index 45d4cfec0f3656cd5fe5e3a6cfcf4a46c06fb556..c75dcc9d9d3c7db3829663816c843f70552879b7 100644
GIT binary patch
delta 1545
zcma)+XLyuF5Xb-jE7`lf1=5pCE(xIsB!OrYkfM-CO+pb3kH!yhDx#30Mk%%fu@j}d
ziee!uwul<!AR=nSiem4I#$Hjxh!szCHrx~Vzz06;%<Sy!%x`Azy{6Lk(#ZCGTiO7W
zaJt55v?#3CaG}MIQFzpk4Tx%N#3s9K)p!h>t?zNW-J<aXp44~>Z5mHwt37zeZlARY
zo>O>UBMC29_lq`un;$RXWrgh;>1grc6{}y3SoxY2uWP)4H|?FbY=XBH-qFZIixux$
z@t)1{zQzamP~#))uwWniFe89Z&~Dj2wc;}?KDXkF0KUXmK76h54ZhX*4&PhxgThXY
z68vb%ei~+z?$Y=fy94+I9Rd7`Jy!gt@Vmxv+hIEXu-2az@GphG74|Cp6CKLk?qFi&
zobbGGaZR{xc5!8W-Ru#BtG1RXbi#?L&S>udUrga&Vp)G@h9@`L=xz6Mr?bZ2*O?hm
z&Z@w=1lKuz2no$hcS_A%&pw6!ob_gDgfJvsif%&>y#|$-q?ll+=ri=wWl)X^MQs?M
zks^lO*j=%QVIq?ZlO=*FOf^hnI+1jMv#h?pW>&b)FoT(fL7QnD#w%tSW-~-&*idIr
za*BWnL=JPU$TRH8e8padz1hd6?rV4i`#Bxm2F>ix0fq%EG?<JjibaM4IY_bCh8<~m
z6iXD3Hav!d4To^3;jtWMIGiI4NAftu;|)h~G~p?qI#x(Z4a<0f;uyoRs4^VqM7n1U
z9B<7D7Iy+BDo!*kXNAH(!%9w)u^CRb4Nc)xBIGPJAsIyuPc)pylMGL0mDAC^+28e4
z(Um>g7!4<F@_D21BH(0aEmp(*L4PZZvo@<wiVo`hR^$hDQ7d{CY((#%c6MY<V8rR2
zJwFn`c+A0E_|c3U)Swm`b@C-;z#E7mlQD!8>SM?iYm~ydm?noVoQE-@i{ZxkvKl7h
z0$gatylTwH0tr}n8rXn~aIxrFxCEEtGPw|umF*D$5Q}7`Eo?wo^kP|Jo+0XTEOClL
zD<W6mbm_;kxWTk|-762T?p0lNukNaw=su`!yzDi&79LEOgRN4_Cwg$vHs}rTZgxiI
z)VQz1QfFOGcBB#4%Xy|uXco>wf;65WtY<=X@+r7FXBB6>;qVxj9fGmv!Lx}oE`lr3
z&ZZH|8?ZtKv=WX}mD^N!BW@C?T=}q9;bs9E0)tzyT6{nmPDOQRzh$@;w>f!v8P#@_
z7WHg}+vBKrbfSjjy$-zDnnQ3MYIaSil6!V`yPV~Dt0M(6$$l7&J8_r1SSl)TH`Yo7
zFf$J0!zs82_eu-*iPwnU@3~(r3zr0U4BZqSh#^6td9VC4JSc9D9G6I<bz-~lP$zP-
QSP#p7ft>CCsqvBj0m{ZICjbBd

delta 1522
zcma)6XK++i6#mYZ+}-zX>ZXunHw_ShkVrH{u!KZP5)#@NN6{JBI1CP?psNWsHed%^
zyrN<OyJE0}U_cZ^MN#Ypu|*UFyVw=n5YO3UV3^?tKkj$VJ@=IFocr$UE?Zd^-ga=q
zCICe=-NIP3E3CHQK)V;Ec+!if@U(?z&>`D37CNz3Y|qNJ%fdRWx9}V`Sa=>U$iYV0
zZjuBqDr~lph?m6tviQH^#TLA(@S25Gw0p2s<m+L<Hw3m>coT0)%-fRS9ffx-WTRc+
zJ%RTn%Lf)d#77pk<6|MV!-JVNKEbEL?K6ST1-=mIw(%u)dhnHnud&O*ZhRxKM`5pp
zB77^%z8ft`zqjxMezfruezx%o_6hu|@SBA((qSro7wr!r_@}~O3V$p7(^*3MoH34u
z2EuSNG9lTlPWGDf+&T1bXREu{O?yqNy~Bj`JlB4O17??A8peMb5%ee=)aWH>RHH@_
zX>yQLlM6i>RhXp6ttp0-B9A67S&D4UKCznO*n{FJK~o|n5fbMHn}db*!Nxg-<xNfX
zvxAMAe3YyyMKVpmL`A8Z(r5r7O<c`jpU?Ehy7SU0LsL3sYVuP+QI@7`%8|^un(}BM
zVW^pw;_GiHwocO^8m#F!8lo{7QxqMqX($a-G+bixHI1MGMTMG9pplx2=tNB?QL&~`
zRHEr*8m(xIrc>xtf~#ukcxH8)rqiiZ(O6AosMS<%I^r@$oFVEsp<aPXMdLM1pot3m
zHC0e0k5E&UG&hN=34XIt`;(-J8cmaFil(VFjZk1#I19{~@e4Y;<GUz6?(l%Bn;PeI
zwk59fxI5s6HZ>WGR2OuKH`QylXAJV$>2_`xa?|bnF60eci-GC3(U}#r*wkjWgcoBR
z=AsT>tU>_uP!Ago{AyC*wj&ro5%?7vBgkT{)P?DM<UkV#0flg4KCcTaaS=iS7tg>Y
zXl93&b3q|2z@;o_<1$>1D>&dvUYRZifUuBPOUQ>H%Wzc3`7Bzo$jtJ$F|RuAMwmFk
zx87Ixs$;8r^`W}g9IBh(Jfd#2?6tTKE}X>&o4J;UWpVyiSZm;3Z{`Q;o!8?AvonzC
zT!N*hCy*8vHVTgDT>2T^cx;SrItrtlBPS7Mv`}Uj!V=sZ!Yw?FThZ3fa1UI@WGxHd
z2E$yl_~qV?Wr)EjertE&PPPH%I0rLWigp*4bG&FXF^jW`7UY>aqcfE*E>O6;zl(dK
zUHIAU@a5fm6v_$CfMn;yeYY3od>?8#P^P%sY{_2UoWnJSpcpH#k~MJkK2{!_jr;Kc
z2S3PG&9cw(5Nk5oL^vaeRd_gp7==d;@DJlrHoN$^hzmT%x&x0#nI^HeiucWY*7vDB
F@juExDfR#W

diff --git a/target/classes/com/geekq/miaosha/rabbitmq/MQConfig.class b/target/classes/com/geekq/miaosha/rabbitmq/MQConfig.class
index 67086f0e42333617e41a57b4251b4fbc01554e7d..a001fc9c1e8679a51e824dea7894174a26c04dc3 100644
GIT binary patch
delta 533
zcmYk3%T5$Q6o$WHrl*SPxlt&?01AU#43nT>T)A>JWa1XF0d)|Nn}QcEq6sE$+?tdc
zU%<qzA#{Ta-SaR$g7NeWi{8}#e}B%YQzvy&J*mDw|M%-RFwHl^b!HX!HFpdh%xNBI
z0>!-Mu0gS27-!M&kVmn5Y-qBid16>*B~Df~PZevLb%Sk}Z^T8LiY-mUP-a2%O!3^%
z&#Y!!Gq&UNf|r_Cn%D6qyYaCXx9uAacw;!^t@`=>Z~FKwbChylG9$;gvrR8G?!Nk?
zOKB=hGC_)(Y|()yd?UeG;hPEW6P`-27M@OUxA3h5_qu`HyqC^IWZb)4!}D71TwJ#0
zD*3unfz=V6ZY@7kGN<?xA-RyeErb-^9|=o|uqzJBg}SnV?T)zQRtq!!Mc3t!9(O8y
z(a>VQSXbr1_C{1(P;7X8t+_vn^{M_KV&GoQUa?ot7)&!)vqQGpw(^GI_S9=3Bejsx
dkTEw@+8=Dn2Y!$(mqkB{9*BMtJrwtuuKylOT@(NS

delta 533
zcmYk3O;1xn6o#MD-p(+$?JWZWl`2%F7@C0K!i6hVC5>Cei-=Z1{K79j#RL;KZcWA*
z{{V?wL%0`R=$;?rPcWX_vbdXh-{;LabLM1@Ysa+@r~iKa24?wYxXOa!wqj9p)6l~m
zO{iH?+||q(G|Pr8_Y5oCPuv4Tn}?c5hE>**<gsR5@kH~~(BCb8mJ~f#ywJ1^!z^ny
z6fX@`7Bux&n%6#Wc&pjeY$ca$C&y0GwrkkqonimS;oqza^7SK^JIEZ}$gg;rto!PZ
zw{ujOVv-CE*`kNM@N|lm@U;|=2+yRrS9mtX1H#u+TyfRHl9$WHc<z0n<>fo>RGjL#
zO0lVQXnSLfTQAO+{Syk45ygm-4I;|!kA!`x&?ezfsj2!yI}mfut(E5ev#!C2A$KBt
z*3e-;XsY4RR$|V(Flc!row?tG=1et=xp1ptFWS+cjAdDD*qXi6wep6`-Kke1#v2j!
dhzU1V-WhGn?|qalS4BUG?umXD-52+TzW>T}Te<)M

diff --git a/target/classes/com/geekq/miaosha/rabbitmq/MQReceiver.class b/target/classes/com/geekq/miaosha/rabbitmq/MQReceiver.class
index 97be849dbb81a691d96e17d24c20e4c709ef663c..457b1c61bdf36fa05a0278398514f853c62ca7be 100644
GIT binary patch
delta 215
zcmW;GI}QO+6vpwt@t9!>$w<^9@f`6S?-3ORqR?qHBuaK*5jG+UBGzOFf^Xd9=A3)Z
zmtXEX{YhV5@j{0vao~8xcoJUUi8#?4F<1A7`M@%8Q=C(Y{V7ilmpl!M_>`DZX0FMC
zDjRBSsk5WS0Z$uPVFj`h71f}tDG`z|lhH&n6XiX^dXH(-AtKqMOOM#!?=!%Z?l4Sh
YWib+z!T7Q`Tefd!<pn39KQ8U+4`mP>w*UYD

delta 213
zcmW-ZyAHts6ox--(aRud#LUnJmAcin6;qdX5u3rnVB--yL|;S<L_Cu>5S%*6$+`Sr
zzEAC4ySxl{L=gixT~VH>n>(6ayixL`Z<HVC3Z9)+&BNKjp^ZzACLt|ixe`25e71Di
zNwR0ikw6kyqvv8FIx_RED?~vo34I1ALdC)dsPbPjVvHu{fC*DdfB%d*WwG0Y6(SKX
VL{vxll4gb#nGNyfW!Txu@_#ek9G?IH

diff --git a/target/classes/com/geekq/miaosha/rabbitmq/MQSender.class b/target/classes/com/geekq/miaosha/rabbitmq/MQSender.class
index d7c04140dddafdf2ad67d0c4e7cfc06bd026a28c..a4e7df49e108cf1c7a4fcc79667d80295b222854 100644
GIT binary patch
delta 457
zcmYk2+b%;<5Qe|Cx7xM$+FGsinWEJLRp;|riI9jV5Snm-AdSmDM4zO3p>^Q_#N)UY
zvqG>g{(okznScISAKtrn`1bko3gkF&2@!WmFy4eu(jn#2Ks-p=aK^xd$0S+vJQXD8
zG0lv_tjiqp4hxmzfE8}1!(mag#Ihz#OZnVNXIEI&tg-H}q1j|h6CtYbudmK-A1==(
z?uvzC!C_mo!>%G$uB+bA$!X!{qHyo9r^&Nl4cj$U^2H=rxJFwdj1r1gi5i95gl%E5
zA=oL|q_7eWB%e_g2`st<O)+?M3+nFzdgzr*(MP|aX?_$jTR4-dVI4hD&IkHSUb>F9
z`O}KX*B~|mVq;J&q-DI(9sKV7(G?X2<W5Olf+2>*Ns!pD(P4Qp$Bp9GXs%+L3F@C)
PUphw2+7_d~8;`*kjW#Sq

delta 435
zcmX|-M@|Dl5Jg{)8QRRWjWNk&V-pMv!6xS%Eg^9NU_n}dg^<^XGt5a48^eMFAjCDe
z0Bb}wSoEU)mwwg%RsHUN`G;@cFRws>qDO+9#}LDH#2L{99yR2mj9MJCW!z_iyp;=@
z$tY7k)68gQJ?5C#EIbxnC(%kuvuIdi+0Z~TJaK~53af@S)-@Z3O|}e;G%2#-gX+v2
zZI*7%uPzj^>#Nh!-R0@nZTYNxrr9>^uv={lkCl#U_6++RJbgM9H6E9p!NIdR!mzF=
znuXO0wg^T9WhJR?;YUr&V0%>qpAO+h6maRJOHk2G&u_2q=I>4LOf15q2o82IDZgMt
zT!~3bOdt`~BrP#8S~amOO|RIv<j9bf=_q}FOGuwp?5j)0E7U&`u>tBgz-|pO8R$oj
La~SwPW)OY=*!C=!

diff --git a/target/classes/com/geekq/miaosha/redis/RedisPoolFactory.class b/target/classes/com/geekq/miaosha/redis/RedisPoolFactory.class
index 1c91eb8c9b2b75fbfa55f5978bbd435fe2963f34..502cc1cb621543a385793baab9deed4ba8d6a127 100644
GIT binary patch
delta 41
vcmdnNy@h+jQx?WGlb^9<i%T)EF)%O)F>o*l1EC0m9D^u>9)sBA99ACy+Mx&o

delta 45
zcmdnOy@PwhQx?Vzlb^9<OUp5^GcYg+F>o*l1EC0m9D^u>9)lQzD}(st3|1ci`CJHS

diff --git a/target/classes/com/geekq/miaosha/redis/RedisService.class b/target/classes/com/geekq/miaosha/redis/RedisService.class
index 6c27047b2b82feca9ca708676f04621c7be7944a..eb6093aa4e79cc45c9af5acd61d30a60ae581c5e 100644
GIT binary patch
delta 650
zcmY+A%WG3X6o<dLX_7XNS`wO?=WToACYJ^mQk$yyK&**HDk>;SREjHGQrlX@g@Ox(
zBEAN@tB-(!6(t&wA|{FpT?zgPDi&P{ZlnuQPaa6To0&7e@0|P1EaWQLQlVQ}daAo%
zCU65gaIg~}yI98vX?8P6mSOgkJ)wC+o!7V4E=33N3wm1689`?Wa0Zh(`njm{;kdpW
zeyTp`OyopQ2&a(q7+k@_RV=Q_&>OlEnJ`$@cC_G#;L?lHuznLgr{3!=v3#@Xp)@^`
zrpMCs1e=ns#wP2;dVMsWZc@uay%6f9P!*wG2{o>}5<k=>ZJ3LW906T42ckJXGRi0R
z@tFgB;Sehvll3Gk`lq>Ms8wC;t=94JzU}Vo{APha<#Jz}GQY|{47tYf)H|H2lzPs_
zQTrJ~_wm?4GFn+ZA=y|DXivSyDoM7vk=?Y0FNBqc0p(?b@{v(~MpP$9R2O41G1QpL
zVJ4;Wa*!!`R>kyx+04J}j%0bM{J31d2)LOGdi_Dp%8|icI=Dwsc6+6+%36~i%BJ4Z
zDbAtWxb6A{THI^O%WN$*^qr{|cm3V6_nRt0Qbn;<OfC^;lS;5n^|r`oIVF!-`?4+a
gJ`ru4%r=!faIaDRwsyasNKSkE>p6IW=x@pNUsl6^6951J

delta 745
zcmY+B+e?#S7{Gt;HV@lAQ&;maH>ZA<wv|aj>e9@TnFpj)L?Mk4U35ZI^CpP0D+{xH
zOQ=w(NXRIb!jjDNuD>A&I$(6upCHzwld$jRd7s1YeSW;(Qo}@JwAZZ;=stIEFn|L%
zhLt)D!tAD=5>9Z420}D(RN`@oO*GH1yKh_6T|JUD>kpGI*cHJB1RKP~Rs0N5z%a!O
z>6UDtbATIC8Rj~-^o8s>^+o$U5o-a-`liS2EMrWT+^3px{m^sCp={W&%cU(k-CL~7
za%zh9Z03)!@I)*pF_{v#X{vZit;9NsO+3@1IoH%@{o7lrE4?MAERb7X3iV2;*FwD^
zNR(2EWfDWY)e+xW=N(35rbT8q*q$wJL2B=X`ykwsaLd9i3AZfV%6!DvuGF}W<xW~V
zaO)2L{-S!m(#SWO`OYbR(9SBI{N%Kp&&c_loX_)1Px)sp7Ib6YM{6s)v@^dpb(A&k
zvCag4c&yZXTfR*-tcrj|q`Cv2NKny0jPmB-92GCH2VIpjWG-TKy(7gHijgYa!!gpL
zL6<p0a$p5BDzjCav-){KD3YZd>{Ct-DuZ&BLY>+{r%L0bY{-c3p^M9sIccR&{-~n=
zzuv&V-n8_3BugPNagFpOhITp(eZ<VLFK#)9b+?)6i+d&q7O07fB?PuvJuri9xypm7
za@ec91eK2pl}okC+h!H!qP*h97v5%Nh(WwExaDFeDODM^BtyFj`yKh4eXzUqSYgRu
D{|J+^

diff --git a/target/classes/com/geekq/miaosha/service/MiaoShaUserService.class b/target/classes/com/geekq/miaosha/service/MiaoShaUserService.class
index 2a213f66fe689690716b1ecb731d147eb747b6ba..c738db8996d75899dd77594536bc930e14d24810 100644
GIT binary patch
delta 382
zcmY+9%Su8~6ox;KM~|0CNvO;~NkcnorDkCxsUYoU%|aUV2wiL>W%LBq88zxY&kQSw
zqH#3oDSCq%IA|S%AU5p1*3ZBGZ|$epbL_C&mtn)nCR-ZYE-LJ}$Q%uYy%~1h>`^nd
zeN$Vjh8z@K#5r|||IDn;9bB02rJF0RwffhG-T2l9j5jUW=ye>}doqjxR{Ufc$HIhk
z3JIg$S?NDUl>^bl1Ih_D%Z+}A^%gbZ!^nG*>j9z!i7|-Ilo<72JJZZaCxgsVkWjNK
zO1wgV4(6B_;DV@56laTo#-f;(D9N1{`2|}$sBFA@`V?V(dP;=|DIukWk!`P<lT}yA
zwYee5gYqA@%rYwy77^w@S_{2V^M<X#MDm{Gr0Q4YH%*3{jQG{A(I%<5UwtHPy!xs?
D6}Ucx

delta 366
zcmX|*xlRIM6oo&AfniA;0*Qt(Q6ffJ29d?Ja!Uj^v@#?<gbP+g#W#>lWu>_EA_g@v
zG*&hizJ<PkjfHnGF@JLZd(S=R+|!A@#Ljv{Cc9qt*w;AlQQ^>sS&v5pCP#jbIkB;t
zjqOw;8W$dlK9XGeMAERkD-YN9f8*!2`TgOxKDD&<rVX_WPtDzDk_ViGnP3tJQ!*)}
ztY%N8zm6&oM$9Lab6k$Q!~@QIR5NJJ>#3Z<C<DY8Cc%R65`SzKS&~U~EK?9qyDN&j
zf?+lEkYQ-73%o%|>YS`QxVqA^^{yL^p!KDf3Q;m*pCvBA@*<v=Xxq$m4@D#}l>ZNv
z*<?$+qQYBYRkmxg_oDm|Z=D9B&cRgbk+E4dtV;Se={DnGHJE9WO@`HHa@K38`V0E!
BJ&OPU

diff --git a/target/classes/com/geekq/miaosha/service/MiaoshaService.class b/target/classes/com/geekq/miaosha/service/MiaoshaService.class
index ba96442d2176cc19b68f753b27882f222ff38f97..9647ce0f62dad01cb63e8abf2f7b53d8aaa9f3de 100644
GIT binary patch
delta 212
zcmX?Vdfaq_w+QDN237_(1_lO~$sr<!Ou`J4+eEZXZ5TWmqJV-XKuMq!Lo`DSkOr~h
z84?&6!K@sHTm~jEtDK>NfrY_l^HY(n%%X3g<`rrmW8hTaoHCbzm3htNg<^^zvoA_S
zhgmRmGI%g_F?ccbFyu4zBH2?2x2F(pPay-$o<fFhh6bQL77UgQ^BCp>tw{yi&dtEW
O#rTK8dUKPcGa~@oD<v)f

delta 198
zcmX?Zden4-w+QEI237_(1_lP_$sr<!j6##!MYK$<89W)HfMO;<IiL(fG(!xK2C?E9
z5*Qf4tQ>}11|~48oS}k&g~59BGm)*#oUftA6--_tp$jzbvP5*4IYTFdJ3|-H&>n_7
zhF&D23*bf<z>O|ofEiuD(9O^QG}@fOl3^ahe4xpxKnuAUShyJfFj#GFk#uGR0IdZg
A82|tP

diff --git a/target/classes/com/geekq/miaosha/service/OrderService.class b/target/classes/com/geekq/miaosha/service/OrderService.class
index 00f7d8b9ebe35c74906a600bcbd53228b21c7d5d..056c39151bb2a134e1234424ca80985d01ff5adf 100644
GIT binary patch
delta 777
zcmX|;XH3&k6vclnw6Fd5NvY$58e<~;qJfZ*IEhLei6nkhW8$octSX8HC)T|O`bTl^
zfeV$20|mi}IB;*Axc5qoF~s*IF)umy+;h*p@4mc3Z;dxtU0+%b#PQRh6MiQh8SP{Y
znS!wf;rJbl(=kiKcn1L;vjsT@6PT#&lUz(@ieRdN8^0jez=K~W(+q-4*KCHtOlD~|
z+h7iJHJhhdaK5GsG+n6KA`Oc*EHPNxU|gmz$TM*1sV?2;)&&>KHT<it&|8^$rF?^x
zta4JoYD2*qgSD*F1J=9Pz(yCF*sNiTldWuXG-kUVr?%L^PQflgVJOm)8rH&^=C#nY
zZ@MqX7n>bO^T#FzlCyk)%&d4bC%i=D3U&+jm~pm&_PvsQ>^Jjltvy8?kQ8yyf@PTG
z5XEMNtzAS&a+nfHXSxWEn7?dYgGV_gI4&vWgybY;f^wall2lMBI4wEDS;;xdB<CrX
zT%byFk!r~$E=#UZDY>exHIi%Eb)6fMo0{F?wqD|n<SzFF_azT_D5#Y@<(cF;FGO4F
zBrka-dCeR36v<oOsrN|U^Fi{FPlC^qFMKs??Je!!B;TnD)!Td8!hcwZG2<iJgi>U{
z>de5V4oa$vh_W`pbhx9M#n6l1N>nm^NW`L9D8XH0vHUS3J^8_I*y%wl`q5u?N7I2p
z3|2n~N&j1u7{XB1+K2%RV>nj4bjQaC!juc7sx>Ghm6EI!57v631)~Hhg4Ex%SA{fH
Zu#!%^igwkKp`!bV0z)MQJmPUe^S^>Kt~dYy

delta 752
zcmX|+S4>n<6h+q?n7PcGV+K$Y(HIlThspS3G`2*ICDCa7Qe&ckiUr5s3(DAg<qazK
zE-ETIR#32_V!_^f?*+f~gLp3_=H>3Q@7a5wcWy;;esZY1s;C5L%5R&N1iiFixR()(
zRE)BTCK$tLQ^yz>8^btL$15h-Ok|R=Pxdi|sfuYfeu9cDn>d2zGTmkd*@lH|W-`mL
z**0^SYuG%)Lh}t>VCX`_78zJ<V2RDr8sjqagXK0pGu3Buek1r;VW3)FX|`HrR?4w)
z2z$w8wXI=|&06xzfOS6Bv%$wkHW}FLWeZzl;@M`#=`FUiL$On_D-vsEMmgc=h{{sz
zR^&T9+<iQIguU!@3fztA6tG_?;DCjdE*zxLBE^YyCpg(Isi!z393~>PqP60P(2edE
ziQ16pwDr^u9p#wfxNw4#LJ`G^Q|5A7D4|qwMmWnk;XK8{1qy|WlnIx(EL@>nxJs#T
z%~-DsH;k)-o5C%_Zga<Mc2~H^eZ>ReA&(SKgy*~vUh+yc=C$yKx57K#>-PyC_^2N#
zeB!h4g|CWl!gqc+e>@F5KZReEMe3`LZmTkqCV4Jz5V!sykmFCX;++(KQr!TZ=&W11
zNf)|e85T+PS6Ei1(<Ck&YNit%Xh=_bRcAB)2QuhOKOLw=Z&FFaMKbM3r$12)&|^ev
xHJyRFlc76txT**!1}O$BhWw?u7KUoUMJ8=@_2|ejU7zV=Yo3eyF;Ckk`~yadqG$jB

diff --git a/target/classes/com/geekq/miaosha/validator/IsMobileValidator.class b/target/classes/com/geekq/miaosha/validator/IsMobileValidator.class
index 49c878256e6b0ee5d340741d1335c3fe22b03dd8..7cda2466738dcbceb4ed10be66c7d517bff3b922 100644
GIT binary patch
delta 238
zcmX|*JxT*n6h_axAw1`01b>5#Xw*zH@n@3w?@Ww#76I2V5eWpb63G(mU*$4F8nJKz
zZpU7{nZoKE4)=rm5xy^G-@l(<K$jawh5Z1>L4^el9Y-XNHXTdXX+E}`%z0`#vz%Kl
zrkRmVnY0ZngK_?vCr|nFD7hbwA0J*)gG@R;mDtpLUuu3Rv(-zkENRFFnWYzUO@G!b
zy@|Q=({dx(rlhYp)>v20ZHHY<VS8*LOSe?1YgyLT^FQS%t|IEe|0d8)q!&U%yU-*q
G*!ly}Qy+@}

delta 172
zcmXAiISRr+001W|x@NP2;(=fxcqHCO67Mv&zQG^(5&KlWz&hB7g%9vO*5Ycaftg}1
zg}aVkpT`sMi4+c=jiTp}r>__=RE!u)Cd%lkWcK4+;!6Tam_(L{kHU+uA}KFeN>-XW
yYsp5lWp_Je&cX`gch+lYEVEHms6ug1jg~Pb<AV5*bDL?m(~h8Ril9UHPxlL+3l#ML