diff --git a/.gitignore b/.gitignore index 6b47367..3144313 100644 --- a/.gitignore +++ b/.gitignore @@ -1,53 +1,14 @@ -# Created by .ignore support plugin (hsz.mobi) -### Example user template template -### Example user template - # IntelliJ project files .DS_Store -.idea +.idea/ *.iml +.mvn/* out -gen### JetBrains template -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries - -# Gradle and Maven with auto-import -# When using Gradle or Maven with auto-import, you should exclude module files, -# since they will be recreated, and may cause churn. Uncomment if using -# auto-import. -# .idea/modules.xml -# .idea/*.iml -# .idea/modules - # CMake cmake-build-*/ -# Mongo Explorer plugin -.idea/**/mongoSettings.xml - # File-based project format *.iws - # IntelliJ out/ @@ -57,17 +18,12 @@ out/ # JIRA plugin atlassian-ide-plugin.xml -# Cursive Clojure plugin -.idea/replstate.xml - # Crashlytics plugin (for Android Studio and IntelliJ) com_crashlytics_export_strings.xml crashlytics.properties crashlytics-build.properties fabric.properties -# Editor-based Rest Client -.idea/httpRequests ### Java template # Compiled class file *.class @@ -88,6 +44,8 @@ fabric.properties *.zip *.tar.gz *.rar +.settings/ +.mvn/ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* @@ -100,4 +58,3 @@ pom.xml.next release.properties dependency-reduced-pom.xml buildNumber.properties -.mvn/timing.properties diff --git a/Readme2.md b/Readme2.md deleted file mode 100644 index bf5ad27..0000000 --- a/Readme2.md +++ /dev/null @@ -1 +0,0 @@ -两次md5 \ No newline at end of file diff --git a/miaosha-2version/.mvn/wrapper/maven-wrapper.jar b/miaosha-2version/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 01e6799..0000000 Binary files a/miaosha-2version/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/miaosha-2version/.mvn/wrapper/maven-wrapper.properties b/miaosha-2version/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index cd0d451..0000000 --- a/miaosha-2version/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip diff --git a/miaosha-admin/miaosha-admin-api/pom.xml b/miaosha-admin/miaosha-admin-api/pom.xml index cbcac23..4b03f11 100644 --- a/miaosha-admin/miaosha-admin-api/pom.xml +++ b/miaosha-admin/miaosha-admin-api/pom.xml @@ -4,7 +4,7 @@ com.geekq miaosha-admin - 0.0.1-SNAPSHOT + ${revision} miaosha-admin-api @@ -30,8 +30,8 @@ com.geekq - miaosha-common - 0.0.1-SNAPSHOT + miaosha-admin-common + ${revision} diff --git a/miaosha-admin/miaosha-common/.gitignore b/miaosha-admin/miaosha-admin-common/.gitignore similarity index 100% rename from miaosha-admin/miaosha-common/.gitignore rename to miaosha-admin/miaosha-admin-common/.gitignore diff --git a/miaosha-admin/miaosha-common/pom.xml b/miaosha-admin/miaosha-admin-common/pom.xml similarity index 93% rename from miaosha-admin/miaosha-common/pom.xml rename to miaosha-admin/miaosha-admin-common/pom.xml index a41fba7..0e43a4d 100644 --- a/miaosha-admin/miaosha-common/pom.xml +++ b/miaosha-admin/miaosha-admin-common/pom.xml @@ -4,9 +4,10 @@ com.geekq miaosha-admin - 0.0.1-SNAPSHOT + ${revision} - miaosha-common + miaosha-admin-common + ${revision} 3.2.3 4.0.0.RELEASE @@ -18,10 +19,6 @@ org.apache.commons commons-lang3 - - org.apache.commons - commons-io - commons-net commons-net diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/enums/Constants.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/enums/Constants.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/enums/Constants.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/enums/Constants.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/enums/MessageStatus.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/enums/MessageStatus.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/enums/MessageStatus.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/enums/MessageStatus.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/enums/OrderStatusEnum.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/enums/OrderStatusEnum.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/enums/OrderStatusEnum.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/enums/OrderStatusEnum.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/enums/ResultStatus.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/enums/ResultStatus.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/enums/ResultStatus.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/enums/ResultStatus.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/enums/SexEnum.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/enums/SexEnum.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/enums/SexEnum.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/enums/SexEnum.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/enums/YesOrNo.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/enums/YesOrNo.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/enums/YesOrNo.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/enums/YesOrNo.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/Constanst.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/Constanst.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/Constanst.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/Constanst.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/DBContextUtil.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/DBContextUtil.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/DBContextUtil.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/DBContextUtil.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/DateUtil.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/DateUtil.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/DateUtil.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/DateUtil.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/JsonUtils.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/JsonUtils.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/JsonUtils.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/JsonUtils.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/MD5/MD5Utils.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/MD5/MD5Utils.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/MD5/MD5Utils.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/MD5/MD5Utils.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/SnowflakeIdWorker.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/SnowflakeIdWorker.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/SnowflakeIdWorker.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/SnowflakeIdWorker.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/ValidatorUtil.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/ValidatorUtil.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/ValidatorUtil.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/ValidatorUtil.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/numcal/BidConst.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/BidConst.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/numcal/BidConst.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/BidConst.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/numcal/BitStatesUtils.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/BitStatesUtils.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/numcal/BitStatesUtils.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/BitStatesUtils.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/numcal/CalculatetUtil.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/CalculatetUtil.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/numcal/CalculatetUtil.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/CalculatetUtil.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/numcal/DecimalFormatUtil.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/DecimalFormatUtil.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/numcal/DecimalFormatUtil.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/numcal/DecimalFormatUtil.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/resultbean/AbstractResult.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/resultbean/AbstractResult.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/resultbean/AbstractResult.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/resultbean/AbstractResult.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/resultbean/ResultGeekQ.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/resultbean/ResultGeekQ.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/resultbean/ResultGeekQ.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/resultbean/ResultGeekQ.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/resultbean/ResultJSON.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/resultbean/ResultJSON.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/utils/resultbean/ResultJSON.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/utils/resultbean/ResultJSON.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/validator/MobileCheck.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/validator/MobileCheck.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/validator/MobileCheck.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/validator/MobileCheck.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/validator/MobileValidator.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/validator/MobileValidator.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/validator/MobileValidator.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/validator/MobileValidator.java diff --git a/miaosha-admin/miaosha-common/src/main/java/com/geekq/common/vo/LoginVo.java b/miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/vo/LoginVo.java similarity index 100% rename from miaosha-admin/miaosha-common/src/main/java/com/geekq/common/vo/LoginVo.java rename to miaosha-admin/miaosha-admin-common/src/main/java/com/geekq/common/vo/LoginVo.java diff --git a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.common.component b/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.common.component index 4a133e1..ba977e2 100644 --- a/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.common.component +++ b/miaosha-admin/miaosha-admin-service/.settings/org.eclipse.wst.common.component @@ -4,7 +4,7 @@ - + uses diff --git a/miaosha-admin/miaosha-admin-service/pom.xml b/miaosha-admin/miaosha-admin-service/pom.xml index 24146ba..51ed283 100644 --- a/miaosha-admin/miaosha-admin-service/pom.xml +++ b/miaosha-admin/miaosha-admin-service/pom.xml @@ -4,7 +4,7 @@ com.geekq miaosha-admin - 0.0.1-SNAPSHOT + ${revision} miaosha-admin-service @@ -12,23 +12,16 @@ - org.springframework.data spring-data-redis 1.8.4.RELEASE - - redis.clients - jedis - 2.9.0 - - com.geekq miaosha-admin-api - 0.0.1-SNAPSHOT + ${revision} diff --git a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.common.component b/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.common.component index c9288b9..e34c054 100644 --- a/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.common.component +++ b/miaosha-admin/miaosha-admin-web/.settings/org.eclipse.wst.common.component @@ -4,13 +4,13 @@ - + uses - + uses - + uses diff --git a/miaosha-admin/miaosha-admin-web/pom.xml b/miaosha-admin/miaosha-admin-web/pom.xml index 4e5fc26..c7bdc52 100644 --- a/miaosha-admin/miaosha-admin-web/pom.xml +++ b/miaosha-admin/miaosha-admin-web/pom.xml @@ -4,7 +4,7 @@ com.geekq miaosha-admin - 0.0.1-SNAPSHOT + ${revision} miaosha-admin-web @@ -13,19 +13,18 @@ com.geekq - miaosha-common - 0.0.1-SNAPSHOT + miaosha-admin-common + ${revision} com.geekq miaosha-admin-api - 0.0.1-SNAPSHOT + ${revision} - com.geekq miaosha-admin-service - 0.0.1-SNAPSHOT + ${revision} diff --git a/miaosha-admin/pom.xml b/miaosha-admin/pom.xml index 797d665..19d2105 100644 --- a/miaosha-admin/pom.xml +++ b/miaosha-admin/pom.xml @@ -3,9 +3,14 @@ 4.0.0 com.geekq miaosha-admin - 0.0.1-SNAPSHOT + ${revision} pom - + + com.geekq + miaosha-parent + ${revision} + ../pom.xml + 4.3.13.RELEASE @@ -23,7 +28,6 @@ 2.5 2.0 3.3.2 - 1.3.2 3.3 4.1.3 0.9.1 @@ -39,24 +43,6 @@ - - - - - - - - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - org.apache.commons - commons-io - ${commons-io.version} - commons-net commons-net @@ -145,12 +131,6 @@ spring-webmvc ${spring.version} - - - - - - org.springframework spring-jdbc @@ -298,7 +278,7 @@ - miaosha-common + miaosha-admin-common miaosha-admin-api miaosha-admin-service miaosha-admin-web diff --git a/miaosha-order/miaosha-order-api/pom.xml b/miaosha-order/miaosha-order-api/pom.xml index 73ba43c..6d301e6 100644 --- a/miaosha-order/miaosha-order-api/pom.xml +++ b/miaosha-order/miaosha-order-api/pom.xml @@ -5,7 +5,19 @@ com.geekq.api miaosha-order-api - 0.0.1-SNAPSHOT + ${revision} + + + + org.apache.maven.plugins + maven-compiler-plugin + + 7 + 7 + + + + miaosha-order-api Dubbo api for Spring Boot @@ -13,6 +25,6 @@ com.geekq.dubbo miaosha-order - 0.0.1-SNAPSHOT + ${revision} diff --git a/miaosha-order/miaosha-order-provider/pom.xml b/miaosha-order/miaosha-order-provider/pom.xml index 743aebd..5c43024 100644 --- a/miaosha-order/miaosha-order-provider/pom.xml +++ b/miaosha-order/miaosha-order-provider/pom.xml @@ -2,21 +2,19 @@ 4.0.0 - + + com.geekq.dubbo + miaosha-order + ${revision} + com.geekq.provider miaosha-order-provider - 0.0.1-SNAPSHOT + ${revision} jar miaosha-order-provider Dubbo provider for Spring Boot - - com.geekq.dubbo - miaosha-order - 0.0.1-SNAPSHOT - - UTF-8 UTF-8 @@ -27,7 +25,7 @@ com.geekq.api miaosha-order-api - 0.0.1-SNAPSHOT + ${revision} diff --git a/miaosha-order/pom.xml b/miaosha-order/pom.xml index c6eccee..f20532c 100644 --- a/miaosha-order/pom.xml +++ b/miaosha-order/pom.xml @@ -2,27 +2,22 @@ 4.0.0 - + + com.geekq + miaosha-parent + ${revision} + ../pom.xml + com.geekq.dubbo miaosha-order - 0.0.1-SNAPSHOT + ${revision} pom - + ${project.artifactId} miaosha-order-api miaosha-order-provider - - miaosha-order Dubbo springboot for Spring Boot - - - org.springframework.boot - spring-boot-starter-parent - 2.0.4.RELEASE - - - UTF-8 UTF-8 @@ -46,64 +41,38 @@ 1.18.2 provided - - org.mybatis.spring.boot mybatis-spring-boot-starter ${org.mybatis.version} - - - - - - - com.alibaba.boot dubbo-spring-boot-starter ${dubbo.starter.version} - org.apache.curator curator-framework ${curator-framework.version} - org.apache.zookeeper zookeeper ${zookeeper.version} - org.springframework.boot spring-boot-starter-test test - mysql mysql-connector-java - com.alibaba druid - ${com.alibaba.druid} - - - - - - - - - - - diff --git a/springboot-dubbo/.gitignore b/miaosha-rpc/.gitignore similarity index 100% rename from springboot-dubbo/.gitignore rename to miaosha-rpc/.gitignore diff --git a/miaosha-rpc/dubbo-api/pom.xml b/miaosha-rpc/dubbo-api/pom.xml new file mode 100644 index 0000000..788e573 --- /dev/null +++ b/miaosha-rpc/dubbo-api/pom.xml @@ -0,0 +1,26 @@ + + + + + com.geekq + miaosha-rpc + ${revision} + + 4.0.0 + + dubbo-api + ${project.artifactId} + + UTF-8 + + + + + junit + junit + 4.13.2 + test + + + diff --git a/springboot-dubbo/dubbo-api/src/main/java/com/geekq/dubbo/springboot/CapAccountTradeOrderService.java b/miaosha-rpc/dubbo-api/src/main/java/com/geekq/dubbo/springboot/CapAccountTradeOrderService.java similarity index 66% rename from springboot-dubbo/dubbo-api/src/main/java/com/geekq/dubbo/springboot/CapAccountTradeOrderService.java rename to miaosha-rpc/dubbo-api/src/main/java/com/geekq/dubbo/springboot/CapAccountTradeOrderService.java index 865ed0b..d8a1013 100644 --- a/springboot-dubbo/dubbo-api/src/main/java/com/geekq/dubbo/springboot/CapAccountTradeOrderService.java +++ b/miaosha-rpc/dubbo-api/src/main/java/com/geekq/dubbo/springboot/CapAccountTradeOrderService.java @@ -1,7 +1,6 @@ package com.geekq.dubbo.springboot; import dto.CapitalTradeOrderDto; -import org.mengyun.tcctransaction.api.Compensable; import java.math.BigDecimal; @@ -9,11 +8,7 @@ import java.math.BigDecimal; * @author qiurunze */ public interface CapAccountTradeOrderService { + BigDecimal getCapAccountByUserId(Long userId); - - BigDecimal getCapAccountByUserId(Long userId ); - - @Compensable public String record(CapitalTradeOrderDto tradeOrderDto); - } diff --git a/springboot-dubbo/dubbo-api/src/main/java/com/geekq/dubbo/springboot/ServiceAPI.java b/miaosha-rpc/dubbo-api/src/main/java/com/geekq/dubbo/springboot/ServiceAPI.java similarity index 78% rename from springboot-dubbo/dubbo-api/src/main/java/com/geekq/dubbo/springboot/ServiceAPI.java rename to miaosha-rpc/dubbo-api/src/main/java/com/geekq/dubbo/springboot/ServiceAPI.java index 3436aef..adbf0a5 100644 --- a/springboot-dubbo/dubbo-api/src/main/java/com/geekq/dubbo/springboot/ServiceAPI.java +++ b/miaosha-rpc/dubbo-api/src/main/java/com/geekq/dubbo/springboot/ServiceAPI.java @@ -1,10 +1,7 @@ package com.geekq.dubbo.springboot; -import org.mengyun.tcctransaction.api.Compensable; - public interface ServiceAPI { - @Compensable String sendMessage(String message); /* @@ -20,17 +17,12 @@ public interface ServiceAPI { */ // 判断是否为真座位 - @Compensable boolean isTrueSeats(String seats); // 是否已售 - @Compensable boolean isNotSold(String seats); // 保存订单 - @Compensable - String saveOrder(String fieldId,String seats,String seatsNum); - - + String saveOrder(String fieldId, String seats, String seatsNum); } diff --git a/springboot-dubbo/dubbo-api/src/main/java/dto/CapitalTradeOrderDto.java b/miaosha-rpc/dubbo-api/src/main/java/dto/CapitalTradeOrderDto.java similarity index 100% rename from springboot-dubbo/dubbo-api/src/main/java/dto/CapitalTradeOrderDto.java rename to miaosha-rpc/dubbo-api/src/main/java/dto/CapitalTradeOrderDto.java diff --git a/springboot-dubbo/dubbo-api/src/test/java/com/geekq/dubbo/springboot/AppTest.java b/miaosha-rpc/dubbo-api/src/test/java/com/geekq/dubbo/springboot/AppTest.java similarity index 100% rename from springboot-dubbo/dubbo-api/src/test/java/com/geekq/dubbo/springboot/AppTest.java rename to miaosha-rpc/dubbo-api/src/test/java/com/geekq/dubbo/springboot/AppTest.java diff --git a/springboot-dubbo/consumer/.gitignore b/miaosha-rpc/dubbo-consumer/.gitignore similarity index 100% rename from springboot-dubbo/consumer/.gitignore rename to miaosha-rpc/dubbo-consumer/.gitignore diff --git a/springboot-dubbo/consumer/mvnw b/miaosha-rpc/dubbo-consumer/mvnw similarity index 100% rename from springboot-dubbo/consumer/mvnw rename to miaosha-rpc/dubbo-consumer/mvnw diff --git a/springboot-dubbo/consumer/mvnw.cmd b/miaosha-rpc/dubbo-consumer/mvnw.cmd similarity index 100% rename from springboot-dubbo/consumer/mvnw.cmd rename to miaosha-rpc/dubbo-consumer/mvnw.cmd diff --git a/springboot-dubbo/consumer/pom.xml b/miaosha-rpc/dubbo-consumer/pom.xml similarity index 69% rename from springboot-dubbo/consumer/pom.xml rename to miaosha-rpc/dubbo-consumer/pom.xml index a9b02f4..20e60a7 100644 --- a/springboot-dubbo/consumer/pom.xml +++ b/miaosha-rpc/dubbo-consumer/pom.xml @@ -2,33 +2,31 @@ 4.0.0 - - com.geekq.dubbo.springboot - consumer - 0.0.1-SNAPSHOT + + com.geekq + miaosha-rpc + ${revision} + + dubbo-consumer + ${revision} jar - consumer + ${project.artifactId} 服务消费者 - - - org.springframework.boot - spring-boot-starter-parent - 2.0.3.RELEASE - - - UTF-8 UTF-8 1.8 - org.springframework.boot spring-boot-starter + + com.geekq + dubbo-api + com.alibaba.spring.boot dubbo-spring-boot-starter @@ -44,31 +42,6 @@ zkclient 0.10 - - com.geekq.dubbo.springboot - dubbo-api - 0.0.1-SNAPSHOT - - - org.mengyun - tcc-transaction-dubbo - 1.2.4.24 - - - org.mengyun - tcc-transaction-spring - 1.2.4.24 - - - org.mengyun - tcc-transaction-core - 1.2.4.24 - - - org.mengyun - tcc-transaction-api - 1.2.4.24 - com.alibaba druid @@ -87,12 +60,6 @@ org.quartz-scheduler quartz 2.2.1 - - - slf4j-api - org.slf4j - - org.springframework @@ -105,7 +72,6 @@ com.google.guava guava - 23.0 com.esotericsoftware @@ -115,14 +81,12 @@ org.apache.commons commons-lang3 - 3.8.1 com.alibaba fastjson 1.2.51 - diff --git a/springboot-dubbo/consumer/src/main/java/com/geekq/dubbo/springboot/consumer/ConsumerApplication.java b/miaosha-rpc/dubbo-consumer/src/main/java/com/geekq/dubbo/springboot/consumer/ConsumerApplication.java similarity index 100% rename from springboot-dubbo/consumer/src/main/java/com/geekq/dubbo/springboot/consumer/ConsumerApplication.java rename to miaosha-rpc/dubbo-consumer/src/main/java/com/geekq/dubbo/springboot/consumer/ConsumerApplication.java diff --git a/miaosha-rpc/dubbo-consumer/src/main/java/com/geekq/dubbo/springboot/consumer/config/TCCConfig.java b/miaosha-rpc/dubbo-consumer/src/main/java/com/geekq/dubbo/springboot/consumer/config/TCCConfig.java new file mode 100644 index 0000000..e52d3ee --- /dev/null +++ b/miaosha-rpc/dubbo-consumer/src/main/java/com/geekq/dubbo/springboot/consumer/config/TCCConfig.java @@ -0,0 +1,7 @@ +package com.geekq.dubbo.springboot.consumer.config; + +import org.springframework.context.annotation.Configuration; + +@Configuration +public class TCCConfig { +} diff --git a/springboot-dubbo/consumer/src/main/java/com/geekq/dubbo/springboot/consumer/quickstart/QuickstartConsumer.java b/miaosha-rpc/dubbo-consumer/src/main/java/com/geekq/dubbo/springboot/consumer/quickstart/QuickstartConsumer.java similarity index 88% rename from springboot-dubbo/consumer/src/main/java/com/geekq/dubbo/springboot/consumer/quickstart/QuickstartConsumer.java rename to miaosha-rpc/dubbo-consumer/src/main/java/com/geekq/dubbo/springboot/consumer/quickstart/QuickstartConsumer.java index 6cf0a83..b883bf8 100644 --- a/springboot-dubbo/consumer/src/main/java/com/geekq/dubbo/springboot/consumer/quickstart/QuickstartConsumer.java +++ b/miaosha-rpc/dubbo-consumer/src/main/java/com/geekq/dubbo/springboot/consumer/quickstart/QuickstartConsumer.java @@ -9,10 +9,8 @@ public class QuickstartConsumer { @Reference(interfaceClass = ServiceAPI.class) ServiceAPI serviceAPI; - public void sendMessage(String message){ + public void sendMessage(String message) { System.out.println(serviceAPI.sendMessage(message)); } - - } diff --git a/springboot-dubbo/consumer/src/main/java/com/geekq/dubbo/springboot/consumer/transaction/TransactionConsumer.java b/miaosha-rpc/dubbo-consumer/src/main/java/com/geekq/dubbo/springboot/consumer/transaction/TransactionConsumer.java similarity index 65% rename from springboot-dubbo/consumer/src/main/java/com/geekq/dubbo/springboot/consumer/transaction/TransactionConsumer.java rename to miaosha-rpc/dubbo-consumer/src/main/java/com/geekq/dubbo/springboot/consumer/transaction/TransactionConsumer.java index d4bd84f..fded962 100644 --- a/springboot-dubbo/consumer/src/main/java/com/geekq/dubbo/springboot/consumer/transaction/TransactionConsumer.java +++ b/miaosha-rpc/dubbo-consumer/src/main/java/com/geekq/dubbo/springboot/consumer/transaction/TransactionConsumer.java @@ -1,7 +1,6 @@ package com.geekq.dubbo.springboot.consumer.transaction; import com.geekq.dubbo.springboot.ServiceAPI; -import org.mengyun.tcctransaction.api.Compensable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -9,16 +8,15 @@ import org.springframework.stereotype.Component; public class TransactionConsumer { @Autowired - ServiceAPI serviceAPI; + private ServiceAPI serviceAPI; - @Compensable(confirmMethod = "confirmSendMessage", cancelMethod = "cancelSendMessage", asyncConfirm = true) - public void sendMessage(String message){ + public void sendMessage(String message) { // System.out.println("this is consumer sendMessage message="+message); // // System.out.println(serviceAPI.sendMessage(message)); // 测试业务 - serviceAPI.saveOrder("001",message,"5"); + serviceAPI.saveOrder("001", message, "5"); serviceAPI.isTrueSeats(message); @@ -26,13 +24,13 @@ public class TransactionConsumer { } - public void confirmSendMessage(String message){ - System.out.println("this is consumer confirmSendMessage message="+message); + public void confirmSendMessage(String message) { + System.out.println("this is consumer confirmSendMessage message=" + message); // System.out.println(serviceAPI.sendMessage(message)); } - public void cancelSendMessage(String message){ - System.out.println("this is consumer cancelSendMessage message="+message); + public void cancelSendMessage(String message) { + System.out.println("this is consumer cancelSendMessage message=" + message); // System.out.println(serviceAPI.sendMessage(message)); } } diff --git a/springboot-dubbo/consumer/src/main/resources/application.properties b/miaosha-rpc/dubbo-consumer/src/main/resources/application.properties similarity index 100% rename from springboot-dubbo/consumer/src/main/resources/application.properties rename to miaosha-rpc/dubbo-consumer/src/main/resources/application.properties diff --git a/springboot-dubbo/privoder/.gitignore b/miaosha-rpc/dubbo-provider/.gitignore similarity index 100% rename from springboot-dubbo/privoder/.gitignore rename to miaosha-rpc/dubbo-provider/.gitignore diff --git a/springboot-dubbo/mvnw b/miaosha-rpc/dubbo-provider/mvnw similarity index 100% rename from springboot-dubbo/mvnw rename to miaosha-rpc/dubbo-provider/mvnw diff --git a/springboot-dubbo/mvnw.cmd b/miaosha-rpc/dubbo-provider/mvnw.cmd similarity index 100% rename from springboot-dubbo/mvnw.cmd rename to miaosha-rpc/dubbo-provider/mvnw.cmd diff --git a/springboot-dubbo/privoder/pom.xml b/miaosha-rpc/dubbo-provider/pom.xml similarity index 74% rename from springboot-dubbo/privoder/pom.xml rename to miaosha-rpc/dubbo-provider/pom.xml index 3d7f52f..ca6fe43 100644 --- a/springboot-dubbo/privoder/pom.xml +++ b/miaosha-rpc/dubbo-provider/pom.xml @@ -2,22 +2,18 @@ 4.0.0 - - com.geekq.dubbo.springboot - privoder - 0.0.1-SNAPSHOT + + com.geekq + miaosha-rpc + ${revision} + + dubbo-provider + ${revision} jar - privoder + ${project.artifactId} 服务提供者 - - org.springframework.boot - spring-boot-starter-parent - 2.0.3.RELEASE - - - UTF-8 UTF-8 @@ -29,6 +25,10 @@ org.springframework.boot spring-boot-starter + + com.geekq + dubbo-api + com.alibaba.spring.boot dubbo-spring-boot-starter @@ -44,31 +44,6 @@ zkclient 0.10 - - com.geekq.dubbo.springboot - dubbo-api - 0.0.1-SNAPSHOT - - - org.mengyun - tcc-transaction-dubbo - 1.2.4.24 - - - org.mengyun - tcc-transaction-spring - 1.2.4.24 - - - org.mengyun - tcc-transaction-core - 1.2.4.24 - - - org.mengyun - tcc-transaction-api - 1.2.4.24 - com.alibaba druid @@ -77,7 +52,6 @@ mysql mysql-connector-java - 5.1.10 org.springframework.boot diff --git a/springboot-dubbo/privoder/src/main/java/com/geekq/dubbo/springboot/privoder/PrivoderApplication.java b/miaosha-rpc/dubbo-provider/src/main/java/com/geekq/dubbo/springboot/privoder/PrivoderApplication.java similarity index 100% rename from springboot-dubbo/privoder/src/main/java/com/geekq/dubbo/springboot/privoder/PrivoderApplication.java rename to miaosha-rpc/dubbo-provider/src/main/java/com/geekq/dubbo/springboot/privoder/PrivoderApplication.java diff --git a/miaosha-rpc/dubbo-provider/src/main/java/com/geekq/dubbo/springboot/privoder/config/TCCConfig.java b/miaosha-rpc/dubbo-provider/src/main/java/com/geekq/dubbo/springboot/privoder/config/TCCConfig.java new file mode 100644 index 0000000..bb583f1 --- /dev/null +++ b/miaosha-rpc/dubbo-provider/src/main/java/com/geekq/dubbo/springboot/privoder/config/TCCConfig.java @@ -0,0 +1,7 @@ +package com.geekq.dubbo.springboot.privoder.config; + +import org.springframework.context.annotation.Configuration; + +@Configuration +public class TCCConfig { +} diff --git a/springboot-dubbo/privoder/src/main/java/com/geekq/dubbo/springboot/privoder/quickstart/QuickstartServiceImpl.java b/miaosha-rpc/dubbo-provider/src/main/java/com/geekq/dubbo/springboot/privoder/quickstart/QuickstartServiceImpl.java similarity index 91% rename from springboot-dubbo/privoder/src/main/java/com/geekq/dubbo/springboot/privoder/quickstart/QuickstartServiceImpl.java rename to miaosha-rpc/dubbo-provider/src/main/java/com/geekq/dubbo/springboot/privoder/quickstart/QuickstartServiceImpl.java index e822cd0..9c08208 100644 --- a/springboot-dubbo/privoder/src/main/java/com/geekq/dubbo/springboot/privoder/quickstart/QuickstartServiceImpl.java +++ b/miaosha-rpc/dubbo-provider/src/main/java/com/geekq/dubbo/springboot/privoder/quickstart/QuickstartServiceImpl.java @@ -1,5 +1,6 @@ package com.geekq.dubbo.springboot.privoder.quickstart; + import com.geekq.dubbo.springboot.ServiceAPI; //@Component @@ -8,7 +9,7 @@ public class QuickstartServiceImpl implements ServiceAPI { @Override public String sendMessage(String message) { - return "quickstart-provider-message="+message; + return "quickstart-provider-message=" + message; } @Override diff --git a/springboot-dubbo/privoder/src/main/java/com/geekq/dubbo/springboot/privoder/transaction/CapServiceImpl.java b/miaosha-rpc/dubbo-provider/src/main/java/com/geekq/dubbo/springboot/privoder/transaction/CapServiceImpl.java similarity index 100% rename from springboot-dubbo/privoder/src/main/java/com/geekq/dubbo/springboot/privoder/transaction/CapServiceImpl.java rename to miaosha-rpc/dubbo-provider/src/main/java/com/geekq/dubbo/springboot/privoder/transaction/CapServiceImpl.java diff --git a/springboot-dubbo/privoder/src/main/java/com/geekq/dubbo/springboot/privoder/transaction/TransactionServiceImpl.java b/miaosha-rpc/dubbo-provider/src/main/java/com/geekq/dubbo/springboot/privoder/transaction/TransactionServiceImpl.java similarity index 64% rename from springboot-dubbo/privoder/src/main/java/com/geekq/dubbo/springboot/privoder/transaction/TransactionServiceImpl.java rename to miaosha-rpc/dubbo-provider/src/main/java/com/geekq/dubbo/springboot/privoder/transaction/TransactionServiceImpl.java index 0e70f6d..1950bae 100644 --- a/springboot-dubbo/privoder/src/main/java/com/geekq/dubbo/springboot/privoder/transaction/TransactionServiceImpl.java +++ b/miaosha-rpc/dubbo-provider/src/main/java/com/geekq/dubbo/springboot/privoder/transaction/TransactionServiceImpl.java @@ -2,8 +2,6 @@ package com.geekq.dubbo.springboot.privoder.transaction; import com.alibaba.dubbo.config.annotation.Service; import com.geekq.dubbo.springboot.ServiceAPI; -import org.mengyun.tcctransaction.api.Compensable; -import org.mengyun.tcctransaction.dubbo.context.DubboTransactionContextEditor; import org.springframework.stereotype.Component; @Component @@ -11,57 +9,53 @@ import org.springframework.stereotype.Component; public class TransactionServiceImpl implements ServiceAPI { @Override - @Compensable(confirmMethod = "confirmSendMessage", cancelMethod = "cancelSendMessage", transactionContextEditor = DubboTransactionContextEditor.class) public String sendMessage(String message) { - System.out.println("this is sendMessage try message="+message); - if(message.equals("123")){ + System.out.println("this is sendMessage try message=" + message); + if (message.equals("123")) { throw new NullPointerException(); } - return "quickstart-provider-message="+message; + return "quickstart-provider-message=" + message; } @Override - @Compensable(confirmMethod = "confirmIsTrueSeats", cancelMethod = "cancelIsTrueSeats", transactionContextEditor = DubboTransactionContextEditor.class) public boolean isTrueSeats(String seats) { - if(seats.equals("1,2,3")){ + if (seats.equals("1,2,3")) { throw new IllegalArgumentException(); - }else{ + } else { return true; } } - @Override - @Compensable(confirmMethod = "confirmIsNotSold", cancelMethod = "cancelIsNotSold", transactionContextEditor = DubboTransactionContextEditor.class) public boolean isNotSold(String seats) { - if(seats.equals("4,5")){ + if (seats.equals("4,5")) { throw new IllegalArgumentException(); - }else{ + } else { return true; } } - /* - 千万千万注意幂等性问题 + /** + * 千万千万注意幂等性问题 */ - @Override - @Compensable(confirmMethod = "confirmSaveOrder", cancelMethod = "cancelSaveOrder", transactionContextEditor = DubboTransactionContextEditor.class) public String saveOrder(String fieldId, String seats, String seatsNum) { System.out.println("创建一个待支付状态的订单"); return ""; } + public String confirmSaveOrder(String fieldId, String seats, String seatsNum) { System.out.println("将订单修改为支付中"); return ""; } + public String cancelSaveOrder(String fieldId, String seats, String seatsNum) { System.out.println("将订单修改为已关闭"); return ""; } public String confirmSendMessage(String message) { - System.out.println("this is confirmSendMessage message="+message); - return "quickstart-provider-message="+message; + System.out.println("this is confirmSendMessage message=" + message); + return "quickstart-provider-message=" + message; } public String cancelSendMessage(String message) { @@ -73,14 +67,17 @@ public class TransactionServiceImpl implements ServiceAPI { System.out.println("this is confirmIsTrueSeats"); return true; } + public boolean cancelIsTrueSeats(String seats) { System.out.println("this is cancelIsTrueSeats"); return true; } + public boolean confirmIsNotSold(String seats) { System.out.println("this is confirmIsNotSold"); return true; } + public boolean cancelIsNotSold(String seats) { System.out.println("this is cancelIsNotSold"); return true; diff --git a/springboot-dubbo/privoder/src/main/resources/application.properties b/miaosha-rpc/dubbo-provider/src/main/resources/application.properties similarity index 100% rename from springboot-dubbo/privoder/src/main/resources/application.properties rename to miaosha-rpc/dubbo-provider/src/main/resources/application.properties diff --git a/springboot-dubbo/privoder/mvnw b/miaosha-rpc/mvnw similarity index 100% rename from springboot-dubbo/privoder/mvnw rename to miaosha-rpc/mvnw diff --git a/springboot-dubbo/privoder/mvnw.cmd b/miaosha-rpc/mvnw.cmd similarity index 100% rename from springboot-dubbo/privoder/mvnw.cmd rename to miaosha-rpc/mvnw.cmd diff --git a/miaosha-rpc/pom.xml b/miaosha-rpc/pom.xml new file mode 100644 index 0000000..540c14e --- /dev/null +++ b/miaosha-rpc/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + com.geekq + miaosha-rpc + ${revision} + + dubbo-api + dubbo-consumer + dubbo-provider + + pom + + ${project.artifactId} + SpringBoot与Dubbo集成测试单元 + + + com.geekq + miaosha-parent + ${revision} + ../pom.xml + + + + + com.geekq + dubbo-api + ${revision} + + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/springboot-dubbo/src/main/java/com/mooc/jiangzh/dubbo/springboot/springbootdubbo/SpringbootDubboApplication.java b/miaosha-rpc/src/main/java/com/mooc/jiangzh/dubbo/springboot/springbootdubbo/SpringbootDubboApplication.java similarity index 100% rename from springboot-dubbo/src/main/java/com/mooc/jiangzh/dubbo/springboot/springbootdubbo/SpringbootDubboApplication.java rename to miaosha-rpc/src/main/java/com/mooc/jiangzh/dubbo/springboot/springbootdubbo/SpringbootDubboApplication.java diff --git a/springboot-dubbo/src/main/resources/application.properties b/miaosha-rpc/src/main/resources/application.properties similarity index 100% rename from springboot-dubbo/src/main/resources/application.properties rename to miaosha-rpc/src/main/resources/application.properties diff --git a/miaosha-v1/pom.xml b/miaosha-v1/pom.xml new file mode 100644 index 0000000..8da3773 --- /dev/null +++ b/miaosha-v1/pom.xml @@ -0,0 +1,195 @@ + + 4.0.0 + + com.geekq + miaosha-parent + ${revision} + ../pom.xml + + com.geekq.v1 + miaosha-v1 + ${revision} + ${project.artifactId} + jar + + + com.github.sgroschupf + zkclient + 0.1 + + + + org.apache.curator + curator-framework + 4.0.0 + + + org.apache.curator + curator-recipes + 4.0.0 + + + com.alibaba + dubbo + 2.5.3 + + + org.springframework + spring + + + + + org.apache.zookeeper + zookeeper + 3.4.6 + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + + + + + org.springframework.boot + spring-boot-starter-tomcat + + provided + + + + com.google.guava + guava + 31.0.1-jre + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.2.0 + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + + + + + + + + + mysql + mysql-connector-java + + + + com.alibaba + druid + 1.2.8 + + + redis.clients + jedis + + + com.alibaba + fastjson + + + commons-codec + commons-codec + + + org.apache.commons + commons-lang3 + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-amqp + + + joda-time + joda-time + 2.10.13 + + + org.projectlombok + lombok + 1.18.22 + provided + + + org.springframework.boot + spring-boot-test + + + + + + miaosha-v1/src/main/java + + **/*.xml + + + + miaosha-v1/src/main/resources + true + + application-local.properties + application-dev.properties + application-prod.properties + application-test.properties + + + + miaosha-v1/src/main/resources + true + + application-${activatedProperties}.properties + application.properties + + + + + diff --git a/src/main/java/com/geekq/miaosha/GeekQMainApplication.java b/miaosha-v1/src/main/java/com/geekq/miaosha/GeekQMainApplication.java similarity index 100% rename from src/main/java/com/geekq/miaosha/GeekQMainApplication.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/GeekQMainApplication.java diff --git a/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java b/miaosha-v1/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java similarity index 98% rename from src/main/java/com/geekq/miaosha/access/AccessInterceptor.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java index 4513ea2..3f735df 100644 --- a/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java +++ b/miaosha-v1/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java @@ -3,7 +3,6 @@ package com.geekq.miaosha.access; import com.alibaba.fastjson.JSON; import com.geekq.miaosha.common.enums.ResultStatus; import com.geekq.miaosha.common.resultbean.ResultGeekQ; -import com.geekq.miaosha.controller.LoginController; import com.geekq.miaosha.domain.MiaoshaUser; import com.geekq.miaosha.redis.RedisService; import com.geekq.miaosha.service.MiaoShaUserService; diff --git a/src/main/java/com/geekq/miaosha/access/AccessKey.java b/miaosha-v1/src/main/java/com/geekq/miaosha/access/AccessKey.java similarity index 100% rename from src/main/java/com/geekq/miaosha/access/AccessKey.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/access/AccessKey.java diff --git a/src/main/java/com/geekq/miaosha/access/AccessLimit.java b/miaosha-v1/src/main/java/com/geekq/miaosha/access/AccessLimit.java similarity index 100% rename from src/main/java/com/geekq/miaosha/access/AccessLimit.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/access/AccessLimit.java diff --git a/src/main/java/com/geekq/miaosha/access/UserContext.java b/miaosha-v1/src/main/java/com/geekq/miaosha/access/UserContext.java similarity index 100% rename from src/main/java/com/geekq/miaosha/access/UserContext.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/access/UserContext.java diff --git a/src/main/java/com/geekq/miaosha/common/Constanst.java b/miaosha-v1/src/main/java/com/geekq/miaosha/common/Constanst.java similarity index 100% rename from src/main/java/com/geekq/miaosha/common/Constanst.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/common/Constanst.java diff --git a/src/main/java/com/geekq/miaosha/common/SnowflakeIdWorker.java b/miaosha-v1/src/main/java/com/geekq/miaosha/common/SnowflakeIdWorker.java similarity index 100% rename from src/main/java/com/geekq/miaosha/common/SnowflakeIdWorker.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/common/SnowflakeIdWorker.java diff --git a/src/main/java/com/geekq/miaosha/common/enums/MessageStatus.java b/miaosha-v1/src/main/java/com/geekq/miaosha/common/enums/MessageStatus.java similarity index 100% rename from src/main/java/com/geekq/miaosha/common/enums/MessageStatus.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/common/enums/MessageStatus.java diff --git a/src/main/java/com/geekq/miaosha/common/enums/ResultStatus.java b/miaosha-v1/src/main/java/com/geekq/miaosha/common/enums/ResultStatus.java similarity index 100% rename from src/main/java/com/geekq/miaosha/common/enums/ResultStatus.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/common/enums/ResultStatus.java diff --git a/src/main/java/com/geekq/miaosha/common/resultbean/AbstractResult.java b/miaosha-v1/src/main/java/com/geekq/miaosha/common/resultbean/AbstractResult.java similarity index 100% rename from src/main/java/com/geekq/miaosha/common/resultbean/AbstractResult.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/common/resultbean/AbstractResult.java diff --git a/src/main/java/com/geekq/miaosha/common/resultbean/ResultGeekQ.java b/miaosha-v1/src/main/java/com/geekq/miaosha/common/resultbean/ResultGeekQ.java similarity index 100% rename from src/main/java/com/geekq/miaosha/common/resultbean/ResultGeekQ.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/common/resultbean/ResultGeekQ.java diff --git a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/config/DruidConfig.java b/miaosha-v1/src/main/java/com/geekq/miaosha/config/DruidConfig.java similarity index 100% rename from miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/config/DruidConfig.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/config/DruidConfig.java diff --git a/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java b/miaosha-v1/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java similarity index 100% rename from src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java diff --git a/src/main/java/com/geekq/miaosha/config/WebConfig.java b/miaosha-v1/src/main/java/com/geekq/miaosha/config/WebConfig.java similarity index 100% rename from src/main/java/com/geekq/miaosha/config/WebConfig.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/config/WebConfig.java diff --git a/src/main/java/com/geekq/miaosha/controller/BaseController.java b/miaosha-v1/src/main/java/com/geekq/miaosha/controller/BaseController.java similarity index 97% rename from src/main/java/com/geekq/miaosha/controller/BaseController.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/controller/BaseController.java index 387ab0d..c5c9f78 100644 --- a/src/main/java/com/geekq/miaosha/controller/BaseController.java +++ b/miaosha-v1/src/main/java/com/geekq/miaosha/controller/BaseController.java @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.thymeleaf.context.WebContext; -import org.thymeleaf.spring4.view.ThymeleafViewResolver; +import org.thymeleaf.spring5.view.ThymeleafViewResolver; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/geekq/miaosha/controller/GoodsController.java b/miaosha-v1/src/main/java/com/geekq/miaosha/controller/GoodsController.java similarity index 90% rename from src/main/java/com/geekq/miaosha/controller/GoodsController.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/controller/GoodsController.java index 642030c..78718f8 100644 --- a/src/main/java/com/geekq/miaosha/controller/GoodsController.java +++ b/miaosha-v1/src/main/java/com/geekq/miaosha/controller/GoodsController.java @@ -18,8 +18,7 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.thymeleaf.spring4.context.SpringWebContext; -import org.thymeleaf.spring4.view.ThymeleafViewResolver; +import org.thymeleaf.spring5.view.ThymeleafViewResolver; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -93,13 +92,13 @@ public class GoodsController extends BaseController { model.addAttribute("miaoshaStatus", miaoshaStatus); model.addAttribute("remainSeconds", remainSeconds); // return "goods_detail"; - - SpringWebContext ctx = new SpringWebContext(request,response, - request.getServletContext(),request.getLocale(), model.asMap(), applicationContext ); - html = viewResolver.getTemplateEngine().process("goods_detail", ctx); - if(!StringUtils.isEmpty(html)) { - redisService.set(GoodsKey.getGoodsDetail, ""+goodsId, html); - } +//TODO support spring5 +// SpringWebContext ctx = new SpringWebContext(request,response, +// request.getServletContext(),request.getLocale(), model.asMap(), applicationContext ); +// html = viewResolver.getTemplateEngine().process("goods_detail", ctx); +// if(!StringUtils.isEmpty(html)) { +// redisService.set(GoodsKey.getGoodsDetail, ""+goodsId, html); +// } return html; } diff --git a/src/main/java/com/geekq/miaosha/controller/LoginController.java b/miaosha-v1/src/main/java/com/geekq/miaosha/controller/LoginController.java similarity index 100% rename from src/main/java/com/geekq/miaosha/controller/LoginController.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/controller/LoginController.java diff --git a/src/main/java/com/geekq/miaosha/controller/MiaoShaMessageController.java b/miaosha-v1/src/main/java/com/geekq/miaosha/controller/MiaoShaMessageController.java similarity index 100% rename from src/main/java/com/geekq/miaosha/controller/MiaoShaMessageController.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/controller/MiaoShaMessageController.java diff --git a/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java b/miaosha-v1/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java similarity index 100% rename from src/main/java/com/geekq/miaosha/controller/MiaoshaController.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java diff --git a/src/main/java/com/geekq/miaosha/controller/OrderController.java b/miaosha-v1/src/main/java/com/geekq/miaosha/controller/OrderController.java similarity index 100% rename from src/main/java/com/geekq/miaosha/controller/OrderController.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/controller/OrderController.java diff --git a/src/main/java/com/geekq/miaosha/controller/RegisterController.java b/miaosha-v1/src/main/java/com/geekq/miaosha/controller/RegisterController.java similarity index 100% rename from src/main/java/com/geekq/miaosha/controller/RegisterController.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/controller/RegisterController.java diff --git a/src/main/java/com/geekq/miaosha/dao/GoodsDao.java b/miaosha-v1/src/main/java/com/geekq/miaosha/dao/GoodsDao.java similarity index 100% rename from src/main/java/com/geekq/miaosha/dao/GoodsDao.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/dao/GoodsDao.java diff --git a/src/main/java/com/geekq/miaosha/dao/MiaoShaMessageDao.java b/miaosha-v1/src/main/java/com/geekq/miaosha/dao/MiaoShaMessageDao.java similarity index 100% rename from src/main/java/com/geekq/miaosha/dao/MiaoShaMessageDao.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/dao/MiaoShaMessageDao.java diff --git a/src/main/java/com/geekq/miaosha/dao/MiaoShaUserDao.java b/miaosha-v1/src/main/java/com/geekq/miaosha/dao/MiaoShaUserDao.java similarity index 100% rename from src/main/java/com/geekq/miaosha/dao/MiaoShaUserDao.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/dao/MiaoShaUserDao.java diff --git a/src/main/java/com/geekq/miaosha/dao/OrderDao.java b/miaosha-v1/src/main/java/com/geekq/miaosha/dao/OrderDao.java similarity index 100% rename from src/main/java/com/geekq/miaosha/dao/OrderDao.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/dao/OrderDao.java diff --git a/src/main/java/com/geekq/miaosha/dao/UserDao.java b/miaosha-v1/src/main/java/com/geekq/miaosha/dao/UserDao.java similarity index 100% rename from src/main/java/com/geekq/miaosha/dao/UserDao.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/dao/UserDao.java diff --git a/src/main/java/com/geekq/miaosha/domain/Goods.java b/miaosha-v1/src/main/java/com/geekq/miaosha/domain/Goods.java similarity index 100% rename from src/main/java/com/geekq/miaosha/domain/Goods.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/domain/Goods.java diff --git a/src/main/java/com/geekq/miaosha/domain/MiaoShaMessageInfo.java b/miaosha-v1/src/main/java/com/geekq/miaosha/domain/MiaoShaMessageInfo.java similarity index 100% rename from src/main/java/com/geekq/miaosha/domain/MiaoShaMessageInfo.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/domain/MiaoShaMessageInfo.java diff --git a/src/main/java/com/geekq/miaosha/domain/MiaoShaMessageUser.java b/miaosha-v1/src/main/java/com/geekq/miaosha/domain/MiaoShaMessageUser.java similarity index 100% rename from src/main/java/com/geekq/miaosha/domain/MiaoShaMessageUser.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/domain/MiaoShaMessageUser.java diff --git a/src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java b/miaosha-v1/src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java similarity index 100% rename from src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java diff --git a/src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java b/miaosha-v1/src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java similarity index 100% rename from src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java diff --git a/src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java b/miaosha-v1/src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java similarity index 100% rename from src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java diff --git a/src/main/java/com/geekq/miaosha/domain/OrderInfo.java b/miaosha-v1/src/main/java/com/geekq/miaosha/domain/OrderInfo.java similarity index 100% rename from src/main/java/com/geekq/miaosha/domain/OrderInfo.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/domain/OrderInfo.java diff --git a/src/main/java/com/geekq/miaosha/domain/User.java b/miaosha-v1/src/main/java/com/geekq/miaosha/domain/User.java similarity index 100% rename from src/main/java/com/geekq/miaosha/domain/User.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/domain/User.java diff --git a/src/main/java/com/geekq/miaosha/exception/GlobleException.java b/miaosha-v1/src/main/java/com/geekq/miaosha/exception/GlobleException.java similarity index 100% rename from src/main/java/com/geekq/miaosha/exception/GlobleException.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/exception/GlobleException.java diff --git a/src/main/java/com/geekq/miaosha/exception/GlobleExceptionHandler.java b/miaosha-v1/src/main/java/com/geekq/miaosha/exception/GlobleExceptionHandler.java similarity index 100% rename from src/main/java/com/geekq/miaosha/exception/GlobleExceptionHandler.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/exception/GlobleExceptionHandler.java diff --git a/src/main/java/com/geekq/miaosha/mybatis/Mapper/UserMapper.java b/miaosha-v1/src/main/java/com/geekq/miaosha/mybatis/Mapper/UserMapper.java similarity index 100% rename from src/main/java/com/geekq/miaosha/mybatis/Mapper/UserMapper.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/mybatis/Mapper/UserMapper.java diff --git a/src/main/java/com/geekq/miaosha/mybatis/README.md b/miaosha-v1/src/main/java/com/geekq/miaosha/mybatis/README.md similarity index 100% rename from src/main/java/com/geekq/miaosha/mybatis/README.md rename to miaosha-v1/src/main/java/com/geekq/miaosha/mybatis/README.md diff --git a/src/main/java/com/geekq/miaosha/mybatis/controller/UbatisController.java b/miaosha-v1/src/main/java/com/geekq/miaosha/mybatis/controller/UbatisController.java similarity index 61% rename from src/main/java/com/geekq/miaosha/mybatis/controller/UbatisController.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/mybatis/controller/UbatisController.java index bf11852..42deb1b 100644 --- a/src/main/java/com/geekq/miaosha/mybatis/controller/UbatisController.java +++ b/miaosha-v1/src/main/java/com/geekq/miaosha/mybatis/controller/UbatisController.java @@ -1,25 +1,14 @@ package com.geekq.miaosha.mybatis.controller; -import com.geekq.miaosha.access.AccessLimit; import com.geekq.miaosha.mybatis.Mapper.UserMapper; import com.geekq.miaosha.mybatis.entity.User; import com.geekq.miaosha.mybatis.vo.TeacherListVo; import com.geekq.miaosha.mybatis.vo.TeacherVo; -import com.geekq.miaosha.redis.KeyPrefix; -import com.geekq.miaosha.redis.RedisService; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.thymeleaf.context.WebContext; -import org.thymeleaf.spring4.view.ThymeleafViewResolver; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.OutputStream; import java.util.ArrayList; import java.util.List; @@ -29,51 +18,51 @@ public class UbatisController { @Autowired - private UserMapper userMapper ; + private UserMapper userMapper; @RequestMapping(value = "/testUser", produces = "text/html") @ResponseBody - public void testMybatis(){ - User user = userMapper.getUser(1); + public void testMybatis() { + User user = userMapper.getUser(1); System.out.println(user.getId()); } @RequestMapping(value = "/testSelectLIst", produces = "text/html") @ResponseBody - public void testSelectUser(){ - List result = userMapper.getUserList(null,""); + public void testSelectUser() { + List result = userMapper.getUserList(null, ""); System.out.println(result.size()); } + @RequestMapping(value = "/testInsert", produces = "text/html") @ResponseBody - public void testInsert(){ - User user =new User(); + public void testInsert() { + User user = new User(); user.setName("xiaoming"); user.setAge(16); - int result = userMapper.insert(user); + int result = userMapper.insert(user); System.out.println(result); } - @RequestMapping(value = "/testUpdate", produces = "text/html") @ResponseBody - public void testUpdate(){ - User user =new User(); + public void testUpdate() { + User user = new User(); user.setName("xiaoming"); user.setAge(16); user.setId(1); user.setAddress("xingong"); - int result = userMapper.update(user); + int result = userMapper.update(user); System.out.println(result); } @RequestMapping(value = "/testDelete", produces = "text/html") @ResponseBody - public void testDelete(){ - int result = userMapper.delete(2 ); + public void testDelete() { + int result = userMapper.delete(2); System.out.println(result); } @@ -83,8 +72,8 @@ public class UbatisController { */ @RequestMapping(value = "/testTandU", produces = "text/html") @ResponseBody - public void testTandU(){ - List teacherAndUser = userMapper.getTeacherAndUser(1 ); + public void testTandU() { + List teacherAndUser = userMapper.getTeacherAndUser(1); System.out.println(teacherAndUser.size()); } @@ -94,12 +83,12 @@ public class UbatisController { */ @RequestMapping(value = "/testTandUIn", produces = "text/html") @ResponseBody - public void testTandUIn(){ + public void testTandUIn() { List list = new ArrayList(); list.add(1); list.add(2); - List teacherAndUser = userMapper.getTeacherAndUserList(list); + List teacherAndUser = userMapper.getTeacherAndUserList(list); System.out.println(teacherAndUser.size()); } @@ -108,9 +97,9 @@ public class UbatisController { */ @RequestMapping(value = "/testAssc", produces = "text/html") @ResponseBody - public void testAssc(){ + public void testAssc() { - List teacherAndUser = userMapper.getTeacherAndUserListVo(1 ); + List teacherAndUser = userMapper.getTeacherAndUserListVo(1); System.out.println(teacherAndUser.toString()); } } diff --git a/src/main/java/com/geekq/miaosha/mybatis/entity/User.java b/miaosha-v1/src/main/java/com/geekq/miaosha/mybatis/entity/User.java similarity index 100% rename from src/main/java/com/geekq/miaosha/mybatis/entity/User.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/mybatis/entity/User.java diff --git a/src/main/java/com/geekq/miaosha/mybatis/vo/TeacherListVo.java b/miaosha-v1/src/main/java/com/geekq/miaosha/mybatis/vo/TeacherListVo.java similarity index 96% rename from src/main/java/com/geekq/miaosha/mybatis/vo/TeacherListVo.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/mybatis/vo/TeacherListVo.java index c3ef74b..7ef1289 100644 --- a/src/main/java/com/geekq/miaosha/mybatis/vo/TeacherListVo.java +++ b/miaosha-v1/src/main/java/com/geekq/miaosha/mybatis/vo/TeacherListVo.java @@ -5,7 +5,6 @@ import lombok.Getter; import lombok.Setter; import java.io.Serializable; -import java.util.List; @Setter @Getter diff --git a/src/main/java/com/geekq/miaosha/mybatis/vo/TeacherVo.java b/miaosha-v1/src/main/java/com/geekq/miaosha/mybatis/vo/TeacherVo.java similarity index 100% rename from src/main/java/com/geekq/miaosha/mybatis/vo/TeacherVo.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/mybatis/vo/TeacherVo.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java b/miaosha-v1/src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java diff --git a/src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java b/miaosha-v1/src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java similarity index 100% rename from src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java diff --git a/src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java b/miaosha-v1/src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java similarity index 96% rename from src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java index 73f9a93..96aee07 100644 --- a/src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java +++ b/miaosha-v1/src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java @@ -1,6 +1,5 @@ package com.geekq.miaosha.rabbitmq; -import com.geekq.miaosha.domain.MiaoshaUser; import com.geekq.miaosha.redis.RedisService; import com.geekq.miaosha.vo.MiaoShaMessageVo; import org.slf4j.Logger; diff --git a/src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java b/miaosha-v1/src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java similarity index 100% rename from src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java diff --git a/src/main/java/com/geekq/miaosha/redis/BasePrefix.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/BasePrefix.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/BasePrefix.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/BasePrefix.java diff --git a/src/main/java/com/geekq/miaosha/redis/DistributedLocker.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/DistributedLocker.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/DistributedLocker.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/DistributedLocker.java diff --git a/src/main/java/com/geekq/miaosha/redis/GoodsKey.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/GoodsKey.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/GoodsKey.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/GoodsKey.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/KeyPrefix.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/KeyPrefix.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/KeyPrefix.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/KeyPrefix.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/MiaoShaUserKey.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/MiaoShaUserKey.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/MiaoShaUserKey.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/MiaoShaUserKey.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/OrderKey.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/OrderKey.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/OrderKey.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/OrderKey.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedisConfig.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedisConfig.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedisConfig.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedisConfig.java diff --git a/src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java diff --git a/src/main/java/com/geekq/miaosha/redis/RedisService.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedisService.java similarity index 99% rename from src/main/java/com/geekq/miaosha/redis/RedisService.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedisService.java index 81f2d4a..cc8ab5e 100644 --- a/src/main/java/com/geekq/miaosha/redis/RedisService.java +++ b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedisService.java @@ -247,7 +247,7 @@ public class RedisService { keys.addAll(result); } //再处理cursor - cursor = ret.getStringCursor(); + cursor = ret.getCursor(); }while(!cursor.equals("0")); return keys; } finally { diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissLockUtil.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedissLockUtil.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissLockUtil.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedissLockUtil.java diff --git a/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java diff --git a/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java diff --git a/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/RedissonProperties.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java diff --git a/src/main/java/com/geekq/miaosha/redis/RedissonService.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedissonService.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/RedissonService.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/RedissonService.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/Userkey.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/Userkey.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/Userkey.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/Userkey.java diff --git a/src/main/java/com/geekq/miaosha/redis/redismanager/OptimisticLockTest.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/OptimisticLockTest.java similarity index 98% rename from src/main/java/com/geekq/miaosha/redis/redismanager/OptimisticLockTest.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/OptimisticLockTest.java index c1856cf..79b0264 100644 --- a/src/main/java/com/geekq/miaosha/redis/redismanager/OptimisticLockTest.java +++ b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/OptimisticLockTest.java @@ -5,7 +5,6 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import com.geekq.miaosha.redis.redismanager.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; diff --git a/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLock.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLock.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/redismanager/RedisLock.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLock.java diff --git a/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLua.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLua.java similarity index 98% rename from src/main/java/com/geekq/miaosha/redis/redismanager/RedisLua.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLua.java index 7e18cba..5dcd78e 100644 --- a/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLua.java +++ b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLua.java @@ -1,6 +1,5 @@ package com.geekq.miaosha.redis.redismanager; -import com.geekq.miaosha.controller.LoginController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import redis.clients.jedis.Jedis; diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisManager.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/RedisManager.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisManager.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/RedisManager.java diff --git a/miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/RedisUtil.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/RedisUtil.java new file mode 100644 index 0000000..0f082a7 --- /dev/null +++ b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/RedisUtil.java @@ -0,0 +1,1172 @@ +package com.geekq.miaosha.redis.redismanager; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisPool; +import redis.clients.jedis.JedisPoolConfig; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class RedisUtil { + + private static final Logger LOGGER = LoggerFactory.getLogger(RedisUtil.class); + + private static JedisPool pool = null; + + private static RedisUtil ru = new RedisUtil(); + + public static void main(String[] args) { + RedisUtil redisUtil = RedisUtil.getInstance(); + redisUtil.set("test", "test"); + LOGGER.info(redisUtil.get("test")); + } + + private RedisUtil() { + if (pool == null) { + String ip = "10.75.202.11"; + int port = 6379; + JedisPoolConfig config = new JedisPoolConfig(); + config.setMaxTotal(10000); + config.setMaxIdle(2000); + config.setMaxWaitMillis(1000 * 100); + config.setTestOnBorrow(true); + pool = new JedisPool(config, ip, port, 100000); + } + + } + + public Jedis getJedis() { + Jedis jedis = pool.getResource(); + return jedis; + } + + public static RedisUtil getInstance() { + return ru; + } + + public String get(String key) { + Jedis jedis = null; + String value = null; + try { + jedis = pool.getResource(); + value = jedis.get(key); + } catch (Exception e) { + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return value; + } + + public String set(String key, String value) { + Jedis jedis = null; + try { + jedis = pool.getResource(); + return jedis.set(key, value); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + return "0"; + } finally { + returnResource(pool, jedis); + } + } + + + public Long del(String... keys) { + Jedis jedis = null; + try { + jedis = pool.getResource(); + return jedis.del(keys); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + return 0L; + } finally { + returnResource(pool, jedis); + } + } + + public Long append(String key, String str) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.append(key, str); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + return 0L; + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Boolean exists(String key) { + Jedis jedis = null; + try { + jedis = pool.getResource(); + return jedis.exists(key); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + return false; + } finally { + returnResource(pool, jedis); + } + } + + + public Long setnx(String key, String value) { + Jedis jedis = null; + try { + jedis = pool.getResource(); + return jedis.setnx(key, value); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + return 0L; + } finally { + returnResource(pool, jedis); + } + } + + + public String setex(String key, String value, int seconds) { + Jedis jedis = null; + String res = null; + try { + jedis = pool.getResource(); + res = jedis.setex(key, seconds, value); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + public Long setrange(String key, String str, int offset) { + Jedis jedis = null; + try { + jedis = pool.getResource(); + return jedis.setrange(key, offset, str); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + return 0L; + } finally { + returnResource(pool, jedis); + } + } + + public List mget(String... keys) { + Jedis jedis = null; + List values = null; + try { + jedis = pool.getResource(); + values = jedis.mget(keys); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return values; + } + + public String mset(String... keysvalues) { + Jedis jedis = null; + String res = null; + try { + jedis = pool.getResource(); + res = jedis.mset(keysvalues); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long msetnx(String... keysvalues) { + Jedis jedis = null; + Long res = 0L; + try { + jedis = pool.getResource(); + res = jedis.msetnx(keysvalues); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public String getset(String key, String value) { + Jedis jedis = null; + String res = null; + try { + jedis = pool.getResource(); + res = jedis.getSet(key, value); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public String getrange(String key, int startOffset, int endOffset) { + Jedis jedis = null; + String res = null; + try { + jedis = pool.getResource(); + res = jedis.getrange(key, startOffset, endOffset); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long incr(String key) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.incr(key); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long incrBy(String key, Long integer) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.incrBy(key, integer); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long decr(String key) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.decr(key); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long decrBy(String key, Long integer) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.decrBy(key, integer); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long serlen(String key) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.strlen(key); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long hset(String key, String field, String value) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.hset(key, field, value); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long hsetnx(String key, String field, String value) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.hsetnx(key, field, value); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public String hmset(String key, Map hash) { + Jedis jedis = null; + String res = null; + try { + jedis = pool.getResource(); + res = jedis.hmset(key, hash); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public String hget(String key, String field) { + Jedis jedis = null; + String res = null; + try { + jedis = pool.getResource(); + res = jedis.hget(key, field); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public List hmget(String key, String... fields) { + Jedis jedis = null; + List res = null; + try { + jedis = pool.getResource(); + res = jedis.hmget(key, fields); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long hincrby(String key, String field, Long value) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.hincrBy(key, field, value); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Boolean hexists(String key, String field) { + Jedis jedis = null; + Boolean res = false; + try { + jedis = pool.getResource(); + res = jedis.hexists(key, field); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long hlen(String key) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.hlen(key); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + + } + + + public Long hdel(String key, String... fields) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.hdel(key, fields); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Set hkeys(String key) { + Jedis jedis = null; + Set res = null; + try { + jedis = pool.getResource(); + res = jedis.hkeys(key); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public List hvals(String key) { + Jedis jedis = null; + List res = null; + try { + jedis = pool.getResource(); + res = jedis.hvals(key); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Map hgetall(String key) { + Jedis jedis = null; + Map res = null; + try { + jedis = pool.getResource(); + res = jedis.hgetAll(key); + } catch (Exception e) { + // TODO + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long lpush(String key, String... strs) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.lpush(key, strs); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long rpush(String key, String... strs) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.rpush(key, strs); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public String lset(String key, Long index, String value) { + Jedis jedis = null; + String res = null; + try { + jedis = pool.getResource(); + res = jedis.lset(key, index, value); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long lrem(String key, long count, String value) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.lrem(key, count, value); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public String ltrim(String key, long start, long end) { + Jedis jedis = null; + String res = null; + try { + jedis = pool.getResource(); + res = jedis.ltrim(key, start, end); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + synchronized public String lpop(String key) { + Jedis jedis = null; + String res = null; + try { + jedis = pool.getResource(); + res = jedis.lpop(key); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + synchronized public String rpop(String key) { + Jedis jedis = null; + String res = null; + try { + jedis = pool.getResource(); + res = jedis.rpop(key); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public String rpoplpush(String srckey, String dstkey) { + Jedis jedis = null; + String res = null; + try { + jedis = pool.getResource(); + res = jedis.rpoplpush(srckey, dstkey); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public String lindex(String key, long index) { + Jedis jedis = null; + String res = null; + try { + jedis = pool.getResource(); + res = jedis.lindex(key, index); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long llen(String key) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.llen(key); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public List lrange(String key, long start, long end) { + Jedis jedis = null; + List res = null; + try { + jedis = pool.getResource(); + res = jedis.lrange(key, start, end); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long sadd(String key, String... members) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.sadd(key, members); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long srem(String key, String... members) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.srem(key, members); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public String spop(String key) { + Jedis jedis = null; + String res = null; + try { + jedis = pool.getResource(); + res = jedis.spop(key); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Set sdiff(String... keys) { + Jedis jedis = null; + Set res = null; + try { + jedis = pool.getResource(); + res = jedis.sdiff(keys); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long sdiffstore(String dstkey, String... keys) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.sdiffstore(dstkey, keys); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Set sinter(String... keys) { + Jedis jedis = null; + Set res = null; + try { + jedis = pool.getResource(); + res = jedis.sinter(keys); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long sinterstore(String dstkey, String... keys) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.sinterstore(dstkey, keys); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Set sunion(String... keys) { + Jedis jedis = null; + Set res = null; + try { + jedis = pool.getResource(); + res = jedis.sunion(keys); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long sunionstore(String dstkey, String... keys) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.sunionstore(dstkey, keys); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long smove(String srckey, String dstkey, String member) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.smove(srckey, dstkey, member); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long scard(String key) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.scard(key); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Boolean sismember(String key, String member) { + Jedis jedis = null; + Boolean res = null; + try { + jedis = pool.getResource(); + res = jedis.sismember(key, member); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public String srandmember(String key) { + Jedis jedis = null; + String res = null; + try { + jedis = pool.getResource(); + res = jedis.srandmember(key); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Set smembers(String key) { + Jedis jedis = null; + Set res = null; + try { + jedis = pool.getResource(); + res = jedis.smembers(key); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long zadd(String key, double score, String member) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.zadd(key, score, member); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long zrem(String key, String... members) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.zrem(key, members); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Double zincrby(String key, double score, String member) { + Jedis jedis = null; + Double res = null; + try { + jedis = pool.getResource(); + res = jedis.zincrby(key, score, member); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long zrank(String key, String member) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.zrank(key, member); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long zrevrank(String key, String member) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.zrevrank(key, member); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Set zrevrange(String key, long start, long end) { + Jedis jedis = null; + Set res = null; + try { + jedis = pool.getResource(); + res = jedis.zrevrange(key, start, end); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Set zrangebyscore(String key, String max, String min) { + Jedis jedis = null; + Set res = null; + try { + jedis = pool.getResource(); + res = jedis.zrevrangeByScore(key, max, min); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Set zrangeByScore(String key, double max, double min) { + Jedis jedis = null; + Set res = null; + try { + jedis = pool.getResource(); + res = jedis.zrevrangeByScore(key, max, min); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long zcount(String key, String min, String max) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.zcount(key, min, max); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long zcard(String key) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.zcard(key); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Double zscore(String key, String member) { + Jedis jedis = null; + Double res = null; + try { + jedis = pool.getResource(); + res = jedis.zscore(key, member); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long zremrangeByRank(String key, long start, long end) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.zremrangeByRank(key, start, end); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Long zremrangeByScore(String key, double start, double end) { + Jedis jedis = null; + Long res = null; + try { + jedis = pool.getResource(); + res = jedis.zremrangeByScore(key, start, end); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public Set keys(String pattern) { + Jedis jedis = null; + Set res = null; + try { + jedis = pool.getResource(); + res = jedis.keys(pattern); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public String type(String key) { + Jedis jedis = null; + String res = null; + try { + jedis = pool.getResource(); + res = jedis.type(key); + } catch (Exception e) { + + LOGGER.error(e.getMessage()); + } finally { + returnResource(pool, jedis); + } + return res; + } + + + public static void returnResource(JedisPool pool, Jedis jedis) { + if (jedis != null) { + pool.returnResource(jedis); + } + } + + + public static void returnResource(Jedis jedis) { + if (jedis != null) { + pool.returnResource(jedis); + } + } +} diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/RedisLuaLock.java b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/lua/RedisLuaLock.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/RedisLuaLock.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/lua/RedisLuaLock.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/luaLockScript.lua b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/lua/luaLockScript.lua similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/luaLockScript.lua rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/lua/luaLockScript.lua diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/test.lua b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/lua/test.lua similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/test.lua rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/lua/test.lua diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/testlua.lua b/miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/lua/testlua.lua similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/testlua.lua rename to miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/lua/testlua.lua diff --git a/src/main/java/com/geekq/miaosha/service/GoodsService.java b/miaosha-v1/src/main/java/com/geekq/miaosha/service/GoodsService.java similarity index 100% rename from src/main/java/com/geekq/miaosha/service/GoodsService.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/service/GoodsService.java diff --git a/src/main/java/com/geekq/miaosha/service/MiaoShaMessageService.java b/miaosha-v1/src/main/java/com/geekq/miaosha/service/MiaoShaMessageService.java similarity index 91% rename from src/main/java/com/geekq/miaosha/service/MiaoShaMessageService.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/service/MiaoShaMessageService.java index 5f21561..cbab683 100644 --- a/src/main/java/com/geekq/miaosha/service/MiaoShaMessageService.java +++ b/miaosha-v1/src/main/java/com/geekq/miaosha/service/MiaoShaMessageService.java @@ -1,11 +1,8 @@ package com.geekq.miaosha.service; -import com.geekq.miaosha.common.enums.MessageStatus; import com.geekq.miaosha.dao.MiaoShaMessageDao; import com.geekq.miaosha.domain.MiaoShaMessageInfo; import com.geekq.miaosha.domain.MiaoShaMessageUser; -import com.geekq.miaosha.rabbitmq.MiaoshaMessage; -import com.geekq.miaosha.utils.DateTimeUtils; import com.geekq.miaosha.vo.MiaoShaMessageVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java b/miaosha-v1/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java similarity index 96% rename from src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java index 0768c66..a16435a 100644 --- a/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java +++ b/miaosha-v1/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java @@ -1,8 +1,5 @@ package com.geekq.miaosha.service; -import com.geekq.miaosha.common.SnowflakeIdWorker; -import com.geekq.miaosha.common.enums.MessageStatus; -import com.geekq.miaosha.controller.RegisterController; import com.geekq.miaosha.dao.MiaoShaUserDao; import com.geekq.miaosha.domain.MiaoshaUser; import com.geekq.miaosha.exception.GlobleException; @@ -12,7 +9,6 @@ import com.geekq.miaosha.redis.RedisService; import com.geekq.miaosha.utils.MD5Utils; import com.geekq.miaosha.utils.UUIDUtil; import com.geekq.miaosha.vo.LoginVo; -import com.geekq.miaosha.vo.MiaoShaMessageVo; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/geekq/miaosha/service/MiaoshaService.java b/miaosha-v1/src/main/java/com/geekq/miaosha/service/MiaoshaService.java similarity index 100% rename from src/main/java/com/geekq/miaosha/service/MiaoshaService.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/service/MiaoshaService.java diff --git a/src/main/java/com/geekq/miaosha/service/OrderService.java b/miaosha-v1/src/main/java/com/geekq/miaosha/service/OrderService.java similarity index 100% rename from src/main/java/com/geekq/miaosha/service/OrderService.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/service/OrderService.java diff --git a/src/main/java/com/geekq/miaosha/service/UserService.java b/miaosha-v1/src/main/java/com/geekq/miaosha/service/UserService.java similarity index 100% rename from src/main/java/com/geekq/miaosha/service/UserService.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/service/UserService.java diff --git a/src/main/java/com/geekq/miaosha/service/rpchander/RpcCompensateService.java b/miaosha-v1/src/main/java/com/geekq/miaosha/service/rpchander/RpcCompensateService.java similarity index 90% rename from src/main/java/com/geekq/miaosha/service/rpchander/RpcCompensateService.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/service/rpchander/RpcCompensateService.java index 43fd0ff..5851f8a 100644 --- a/src/main/java/com/geekq/miaosha/service/rpchander/RpcCompensateService.java +++ b/miaosha-v1/src/main/java/com/geekq/miaosha/service/rpchander/RpcCompensateService.java @@ -2,17 +2,8 @@ package com.geekq.miaosha.service.rpchander; import com.geekq.miaosha.common.SnowflakeIdWorker; import com.geekq.miaosha.common.resultbean.ResultGeekQ; -import com.geekq.miaosha.service.rpchander.enums.PlanStepStatus; -import com.geekq.miaosha.service.rpchander.enums.PlanStepType; -import com.geekq.miaosha.service.rpchander.vo.HandlerParam; -import com.geekq.miaosha.service.rpchander.vo.PlanOrder; -import com.geekq.miaosha.service.rpchander.vo.PlanStep; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - @Service public class RpcCompensateService { diff --git a/src/main/java/com/geekq/miaosha/service/rpchander/RpcHandler.java b/miaosha-v1/src/main/java/com/geekq/miaosha/service/rpchander/RpcHandler.java similarity index 100% rename from src/main/java/com/geekq/miaosha/service/rpchander/RpcHandler.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/service/rpchander/RpcHandler.java diff --git a/src/main/java/com/geekq/miaosha/service/rpchander/enums/PlanStepStatus.java b/miaosha-v1/src/main/java/com/geekq/miaosha/service/rpchander/enums/PlanStepStatus.java similarity index 100% rename from src/main/java/com/geekq/miaosha/service/rpchander/enums/PlanStepStatus.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/service/rpchander/enums/PlanStepStatus.java diff --git a/src/main/java/com/geekq/miaosha/service/rpchander/enums/PlanStepType.java b/miaosha-v1/src/main/java/com/geekq/miaosha/service/rpchander/enums/PlanStepType.java similarity index 100% rename from src/main/java/com/geekq/miaosha/service/rpchander/enums/PlanStepType.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/service/rpchander/enums/PlanStepType.java diff --git a/src/main/java/com/geekq/miaosha/service/rpchander/vo/HandlerParam.java b/miaosha-v1/src/main/java/com/geekq/miaosha/service/rpchander/vo/HandlerParam.java similarity index 100% rename from src/main/java/com/geekq/miaosha/service/rpchander/vo/HandlerParam.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/service/rpchander/vo/HandlerParam.java diff --git a/src/main/java/com/geekq/miaosha/service/rpchander/vo/PlanOrder.java b/miaosha-v1/src/main/java/com/geekq/miaosha/service/rpchander/vo/PlanOrder.java similarity index 100% rename from src/main/java/com/geekq/miaosha/service/rpchander/vo/PlanOrder.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/service/rpchander/vo/PlanOrder.java diff --git a/src/main/java/com/geekq/miaosha/service/rpchander/vo/PlanStep.java b/miaosha-v1/src/main/java/com/geekq/miaosha/service/rpchander/vo/PlanStep.java similarity index 100% rename from src/main/java/com/geekq/miaosha/service/rpchander/vo/PlanStep.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/service/rpchander/vo/PlanStep.java diff --git a/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java b/miaosha-v1/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java similarity index 100% rename from src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java diff --git a/src/main/java/com/geekq/miaosha/utils/DBUtil.java b/miaosha-v1/src/main/java/com/geekq/miaosha/utils/DBUtil.java similarity index 100% rename from src/main/java/com/geekq/miaosha/utils/DBUtil.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/utils/DBUtil.java diff --git a/src/main/java/com/geekq/miaosha/utils/DateTimeUtils.java b/miaosha-v1/src/main/java/com/geekq/miaosha/utils/DateTimeUtils.java similarity index 100% rename from src/main/java/com/geekq/miaosha/utils/DateTimeUtils.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/utils/DateTimeUtils.java diff --git a/src/main/java/com/geekq/miaosha/utils/HttpUtil.java b/miaosha-v1/src/main/java/com/geekq/miaosha/utils/HttpUtil.java similarity index 100% rename from src/main/java/com/geekq/miaosha/utils/HttpUtil.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/utils/HttpUtil.java diff --git a/src/main/java/com/geekq/miaosha/utils/MD5Util.java b/miaosha-v1/src/main/java/com/geekq/miaosha/utils/MD5Util.java similarity index 100% rename from src/main/java/com/geekq/miaosha/utils/MD5Util.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/utils/MD5Util.java diff --git a/src/main/java/com/geekq/miaosha/utils/MD5Utils.java b/miaosha-v1/src/main/java/com/geekq/miaosha/utils/MD5Utils.java similarity index 100% rename from src/main/java/com/geekq/miaosha/utils/MD5Utils.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/utils/MD5Utils.java diff --git a/src/main/java/com/geekq/miaosha/utils/UUIDUtil.java b/miaosha-v1/src/main/java/com/geekq/miaosha/utils/UUIDUtil.java similarity index 100% rename from src/main/java/com/geekq/miaosha/utils/UUIDUtil.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/utils/UUIDUtil.java diff --git a/src/main/java/com/geekq/miaosha/utils/UserUtil.java b/miaosha-v1/src/main/java/com/geekq/miaosha/utils/UserUtil.java similarity index 100% rename from src/main/java/com/geekq/miaosha/utils/UserUtil.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/utils/UserUtil.java diff --git a/src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java b/miaosha-v1/src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java similarity index 100% rename from src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java diff --git a/src/main/java/com/geekq/miaosha/validator/MobileCheck.java b/miaosha-v1/src/main/java/com/geekq/miaosha/validator/MobileCheck.java similarity index 100% rename from src/main/java/com/geekq/miaosha/validator/MobileCheck.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/validator/MobileCheck.java diff --git a/src/main/java/com/geekq/miaosha/validator/MobileValidator.java b/miaosha-v1/src/main/java/com/geekq/miaosha/validator/MobileValidator.java similarity index 100% rename from src/main/java/com/geekq/miaosha/validator/MobileValidator.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/validator/MobileValidator.java diff --git a/src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java b/miaosha-v1/src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java similarity index 100% rename from src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java diff --git a/src/main/java/com/geekq/miaosha/vo/GoodsVo.java b/miaosha-v1/src/main/java/com/geekq/miaosha/vo/GoodsVo.java similarity index 100% rename from src/main/java/com/geekq/miaosha/vo/GoodsVo.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/vo/GoodsVo.java diff --git a/src/main/java/com/geekq/miaosha/vo/LoginVo.java b/miaosha-v1/src/main/java/com/geekq/miaosha/vo/LoginVo.java similarity index 100% rename from src/main/java/com/geekq/miaosha/vo/LoginVo.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/vo/LoginVo.java diff --git a/src/main/java/com/geekq/miaosha/vo/MiaoShaMessageVo.java b/miaosha-v1/src/main/java/com/geekq/miaosha/vo/MiaoShaMessageVo.java similarity index 100% rename from src/main/java/com/geekq/miaosha/vo/MiaoShaMessageVo.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/vo/MiaoShaMessageVo.java diff --git a/src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java b/miaosha-v1/src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java similarity index 100% rename from src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java rename to miaosha-v1/src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java diff --git a/src/main/resources/application-dev.properties b/miaosha-v1/src/main/resources/application-dev.properties similarity index 100% rename from src/main/resources/application-dev.properties rename to miaosha-v1/src/main/resources/application-dev.properties diff --git a/src/main/resources/application-prod.properties b/miaosha-v1/src/main/resources/application-prod.properties similarity index 100% rename from src/main/resources/application-prod.properties rename to miaosha-v1/src/main/resources/application-prod.properties diff --git a/src/main/resources/application-test.properties b/miaosha-v1/src/main/resources/application-test.properties similarity index 100% rename from src/main/resources/application-test.properties rename to miaosha-v1/src/main/resources/application-test.properties diff --git a/src/main/resources/application.properties b/miaosha-v1/src/main/resources/application.properties similarity index 100% rename from src/main/resources/application.properties rename to miaosha-v1/src/main/resources/application.properties diff --git a/src/main/resources/config/application-test.properties b/miaosha-v1/src/main/resources/config/application-test.properties similarity index 100% rename from src/main/resources/config/application-test.properties rename to miaosha-v1/src/main/resources/config/application-test.properties diff --git a/src/main/resources/dubbo/applicationContext-dubbo-consumer.xml b/miaosha-v1/src/main/resources/dubbo/applicationContext-dubbo-consumer.xml similarity index 100% rename from src/main/resources/dubbo/applicationContext-dubbo-consumer.xml rename to miaosha-v1/src/main/resources/dubbo/applicationContext-dubbo-consumer.xml diff --git a/src/main/resources/generatorConfig.xml b/miaosha-v1/src/main/resources/generatorConfig.xml similarity index 100% rename from src/main/resources/generatorConfig.xml rename to miaosha-v1/src/main/resources/generatorConfig.xml diff --git a/src/main/resources/mybatis/conf.xml b/miaosha-v1/src/main/resources/mybatis/conf.xml similarity index 100% rename from src/main/resources/mybatis/conf.xml rename to miaosha-v1/src/main/resources/mybatis/conf.xml diff --git a/src/main/resources/mybatis/mapper/userMapper.xml b/miaosha-v1/src/main/resources/mybatis/mapper/userMapper.xml similarity index 100% rename from src/main/resources/mybatis/mapper/userMapper.xml rename to miaosha-v1/src/main/resources/mybatis/mapper/userMapper.xml diff --git a/src/main/resources/mybatis/mybatis-config.xml b/miaosha-v1/src/main/resources/mybatis/mybatis-config.xml similarity index 100% rename from src/main/resources/mybatis/mybatis-config.xml rename to miaosha-v1/src/main/resources/mybatis/mybatis-config.xml diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap-theme.css b/miaosha-v1/src/main/resources/static/bootstrap/css/bootstrap-theme.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap-theme.css rename to miaosha-v1/src/main/resources/static/bootstrap/css/bootstrap-theme.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap-theme.css.map b/miaosha-v1/src/main/resources/static/bootstrap/css/bootstrap-theme.css.map similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap-theme.css.map rename to miaosha-v1/src/main/resources/static/bootstrap/css/bootstrap-theme.css.map diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap-theme.min.css b/miaosha-v1/src/main/resources/static/bootstrap/css/bootstrap-theme.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap-theme.min.css rename to miaosha-v1/src/main/resources/static/bootstrap/css/bootstrap-theme.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap-theme.min.css.map b/miaosha-v1/src/main/resources/static/bootstrap/css/bootstrap-theme.min.css.map similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap-theme.min.css.map rename to miaosha-v1/src/main/resources/static/bootstrap/css/bootstrap-theme.min.css.map diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap.css b/miaosha-v1/src/main/resources/static/bootstrap/css/bootstrap.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap.css rename to miaosha-v1/src/main/resources/static/bootstrap/css/bootstrap.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap.css.map b/miaosha-v1/src/main/resources/static/bootstrap/css/bootstrap.css.map similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap.css.map rename to miaosha-v1/src/main/resources/static/bootstrap/css/bootstrap.css.map diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap.min.css b/miaosha-v1/src/main/resources/static/bootstrap/css/bootstrap.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap.min.css rename to miaosha-v1/src/main/resources/static/bootstrap/css/bootstrap.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap.min.css.map b/miaosha-v1/src/main/resources/static/bootstrap/css/bootstrap.min.css.map similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap.min.css.map rename to miaosha-v1/src/main/resources/static/bootstrap/css/bootstrap.min.css.map diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.eot b/miaosha-v1/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.eot rename to miaosha-v1/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.svg b/miaosha-v1/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.svg rename to miaosha-v1/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.ttf b/miaosha-v1/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to miaosha-v1/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff b/miaosha-v1/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff rename to miaosha-v1/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/miaosha-v1/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff2 rename to miaosha-v1/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff2 diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/js/bootstrap.js b/miaosha-v1/src/main/resources/static/bootstrap/js/bootstrap.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/js/bootstrap.js rename to miaosha-v1/src/main/resources/static/bootstrap/js/bootstrap.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/js/bootstrap.min.js b/miaosha-v1/src/main/resources/static/bootstrap/js/bootstrap.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/js/bootstrap.min.js rename to miaosha-v1/src/main/resources/static/bootstrap/js/bootstrap.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/js/npm.js b/miaosha-v1/src/main/resources/static/bootstrap/js/npm.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/bootstrap/js/npm.js rename to miaosha-v1/src/main/resources/static/bootstrap/js/npm.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/css/common.css b/miaosha-v1/src/main/resources/static/css/common.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/css/common.css rename to miaosha-v1/src/main/resources/static/css/common.css diff --git a/src/main/resources/static/css/font-awesome.min.css b/miaosha-v1/src/main/resources/static/css/font-awesome.min.css similarity index 100% rename from src/main/resources/static/css/font-awesome.min.css rename to miaosha-v1/src/main/resources/static/css/font-awesome.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/css/reset.css b/miaosha-v1/src/main/resources/static/css/reset.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/css/reset.css rename to miaosha-v1/src/main/resources/static/css/reset.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/fonts/FontAwesome.otf b/miaosha-v1/src/main/resources/static/fonts/FontAwesome.otf similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/fonts/FontAwesome.otf rename to miaosha-v1/src/main/resources/static/fonts/FontAwesome.otf diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.eot b/miaosha-v1/src/main/resources/static/fonts/fontawesome-webfont.eot similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.eot rename to miaosha-v1/src/main/resources/static/fonts/fontawesome-webfont.eot diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.svg b/miaosha-v1/src/main/resources/static/fonts/fontawesome-webfont.svg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.svg rename to miaosha-v1/src/main/resources/static/fonts/fontawesome-webfont.svg diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.ttf b/miaosha-v1/src/main/resources/static/fonts/fontawesome-webfont.ttf similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.ttf rename to miaosha-v1/src/main/resources/static/fonts/fontawesome-webfont.ttf diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.woff b/miaosha-v1/src/main/resources/static/fonts/fontawesome-webfont.woff similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.woff rename to miaosha-v1/src/main/resources/static/fonts/fontawesome-webfont.woff diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.woff2 b/miaosha-v1/src/main/resources/static/fonts/fontawesome-webfont.woff2 similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.woff2 rename to miaosha-v1/src/main/resources/static/fonts/fontawesome-webfont.woff2 diff --git a/src/main/resources/static/goods_detail.htm b/miaosha-v1/src/main/resources/static/goods_detail.htm similarity index 100% rename from src/main/resources/static/goods_detail.htm rename to miaosha-v1/src/main/resources/static/goods_detail.htm diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/img/bg.jpg b/miaosha-v1/src/main/resources/static/img/bg.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/img/bg.jpg rename to miaosha-v1/src/main/resources/static/img/bg.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/img/bg2.jpg b/miaosha-v1/src/main/resources/static/img/bg2.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/img/bg2.jpg rename to miaosha-v1/src/main/resources/static/img/bg2.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/img/iphone8.png b/miaosha-v1/src/main/resources/static/img/iphone8.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/img/iphone8.png rename to miaosha-v1/src/main/resources/static/img/iphone8.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/img/iphonex.png b/miaosha-v1/src/main/resources/static/img/iphonex.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/img/iphonex.png rename to miaosha-v1/src/main/resources/static/img/iphonex.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/img/logo_bg.jpg b/miaosha-v1/src/main/resources/static/img/logo_bg.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/img/logo_bg.jpg rename to miaosha-v1/src/main/resources/static/img/logo_bg.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/img/logowz.png b/miaosha-v1/src/main/resources/static/img/logowz.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/img/logowz.png rename to miaosha-v1/src/main/resources/static/img/logowz.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/img/meta10.png b/miaosha-v1/src/main/resources/static/img/meta10.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/img/meta10.png rename to miaosha-v1/src/main/resources/static/img/meta10.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/img/mi6.png b/miaosha-v1/src/main/resources/static/img/mi6.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/img/mi6.png rename to miaosha-v1/src/main/resources/static/img/mi6.png diff --git a/src/main/resources/static/jquery-validation/additional-methods.min.js b/miaosha-v1/src/main/resources/static/jquery-validation/additional-methods.min.js similarity index 100% rename from src/main/resources/static/jquery-validation/additional-methods.min.js rename to miaosha-v1/src/main/resources/static/jquery-validation/additional-methods.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/jquery-validation/jquery.validate.min.js b/miaosha-v1/src/main/resources/static/jquery-validation/jquery.validate.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/jquery-validation/jquery.validate.min.js rename to miaosha-v1/src/main/resources/static/jquery-validation/jquery.validate.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/jquery-validation/localization/messages_zh.min.js b/miaosha-v1/src/main/resources/static/jquery-validation/localization/messages_zh.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/jquery-validation/localization/messages_zh.min.js rename to miaosha-v1/src/main/resources/static/jquery-validation/localization/messages_zh.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/common.js b/miaosha-v1/src/main/resources/static/js/common.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/common.js rename to miaosha-v1/src/main/resources/static/js/common.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/common1.js b/miaosha-v1/src/main/resources/static/js/common1.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/common1.js rename to miaosha-v1/src/main/resources/static/js/common1.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/jquery.min.js b/miaosha-v1/src/main/resources/static/js/jquery.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/jquery.min.js rename to miaosha-v1/src/main/resources/static/js/jquery.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/md5.min.js b/miaosha-v1/src/main/resources/static/js/md5.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/md5.min.js rename to miaosha-v1/src/main/resources/static/js/md5.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/layer/layer.js b/miaosha-v1/src/main/resources/static/layer/layer.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/layer/layer.js rename to miaosha-v1/src/main/resources/static/layer/layer.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/layer/mobile/layer.js b/miaosha-v1/src/main/resources/static/layer/mobile/layer.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/layer/mobile/layer.js rename to miaosha-v1/src/main/resources/static/layer/mobile/layer.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/layer/mobile/need/layer.css b/miaosha-v1/src/main/resources/static/layer/mobile/need/layer.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/layer/mobile/need/layer.css rename to miaosha-v1/src/main/resources/static/layer/mobile/need/layer.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/layer/skin/default/icon-ext.png b/miaosha-v1/src/main/resources/static/layer/skin/default/icon-ext.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/layer/skin/default/icon-ext.png rename to miaosha-v1/src/main/resources/static/layer/skin/default/icon-ext.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/layer/skin/default/icon.png b/miaosha-v1/src/main/resources/static/layer/skin/default/icon.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/layer/skin/default/icon.png rename to miaosha-v1/src/main/resources/static/layer/skin/default/icon.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/layer/skin/default/layer.css b/miaosha-v1/src/main/resources/static/layer/skin/default/layer.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/layer/skin/default/layer.css rename to miaosha-v1/src/main/resources/static/layer/skin/default/layer.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/layer/skin/default/loading-0.gif b/miaosha-v1/src/main/resources/static/layer/skin/default/loading-0.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/layer/skin/default/loading-0.gif rename to miaosha-v1/src/main/resources/static/layer/skin/default/loading-0.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/layer/skin/default/loading-1.gif b/miaosha-v1/src/main/resources/static/layer/skin/default/loading-1.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/layer/skin/default/loading-1.gif rename to miaosha-v1/src/main/resources/static/layer/skin/default/loading-1.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/layer/skin/default/loading-2.gif b/miaosha-v1/src/main/resources/static/layer/skin/default/loading-2.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/layer/skin/default/loading-2.gif rename to miaosha-v1/src/main/resources/static/layer/skin/default/loading-2.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/order_detail.htm b/miaosha-v1/src/main/resources/static/order_detail.htm similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/order_detail.htm rename to miaosha-v1/src/main/resources/static/order_detail.htm diff --git a/src/main/resources/templates/goods_detail.html b/miaosha-v1/src/main/resources/templates/goods_detail.html similarity index 100% rename from src/main/resources/templates/goods_detail.html rename to miaosha-v1/src/main/resources/templates/goods_detail.html diff --git a/src/main/resources/templates/goods_list.html b/miaosha-v1/src/main/resources/templates/goods_list.html similarity index 100% rename from src/main/resources/templates/goods_list.html rename to miaosha-v1/src/main/resources/templates/goods_list.html diff --git a/src/main/resources/templates/hello.html b/miaosha-v1/src/main/resources/templates/hello.html similarity index 100% rename from src/main/resources/templates/hello.html rename to miaosha-v1/src/main/resources/templates/hello.html diff --git a/src/main/resources/templates/index.html b/miaosha-v1/src/main/resources/templates/index.html similarity index 100% rename from src/main/resources/templates/index.html rename to miaosha-v1/src/main/resources/templates/index.html diff --git a/src/main/resources/templates/login.html b/miaosha-v1/src/main/resources/templates/login.html similarity index 100% rename from src/main/resources/templates/login.html rename to miaosha-v1/src/main/resources/templates/login.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/message_list.html b/miaosha-v1/src/main/resources/templates/message_list.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/message_list.html rename to miaosha-v1/src/main/resources/templates/message_list.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/miaosha_fail.html b/miaosha-v1/src/main/resources/templates/miaosha_fail.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/miaosha_fail.html rename to miaosha-v1/src/main/resources/templates/miaosha_fail.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/order_detail.html b/miaosha-v1/src/main/resources/templates/order_detail.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/order_detail.html rename to miaosha-v1/src/main/resources/templates/order_detail.html diff --git a/src/main/resources/templates/register.html b/miaosha-v1/src/main/resources/templates/register.html similarity index 100% rename from src/main/resources/templates/register.html rename to miaosha-v1/src/main/resources/templates/register.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/register1.html b/miaosha-v1/src/main/resources/templates/register1.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/register1.html rename to miaosha-v1/src/main/resources/templates/register1.html diff --git a/miaosha-2version/.gitignore b/miaosha-v2/.gitignore similarity index 100% rename from miaosha-2version/.gitignore rename to miaosha-v2/.gitignore diff --git a/miaosha-2version/miaosha-common/pom.xml b/miaosha-v2/miaosha-common/pom.xml similarity index 79% rename from miaosha-2version/miaosha-common/pom.xml rename to miaosha-v2/miaosha-common/pom.xml index a138f5e..98639b4 100644 --- a/miaosha-2version/miaosha-common/pom.xml +++ b/miaosha-v2/miaosha-common/pom.xml @@ -3,14 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - miaosha - com.geekq - 0.0.1-SNAPSHOT + miaosha-v2 + com.geekq.v2 + ${revision} 4.0.0 - miaosha-common - + ${revision} diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/BaseDomain.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/BaseDomain.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/BaseDomain.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/BaseDomain.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/Goods.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/Goods.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/Goods.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/Goods.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/IpLog.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/IpLog.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/IpLog.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/IpLog.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/Logininfo.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/Logininfo.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/Logininfo.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/Logininfo.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoShaMessageInfo.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoShaMessageInfo.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoShaMessageInfo.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoShaMessageInfo.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoShaMessageUser.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoShaMessageUser.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoShaMessageUser.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoShaMessageUser.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoshaGoods.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoshaGoods.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoshaGoods.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoshaGoods.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoshaOrder.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoshaOrder.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoshaOrder.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoshaOrder.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoshaUser.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoshaUser.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoshaUser.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoshaUser.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/OrderInfo.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/OrderInfo.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/entity/OrderInfo.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/entity/OrderInfo.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/Constanst.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/Constanst.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/Constanst.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/Constanst.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/Constants.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/Constants.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/Constants.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/Constants.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/MessageStatus.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/MessageStatus.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/MessageStatus.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/MessageStatus.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/OrderStatusEnum.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/OrderStatusEnum.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/OrderStatusEnum.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/OrderStatusEnum.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/SexEnum.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/SexEnum.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/SexEnum.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/SexEnum.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/YesOrNo.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/YesOrNo.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/YesOrNo.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/YesOrNo.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/enums/MessageStatus.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/enums/MessageStatus.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/enums/MessageStatus.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/enums/MessageStatus.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/enums/ResultStatus.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/enums/ResultStatus.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/enums/ResultStatus.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/enums/ResultStatus.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/resultbean/AbstractResult.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/resultbean/AbstractResult.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/resultbean/AbstractResult.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/resultbean/AbstractResult.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/resultbean/ResultGeekQ.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/resultbean/ResultGeekQ.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/enums/resultbean/ResultGeekQ.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/enums/resultbean/ResultGeekQ.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/exception/GlobleException.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/exception/GlobleException.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/exception/GlobleException.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/exception/GlobleException.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/utils/DateTimeUtils.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/utils/DateTimeUtils.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/utils/DateTimeUtils.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/utils/DateTimeUtils.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/utils/MD5Utils.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/utils/MD5Utils.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/utils/MD5Utils.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/utils/MD5Utils.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/utils/SnowflakeIdWorker.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/utils/SnowflakeIdWorker.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/utils/SnowflakeIdWorker.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/utils/SnowflakeIdWorker.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/utils/UUIDUtil.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/utils/UUIDUtil.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/utils/UUIDUtil.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/utils/UUIDUtil.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/utils/UserContext.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/utils/UserContext.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/utils/UserContext.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/utils/UserContext.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/utils/UserContext2.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/utils/UserContext2.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/utils/UserContext2.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/utils/UserContext2.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/utils/ValidatorUtil.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/utils/ValidatorUtil.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/utils/ValidatorUtil.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/utils/ValidatorUtil.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/validator/MobileCheck.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/validator/MobileCheck.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/validator/MobileCheck.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/validator/MobileCheck.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/validator/MobileValidator.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/validator/MobileValidator.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/validator/MobileValidator.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/validator/MobileValidator.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/vo/GoodsDetailVo.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/vo/GoodsDetailVo.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/vo/GoodsDetailVo.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/vo/GoodsDetailVo.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/vo/GoodsVo.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/vo/GoodsVo.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/vo/GoodsVo.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/vo/GoodsVo.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/vo/LoginVo.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/vo/LoginVo.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/vo/LoginVo.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/vo/LoginVo.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/vo/MiaoShaMessageVo.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/vo/MiaoShaMessageVo.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/vo/MiaoShaMessageVo.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/vo/MiaoShaMessageVo.java diff --git a/miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/vo/OrderDetailVo.java b/miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/vo/OrderDetailVo.java similarity index 100% rename from miaosha-2version/miaosha-common/src/main/java/com/geekq/miasha/vo/OrderDetailVo.java rename to miaosha-v2/miaosha-common/src/main/java/com/geekq/miasha/vo/OrderDetailVo.java diff --git a/miaosha-2version/miaosha-service/pom.xml b/miaosha-v2/miaosha-service/pom.xml similarity index 81% rename from miaosha-2version/miaosha-service/pom.xml rename to miaosha-v2/miaosha-service/pom.xml index 468572d..7989fa2 100644 --- a/miaosha-2version/miaosha-service/pom.xml +++ b/miaosha-v2/miaosha-service/pom.xml @@ -3,16 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - miaosha - com.geekq - 0.0.1-SNAPSHOT + miaosha-v2 + com.geekq.v2 + ${revision} 4.0.0 - miaosha-service - + ${revision} - src/main/java @@ -32,15 +30,11 @@ false - - - commons-io - commons-io - 2.6 + com.geekq.v2 + miaosha-common - \ No newline at end of file diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/GoodsMapper.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/GoodsMapper.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/GoodsMapper.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/GoodsMapper.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/GoodsMapper.xml b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/GoodsMapper.xml similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/GoodsMapper.xml rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/GoodsMapper.xml diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/IpLogMapper.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/IpLogMapper.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/IpLogMapper.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/IpLogMapper.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/IpLogMapper.xml b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/IpLogMapper.xml similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/IpLogMapper.xml rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/IpLogMapper.xml diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/LogininfoMapper.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/LogininfoMapper.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/LogininfoMapper.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/LogininfoMapper.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/LogininfoMapper.xml b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/LogininfoMapper.xml similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/LogininfoMapper.xml rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/LogininfoMapper.xml diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/MiaoShaUserMapper.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/MiaoShaUserMapper.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/MiaoShaUserMapper.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/MiaoShaUserMapper.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/MiaoShaUserMapper.xml b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/MiaoShaUserMapper.xml similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/MiaoShaUserMapper.xml rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/MiaoShaUserMapper.xml diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/OrderMapper.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/OrderMapper.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/OrderMapper.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/OrderMapper.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/OrderMapper.xml b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/OrderMapper.xml similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/mapper/OrderMapper.xml rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/mapper/OrderMapper.xml diff --git a/src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java similarity index 100% rename from src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/BasePrefix.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/BasePrefix.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/BasePrefix.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/BasePrefix.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/DistributedLocker.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/DistributedLocker.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/DistributedLocker.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/DistributedLocker.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/GoodsKey.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/GoodsKey.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/GoodsKey.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/GoodsKey.java diff --git a/src/main/java/com/geekq/miaosha/redis/KeyPrefix.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/KeyPrefix.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/KeyPrefix.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/KeyPrefix.java diff --git a/src/main/java/com/geekq/miaosha/redis/MiaoShaUserKey.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/MiaoShaUserKey.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/MiaoShaUserKey.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/MiaoShaUserKey.java diff --git a/src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java diff --git a/src/main/java/com/geekq/miaosha/redis/OrderKey.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/OrderKey.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/OrderKey.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/OrderKey.java diff --git a/src/main/java/com/geekq/miaosha/redis/RedisConfig.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedisConfig.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/RedisConfig.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedisConfig.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedisService.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedisService.java similarity index 99% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedisService.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedisService.java index fd30053..71cea09 100644 --- a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedisService.java +++ b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedisService.java @@ -19,7 +19,6 @@ public class RedisService { @Autowired JedisPool jedisPool; - /** * 设置失效时间 * @param key @@ -250,7 +249,7 @@ public class RedisService { keys.addAll(result); } //再处理cursor - cursor = ret.getStringCursor(); + cursor = ret.getCursor(); }while(!cursor.equals("0")); return keys; } finally { diff --git a/src/main/java/com/geekq/miaosha/redis/RedissLockUtil.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissLockUtil.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/RedissLockUtil.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissLockUtil.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonService.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonService.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonService.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonService.java diff --git a/src/main/java/com/geekq/miaosha/redis/Userkey.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/Userkey.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/Userkey.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/Userkey.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLimitRateWithLUA.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLimitRateWithLUA.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLimitRateWithLUA.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLimitRateWithLUA.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLock.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLock.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLock.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLock.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLua.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLua.java similarity index 98% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLua.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLua.java index b9b019d..8ec475e 100644 --- a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLua.java +++ b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLua.java @@ -7,8 +7,6 @@ import redis.clients.jedis.Jedis; import java.util.ArrayList; import java.util.List; -import static redis.clients.jedis.Protocol.Command.INCRBY; - /** * lua脚本使用 */ diff --git a/src/main/java/com/geekq/miaosha/redis/redismanager/RedisManager.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisManager.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/redismanager/RedisManager.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisManager.java diff --git a/src/main/java/com/geekq/miaosha/redis/redismanager/lua/RedisLuaLock.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/RedisLuaLock.java similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/redismanager/lua/RedisLuaLock.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/RedisLuaLock.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/limit.lua b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/limit.lua similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/limit.lua rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/limit.lua diff --git a/src/main/java/com/geekq/miaosha/redis/redismanager/lua/luaLockScript.lua b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/luaLockScript.lua similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/redismanager/lua/luaLockScript.lua rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/luaLockScript.lua diff --git a/src/main/java/com/geekq/miaosha/redis/redismanager/lua/test.lua b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/test.lua similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/redismanager/lua/test.lua rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/test.lua diff --git a/src/main/java/com/geekq/miaosha/redis/redismanager/lua/testlua.lua b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/testlua.lua similarity index 100% rename from src/main/java/com/geekq/miaosha/redis/redismanager/lua/testlua.lua rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/testlua.lua diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/service/GoodsService.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/service/GoodsService.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/service/GoodsService.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/service/GoodsService.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/service/LoginInfoService.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/service/LoginInfoService.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/service/LoginInfoService.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/service/LoginInfoService.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/service/MiaoShaMessageService.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/service/MiaoShaMessageService.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/service/MiaoShaMessageService.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/service/MiaoShaMessageService.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/service/MiaoshaService.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/service/MiaoshaService.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/service/MiaoshaService.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/service/MiaoshaService.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/service/OrderService.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/service/OrderService.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/service/OrderService.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/service/OrderService.java diff --git a/miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/service/impl/LoginInfoServiceImpl.java b/miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/service/impl/LoginInfoServiceImpl.java similarity index 100% rename from miaosha-2version/miaosha-service/src/main/java/com/geekq/miaosha/service/impl/LoginInfoServiceImpl.java rename to miaosha-v2/miaosha-service/src/main/java/com/geekq/miaosha/service/impl/LoginInfoServiceImpl.java diff --git a/miaosha-2version/miaosha-service/src/main/resources/limit.lua b/miaosha-v2/miaosha-service/src/main/resources/limit.lua similarity index 100% rename from miaosha-2version/miaosha-service/src/main/resources/limit.lua rename to miaosha-v2/miaosha-service/src/main/resources/limit.lua diff --git a/miaosha-2version/miaosha-web/pom.xml b/miaosha-v2/miaosha-web/pom.xml similarity index 69% rename from miaosha-2version/miaosha-web/pom.xml rename to miaosha-v2/miaosha-web/pom.xml index 19de482..6cb8926 100644 --- a/miaosha-2version/miaosha-web/pom.xml +++ b/miaosha-v2/miaosha-web/pom.xml @@ -3,21 +3,18 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - miaosha - com.geekq - 0.0.1-SNAPSHOT + miaosha-v2 + com.geekq.v2 + ${revision} 4.0.0 miaosha-web - - - com.geekq + com.geekq.v2 miaosha-service - 0.0.1-SNAPSHOT diff --git a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/GeekQMainApplication.java b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/GeekQMainApplication.java similarity index 100% rename from miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/GeekQMainApplication.java rename to miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/GeekQMainApplication.java diff --git a/src/main/java/com/geekq/miaosha/config/DruidConfig.java b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/config/DruidConfig.java similarity index 100% rename from src/main/java/com/geekq/miaosha/config/DruidConfig.java rename to miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/config/DruidConfig.java diff --git a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java similarity index 100% rename from miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java rename to miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java diff --git a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/config/WebConfig.java b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/config/WebConfig.java similarity index 100% rename from miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/config/WebConfig.java rename to miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/config/WebConfig.java diff --git a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/BaseController.java b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/BaseController.java similarity index 100% rename from miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/BaseController.java rename to miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/BaseController.java diff --git a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/GoodsController.java b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/GoodsController.java similarity index 100% rename from miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/GoodsController.java rename to miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/GoodsController.java diff --git a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/LoginController.java b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/LoginController.java similarity index 89% rename from miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/LoginController.java rename to miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/LoginController.java index 63e345e..6090f90 100644 --- a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/LoginController.java +++ b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/LoginController.java @@ -1,8 +1,6 @@ package com.geekq.miaosha.controller; import com.alibaba.dubbo.config.annotation.Reference; -import com.alibaba.fastjson.JSON; -import com.geekq.api.service.DemoService; import com.geekq.miaosha.redis.redismanager.RedisLua; import com.geekq.miaosha.service.MiaoShaUserService; import com.geekq.miasha.enums.resultbean.ResultGeekQ; @@ -12,7 +10,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -30,9 +27,6 @@ public class LoginController { @Autowired private MiaoShaUserService userService; - @Reference(version = "${demo.service.version}",mock = "return null") - private DemoService demoService; - @RequestMapping("/sayHello") public String sayHello() throws Exception { return "login222"; diff --git a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/MiaoShaMessageController.java b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/MiaoShaMessageController.java similarity index 98% rename from miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/MiaoShaMessageController.java rename to miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/MiaoShaMessageController.java index a6c0ff9..5bf01f4 100644 --- a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/MiaoShaMessageController.java +++ b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/MiaoShaMessageController.java @@ -14,8 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import java.util.List; - @Controller @RequestMapping("/message") public class MiaoShaMessageController { diff --git a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java similarity index 100% rename from miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java rename to miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java diff --git a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/OrderController.java b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/OrderController.java similarity index 100% rename from miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/OrderController.java rename to miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/OrderController.java diff --git a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/RegisterController.java b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/RegisterController.java similarity index 98% rename from miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/RegisterController.java rename to miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/RegisterController.java index 4b3eb24..57fddc3 100644 --- a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/controller/RegisterController.java +++ b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/controller/RegisterController.java @@ -1,6 +1,5 @@ package com.geekq.miaosha.controller; -import com.geekq.miaosha.redis.redismanager.RedisLua; import com.geekq.miaosha.service.MiaoShaUserService; import com.geekq.miaosha.service.MiaoshaService; import com.geekq.miasha.enums.resultbean.ResultGeekQ; diff --git a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/AccessKey.java b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/AccessKey.java similarity index 100% rename from miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/AccessKey.java rename to miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/AccessKey.java diff --git a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/GlobalExceptionHandler.java b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/GlobalExceptionHandler.java similarity index 100% rename from miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/GlobalExceptionHandler.java rename to miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/GlobalExceptionHandler.java diff --git a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/GlobalParamAdvice.java b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/GlobalParamAdvice.java similarity index 100% rename from miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/GlobalParamAdvice.java rename to miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/GlobalParamAdvice.java diff --git a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/LoginInterceptor.java b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/LoginInterceptor.java similarity index 100% rename from miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/LoginInterceptor.java rename to miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/LoginInterceptor.java diff --git a/miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/RequireLogin.java b/miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/RequireLogin.java similarity index 100% rename from miaosha-2version/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/RequireLogin.java rename to miaosha-v2/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/RequireLogin.java diff --git a/miaosha-2version/miaosha-web/src/main/resources/application.properties b/miaosha-v2/miaosha-web/src/main/resources/application.properties similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/application.properties rename to miaosha-v2/miaosha-web/src/main/resources/application.properties diff --git a/miaosha-2version/miaosha-web/src/main/resources/consumer.xml b/miaosha-v2/miaosha-web/src/main/resources/consumer.xml similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/consumer.xml rename to miaosha-v2/miaosha-web/src/main/resources/consumer.xml diff --git a/miaosha-2version/miaosha-web/src/main/resources/css/account.css b/miaosha-v2/miaosha-web/src/main/resources/css/account.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/css/account.css rename to miaosha-v2/miaosha-web/src/main/resources/css/account.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/css/bank.css b/miaosha-v2/miaosha-web/src/main/resources/css/bank.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/css/bank.css rename to miaosha-v2/miaosha-web/src/main/resources/css/bank.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/css/core.css b/miaosha-v2/miaosha-web/src/main/resources/css/core.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/css/core.css rename to miaosha-v2/miaosha-web/src/main/resources/css/core.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/css/slide-unlock.css b/miaosha-v2/miaosha-web/src/main/resources/css/slide-unlock.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/css/slide-unlock.css rename to miaosha-v2/miaosha-web/src/main/resources/css/slide-unlock.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/add.png b/miaosha-v2/miaosha-web/src/main/resources/images/add.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/add.png rename to miaosha-v2/miaosha-web/src/main/resources/images/add.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/bank_list.png b/miaosha-v2/miaosha-web/src/main/resources/images/bank_list.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/bank_list.png rename to miaosha-v2/miaosha-web/src/main/resources/images/bank_list.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/banner01.jpg b/miaosha-v2/miaosha-web/src/main/resources/images/banner01.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/banner01.jpg rename to miaosha-v2/miaosha-web/src/main/resources/images/banner01.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/banner02.jpg b/miaosha-v2/miaosha-web/src/main/resources/images/banner02.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/banner02.jpg rename to miaosha-v2/miaosha-web/src/main/resources/images/banner02.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/baozhan.jpg b/miaosha-v2/miaosha-web/src/main/resources/images/baozhan.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/baozhan.jpg rename to miaosha-v2/miaosha-web/src/main/resources/images/baozhan.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/dtg.gif b/miaosha-v2/miaosha-web/src/main/resources/images/dtg.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/dtg.gif rename to miaosha-v2/miaosha-web/src/main/resources/images/dtg.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/example.jpg b/miaosha-v2/miaosha-web/src/main/resources/images/example.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/example.jpg rename to miaosha-v2/miaosha-web/src/main/resources/images/example.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/feature01.png b/miaosha-v2/miaosha-web/src/main/resources/images/feature01.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/feature01.png rename to miaosha-v2/miaosha-web/src/main/resources/images/feature01.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/feature02.png b/miaosha-v2/miaosha-web/src/main/resources/images/feature02.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/feature02.png rename to miaosha-v2/miaosha-web/src/main/resources/images/feature02.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/feature03.png b/miaosha-v2/miaosha-web/src/main/resources/images/feature03.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/feature03.png rename to miaosha-v2/miaosha-web/src/main/resources/images/feature03.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/geekq.png b/miaosha-v2/miaosha-web/src/main/resources/images/geekq.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/geekq.png rename to miaosha-v2/miaosha-web/src/main/resources/images/geekq.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/logo.png b/miaosha-v2/miaosha-web/src/main/resources/images/logo.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/logo.png rename to miaosha-v2/miaosha-web/src/main/resources/images/logo.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/miaoshaxitong.png b/miaosha-v2/miaosha-web/src/main/resources/images/miaoshaxitong.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/miaoshaxitong.png rename to miaosha-v2/miaosha-web/src/main/resources/images/miaoshaxitong.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/person_icon.png b/miaosha-v2/miaosha-web/src/main/resources/images/person_icon.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/person_icon.png rename to miaosha-v2/miaosha-web/src/main/resources/images/person_icon.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/phone2.png b/miaosha-v2/miaosha-web/src/main/resources/images/phone2.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/phone2.png rename to miaosha-v2/miaosha-web/src/main/resources/images/phone2.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/sequare.png b/miaosha-v2/miaosha-web/src/main/resources/images/sequare.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/sequare.png rename to miaosha-v2/miaosha-web/src/main/resources/images/sequare.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/shiming.png b/miaosha-v2/miaosha-web/src/main/resources/images/shiming.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/shiming.png rename to miaosha-v2/miaosha-web/src/main/resources/images/shiming.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/shouji.jpg b/miaosha-v2/miaosha-web/src/main/resources/images/shouji.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/shouji.jpg rename to miaosha-v2/miaosha-web/src/main/resources/images/shouji.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/sina.png b/miaosha-v2/miaosha-web/src/main/resources/images/sina.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/sina.png rename to miaosha-v2/miaosha-web/src/main/resources/images/sina.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/social-icons-set.png b/miaosha-v2/miaosha-web/src/main/resources/images/social-icons-set.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/social-icons-set.png rename to miaosha-v2/miaosha-web/src/main/resources/images/social-icons-set.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/tecent.png b/miaosha-v2/miaosha-web/src/main/resources/images/tecent.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/tecent.png rename to miaosha-v2/miaosha-web/src/main/resources/images/tecent.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/txwb.png b/miaosha-v2/miaosha-web/src/main/resources/images/txwb.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/txwb.png rename to miaosha-v2/miaosha-web/src/main/resources/images/txwb.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/upload_source_2.jpg b/miaosha-v2/miaosha-web/src/main/resources/images/upload_source_2.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/upload_source_2.jpg rename to miaosha-v2/miaosha-web/src/main/resources/images/upload_source_2.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/upload_source_2_1.jpg b/miaosha-v2/miaosha-web/src/main/resources/images/upload_source_2_1.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/upload_source_2_1.jpg rename to miaosha-v2/miaosha-web/src/main/resources/images/upload_source_2_1.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/wx.jpg b/miaosha-v2/miaosha-web/src/main/resources/images/wx.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/wx.jpg rename to miaosha-v2/miaosha-web/src/main/resources/images/wx.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/wxsm.png b/miaosha-v2/miaosha-web/src/main/resources/images/wxsm.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/wxsm.png rename to miaosha-v2/miaosha-web/src/main/resources/images/wxsm.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/xlwb.png b/miaosha-v2/miaosha-web/src/main/resources/images/xlwb.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/xlwb.png rename to miaosha-v2/miaosha-web/src/main/resources/images/xlwb.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/images/youxiang.jpg b/miaosha-v2/miaosha-web/src/main/resources/images/youxiang.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/images/youxiang.jpg rename to miaosha-v2/miaosha-web/src/main/resources/images/youxiang.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap-theme.css b/miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap-theme.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap-theme.css rename to miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap-theme.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap-theme.css.map b/miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap-theme.css.map similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap-theme.css.map rename to miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap-theme.css.map diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap-theme.min.css b/miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap-theme.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap-theme.min.css rename to miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap-theme.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap-theme.min.css.map b/miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap-theme.min.css.map similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap-theme.min.css.map rename to miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap-theme.min.css.map diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap.css b/miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap.css rename to miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap.css.map b/miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap.css.map similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap.css.map rename to miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap.css.map diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap.min.css b/miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap.min.css rename to miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap.min.css.map b/miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap.min.css.map similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap.min.css.map rename to miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/css/bootstrap.min.css.map diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.eot b/miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.eot rename to miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.svg b/miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.svg rename to miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.ttf b/miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.ttf rename to miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.woff b/miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.woff rename to miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.woff2 b/miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.woff2 rename to miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff2 diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/js/bootstrap.js b/miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/js/bootstrap.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/js/bootstrap.js rename to miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/js/bootstrap.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/js/bootstrap.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/js/bootstrap.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/js/bootstrap.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/js/bootstrap.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/js/npm.js b/miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/js/npm.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/js/npm.js rename to miaosha-v2/miaosha-web/src/main/resources/static/bootstrap/js/npm.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/css/common.css b/miaosha-v2/miaosha-web/src/main/resources/static/css/common.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/css/common.css rename to miaosha-v2/miaosha-web/src/main/resources/static/css/common.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/css/font-awesome.min.css b/miaosha-v2/miaosha-web/src/main/resources/static/css/font-awesome.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/css/font-awesome.min.css rename to miaosha-v2/miaosha-web/src/main/resources/static/css/font-awesome.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/css/reset.css b/miaosha-v2/miaosha-web/src/main/resources/static/css/reset.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/css/reset.css rename to miaosha-v2/miaosha-web/src/main/resources/static/css/reset.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/fonts/FontAwesome.otf b/miaosha-v2/miaosha-web/src/main/resources/static/fonts/FontAwesome.otf similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/fonts/FontAwesome.otf rename to miaosha-v2/miaosha-web/src/main/resources/static/fonts/FontAwesome.otf diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.eot b/miaosha-v2/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.eot similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.eot rename to miaosha-v2/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.eot diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.svg b/miaosha-v2/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.svg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.svg rename to miaosha-v2/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.svg diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.ttf b/miaosha-v2/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.ttf similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.ttf rename to miaosha-v2/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.ttf diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.woff b/miaosha-v2/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.woff similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.woff rename to miaosha-v2/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.woff diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.woff2 b/miaosha-v2/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.woff2 similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.woff2 rename to miaosha-v2/miaosha-web/src/main/resources/static/fonts/fontawesome-webfont.woff2 diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/goods_detail.htm b/miaosha-v2/miaosha-web/src/main/resources/static/goods_detail.htm similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/goods_detail.htm rename to miaosha-v2/miaosha-web/src/main/resources/static/goods_detail.htm diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/img/bg.jpg b/miaosha-v2/miaosha-web/src/main/resources/static/img/bg.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/img/bg.jpg rename to miaosha-v2/miaosha-web/src/main/resources/static/img/bg.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/img/bg2.jpg b/miaosha-v2/miaosha-web/src/main/resources/static/img/bg2.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/img/bg2.jpg rename to miaosha-v2/miaosha-web/src/main/resources/static/img/bg2.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/img/iphone8.png b/miaosha-v2/miaosha-web/src/main/resources/static/img/iphone8.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/img/iphone8.png rename to miaosha-v2/miaosha-web/src/main/resources/static/img/iphone8.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/img/iphonex.png b/miaosha-v2/miaosha-web/src/main/resources/static/img/iphonex.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/img/iphonex.png rename to miaosha-v2/miaosha-web/src/main/resources/static/img/iphonex.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/img/logo_bg.jpg b/miaosha-v2/miaosha-web/src/main/resources/static/img/logo_bg.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/img/logo_bg.jpg rename to miaosha-v2/miaosha-web/src/main/resources/static/img/logo_bg.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/img/logowz.png b/miaosha-v2/miaosha-web/src/main/resources/static/img/logowz.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/img/logowz.png rename to miaosha-v2/miaosha-web/src/main/resources/static/img/logowz.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/img/meta10.png b/miaosha-v2/miaosha-web/src/main/resources/static/img/meta10.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/img/meta10.png rename to miaosha-v2/miaosha-web/src/main/resources/static/img/meta10.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/img/mi6.png b/miaosha-v2/miaosha-web/src/main/resources/static/img/mi6.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/img/mi6.png rename to miaosha-v2/miaosha-web/src/main/resources/static/img/mi6.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/jquery-validation/additional-methods.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/jquery-validation/additional-methods.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/jquery-validation/additional-methods.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/jquery-validation/additional-methods.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/jquery-validation/jquery.validate.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/jquery-validation/jquery.validate.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/jquery-validation/jquery.validate.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/jquery-validation/jquery.validate.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/jquery-validation/localization/messages_zh.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/jquery-validation/localization/messages_zh.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/jquery-validation/localization/messages_zh.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/jquery-validation/localization/messages_zh.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/My97DatePicker.htm b/miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/My97DatePicker.htm similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/My97DatePicker.htm rename to miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/My97DatePicker.htm diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/WdatePicker.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/WdatePicker.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/WdatePicker.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/WdatePicker.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/calendar.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/calendar.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/calendar.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/calendar.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/config.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/config.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/config.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/config.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/lang/en.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/lang/en.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/lang/en.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/lang/en.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/lang/zh-cn.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/lang/zh-cn.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/lang/zh-cn.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/lang/zh-cn.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/lang/zh-tw.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/lang/zh-tw.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/lang/zh-tw.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/lang/zh-tw.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/WdatePicker.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/WdatePicker.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/WdatePicker.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/WdatePicker.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/datePicker.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/datePicker.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/datePicker.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/datePicker.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/default/datepicker.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/default/datepicker.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/default/datepicker.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/default/datepicker.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/default/img.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/default/img.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/default/img.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/default/img.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/whyGreen/bg.jpg b/miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/whyGreen/bg.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/whyGreen/bg.jpg rename to miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/whyGreen/bg.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/whyGreen/datepicker.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/whyGreen/datepicker.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/whyGreen/datepicker.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/whyGreen/datepicker.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/whyGreen/img.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/whyGreen/img.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/whyGreen/img.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/whyGreen/img.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/bank.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/bank.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/bank.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/bank.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css.map b/miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css.map similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css.map rename to miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css.map diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap-theme.min.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap-theme.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap-theme.min.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap-theme.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap.css.map b/miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap.css.map similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap.css.map rename to miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap.css.map diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap.min.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap.min.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.eot b/miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.eot rename to miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.eot diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.svg b/miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.svg rename to miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.svg diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.ttf b/miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.ttf diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.woff b/miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.woff rename to miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.woff diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.woff2 rename to miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.woff2 diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/js/bootstrap.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/js/bootstrap.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/js/bootstrap.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/js/bootstrap.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/js/bootstrap.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/js/bootstrap.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/js/bootstrap.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/js/bootstrap.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/js/npm.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/js/npm.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap/js/npm.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/js/npm.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/common.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/common.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/common.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/common.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/common1.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/common1.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/common1.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/common1.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/jquery.bootstrap.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/jquery.bootstrap.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/jquery.bootstrap.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/jquery.bootstrap.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/jquery.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/jquery.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/jquery.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/jquery.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/jquery/jquery-2.1.3.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/jquery/jquery-2.1.3.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/jquery/jquery-2.1.3.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/jquery/jquery-2.1.3.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/jquery/jquery-2.1.3.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/jquery/jquery-2.1.3.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/jquery/jquery-2.1.3.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/jquery/jquery-2.1.3.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/md5.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/md5.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/md5.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/md5.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/metisMenu/metisMenu.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/metisMenu/metisMenu.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/metisMenu/metisMenu.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/metisMenu/metisMenu.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/metisMenu/metisMenu.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/metisMenu/metisMenu.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/metisMenu/metisMenu.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/metisMenu/metisMenu.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins-override.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins-override.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins-override.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins-override.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/.gitattributes b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/.gitattributes similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/.gitattributes rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/.gitattributes diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/.gitignore b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/.gitignore similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/.gitignore rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/.gitignore diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/.travis.yml b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/.travis.yml similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/.travis.yml rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/.travis.yml diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/README.md b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/README.md similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/README.md rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/README.md diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/css/bootstrap-datetimepicker.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/css/bootstrap-datetimepicker.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/css/bootstrap-datetimepicker.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/css/bootstrap-datetimepicker.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/css/bootstrap-datetimepicker.min.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/css/bootstrap-datetimepicker.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/css/bootstrap-datetimepicker.min.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/css/bootstrap-datetimepicker.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/js/bootstrap-datetimepicker.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/js/bootstrap-datetimepicker.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/js/bootstrap-datetimepicker.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/js/bootstrap-datetimepicker.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/js/bootstrap-datetimepicker.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/js/bootstrap-datetimepicker.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/js/bootstrap-datetimepicker.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/js/bootstrap-datetimepicker.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.min.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.min.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings-white.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings-white.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings-white.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings-white.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/index.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/index.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/jquery/jquery-1.8.3.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/jquery/jquery-1.8.3.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/jquery/jquery-1.8.3.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/jquery/jquery-1.8.3.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.min.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.min.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.min.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.min.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.eot b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.eot rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.svg b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.svg rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.ttf b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.woff b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.woff rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/index.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/index.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/jquery/jquery-1.8.3.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/jquery/jquery-1.8.3.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/jquery/jquery-1.8.3.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/jquery/jquery-1.8.3.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/.gitattributes b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/.gitattributes similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/.gitattributes rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/.gitattributes diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/.gitignore b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/.gitignore similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/.gitignore rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/.gitignore diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/MIT-LICENSE.txt b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/MIT-LICENSE.txt similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/MIT-LICENSE.txt rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/MIT-LICENSE.txt diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/README.md b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/README.md similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/README.md rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/README.md diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/bower.json b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/bower.json similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/bower.json rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/bower.json diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/flipcountdown.jquery.json b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/flipcountdown.jquery.json similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/flipcountdown.jquery.json rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/flipcountdown.jquery.json diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/am-pm-1.psd b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/am-pm-1.psd similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/am-pm-1.psd rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/am-pm-1.psd diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-lg-dark.psd b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-lg-dark.psd similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-lg-dark.psd rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-lg-dark.psd diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-lg.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-lg.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-lg.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-lg.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-lg.psd b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-lg.psd similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-lg.psd rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-lg.psd diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-md.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-md.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-md.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-md.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-sm.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-sm.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-sm.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-sm.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-xs.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-xs.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-xs.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-xs.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/index.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/index.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/jquery.flipcountdown.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/jquery.flipcountdown.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/jquery.flipcountdown.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/jquery.flipcountdown.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/jquery.flipcountdown.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/jquery.flipcountdown.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/jquery.flipcountdown.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/jquery.flipcountdown.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/jquery.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/jquery.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/jquery.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/jquery.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/package.json b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/package.json similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/package.json rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/package.json diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/screen/1.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/screen/1.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/screen/1.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/screen/1.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/screen/2.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/screen/2.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/screen/2.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/screen/2.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/.gitattributes b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/.gitattributes similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/.gitattributes rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/.gitattributes diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/.gitignore b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/.gitignore similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/.gitignore rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/.gitignore diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/.travis.yml b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/.travis.yml similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/.travis.yml rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/.travis.yml diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/ajaxSubmit-intergration-demo.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/ajaxSubmit-intergration-demo.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/ajaxSubmit-intergration-demo.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/ajaxSubmit-intergration-demo.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/captcha.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/captcha.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/captcha.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/captcha.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/fonts/Anorexia.ttf b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/fonts/Anorexia.ttf similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/fonts/Anorexia.ttf rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/fonts/Anorexia.ttf diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/image_req.php b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/image_req.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/image_req.php rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/image_req.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/images/.htaccess b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/images/.htaccess similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/images/.htaccess rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/images/.htaccess diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/images/button.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/images/button.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/images/button.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/images/button.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/images/image.php b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/images/image.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/images/image.php rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/images/image.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/index.php b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/index.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/index.php rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/index.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/newsession.php b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/newsession.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/newsession.php rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/newsession.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/process.php b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/process.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/process.php rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/process.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/rand.php b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/rand.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/rand.php rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/rand.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/style.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/style.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/style.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/style.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/chili.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/chili.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/chili.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/chili.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/cmxform.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/cmxform.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/cmxform.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/cmxform.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/cmxformTemplate.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/cmxformTemplate.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/cmxformTemplate.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/cmxformTemplate.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/core.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/core.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/core.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/core.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/reset.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/reset.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/reset.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/reset.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/screen.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/screen.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/screen.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/screen.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/custom-messages-data-demo.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/custom-messages-data-demo.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/custom-messages-data-demo.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/custom-messages-data-demo.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/custom-methods-demo.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/custom-methods-demo.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/custom-methods-demo.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/custom-methods-demo.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/dynamic-totals.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/dynamic-totals.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/dynamic-totals.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/dynamic-totals.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/errorcontainer-demo.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/errorcontainer-demo.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/errorcontainer-demo.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/errorcontainer-demo.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/file_input.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/file_input.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/file_input.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/file_input.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/form.php b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/form.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/form.php rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/form.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/form.phps b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/form.phps similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/form.phps rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/form.phps diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/bg.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/bg.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/bg.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/bg.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/checked.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/checked.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/checked.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/checked.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/cmxform-divider.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/cmxform-divider.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/cmxform-divider.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/cmxform-divider.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/cmxform-fieldset.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/cmxform-fieldset.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/cmxform-fieldset.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/cmxform-fieldset.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/loading.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/loading.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/loading.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/loading.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/unchecked.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/unchecked.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/unchecked.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/unchecked.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/index.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/index.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/jquerymobile.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/jquerymobile.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/jquerymobile.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/jquerymobile.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/js/chili-1.7.pack.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/js/chili-1.7.pack.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/js/chili-1.7.pack.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/js/chili-1.7.pack.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/bg.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/bg.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/bg.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/bg.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/header1.jpg b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/header1.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/header1.jpg rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/header1.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/page.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/page.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/page.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/page.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/required_star.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/required_star.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/required_star.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/required_star.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/index.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/index.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/screen.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/screen.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/screen.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/screen.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/emails.php b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/emails.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/emails.php rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/emails.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/emails.phps b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/emails.phps similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/emails.phps rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/emails.phps diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/ie6.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/ie6.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/ie6.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/ie6.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/backRequiredGray.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/backRequiredGray.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/backRequiredGray.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/backRequiredGray.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/back_green-fade.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/back_green-fade.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/back_green-fade.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/back_green-fade.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/back_nav_blue.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/back_nav_blue.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/back_nav_blue.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/back_nav_blue.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/blank.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/blank.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/blank.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/blank.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/button-submit.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/button-submit.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/button-submit.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/button-submit.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/favicon.ico b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/favicon.ico similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/favicon.ico rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/favicon.ico diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/help.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/help.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/help.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/help.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/left-nav-callout-long.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/left-nav-callout-long.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/left-nav-callout-long.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/left-nav-callout-long.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/login-sprite.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/login-sprite.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/login-sprite.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/login-sprite.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/logo_marketo.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/logo_marketo.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/logo_marketo.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/logo_marketo.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/sf.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/sf.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/sf.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/sf.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/step1-24.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/step1-24.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/step1-24.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/step1-24.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/step2-24.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/step2-24.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/step2-24.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/step2-24.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/step3-24.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/step3-24.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/step3-24.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/step3-24.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/tab-sprite.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/tab-sprite.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/tab-sprite.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/tab-sprite.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/tab_green.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/tab_green.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/tab_green.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/tab_green.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/time.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/time.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/time.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/time.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/toggle.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/toggle.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/toggle.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/toggle.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/warning.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/warning.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/warning.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/warning.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/index.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/index.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/jquery.maskedinput.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/jquery.maskedinput.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/jquery.maskedinput.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/jquery.maskedinput.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/mktSignup.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/mktSignup.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/mktSignup.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/mktSignup.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/step2.htm b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/step2.htm similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/step2.htm rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/step2.htm diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/stylesheet.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/stylesheet.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/stylesheet.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/stylesheet.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/bg.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/bg.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/bg.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/bg.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/emails.php b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/emails.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/emails.php rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/emails.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/emails.phps b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/emails.phps similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/emails.phps rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/emails.phps diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/index.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/index.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/left_white.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/left_white.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/left_white.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/left_white.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/milk.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/milk.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/milk.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/milk.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/milk.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/milk.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/milk.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/milk.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/right_white.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/right_white.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/right_white.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/right_white.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/users.php b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/users.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/users.php rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/users.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/users.phps b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/users.phps similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/users.phps rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/users.phps diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/index.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/index.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/js/jquery.maskedinput-1.0.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/js/jquery.maskedinput-1.0.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/js/jquery.maskedinput-1.0.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/js/jquery.maskedinput-1.0.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/js/ui.accordion.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/js/ui.accordion.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/js/ui.accordion.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/js/ui.accordion.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/js/ui.core.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/js/ui.core.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/js/ui.core.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/js/ui.core.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/style.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/style.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/style.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/style.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/radio-checkbox-select-demo.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/radio-checkbox-select-demo.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/radio-checkbox-select-demo.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/radio-checkbox-select-demo.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tabs/index.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tabs/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tabs/index.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tabs/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/themerollered.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/themerollered.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/themerollered.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/themerollered.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/index.html b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/index.html rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/editor_template.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/editor_template.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/editor_template.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/editor_template.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/img/icons.gif b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/img/icons.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/img/icons.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/img/icons.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/langs/en.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/langs/en.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/langs/en.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/langs/en.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/skins/default/ui.css b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/skins/default/ui.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/skins/default/ui.css rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/skins/default/ui.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/tiny_mce.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/tiny_mce.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/tiny_mce.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/tiny_mce.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/jquery.validate.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/jquery.validate.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/jquery.validate.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/jquery.validate.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.6.4.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.6.4.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.6.4.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.6.4.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.7.2.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.7.2.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.7.2.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.7.2.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.8.3.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.8.3.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.8.3.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.8.3.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.9.0.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.9.0.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.9.0.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.9.0.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery.form.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery.form.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery.form.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery.form.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery.mockjax.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery.mockjax.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery.mockjax.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery.mockjax.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/localization/messages_zh.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/localization/messages_zh.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/localization/messages_zh.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/localization/messages_zh.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery.form.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery.form.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery.form.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery.form.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery.twbsPagination.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery.twbsPagination.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery.twbsPagination.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery.twbsPagination.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery.twbsPagination.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery.twbsPagination.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/jquery.twbsPagination.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/jquery.twbsPagination.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/uploadify/jquery.uploadify.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/uploadify/jquery.uploadify.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/uploadify/jquery.uploadify.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/uploadify/jquery.uploadify.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/uploadify/jquery.uploadify.min.js b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/uploadify/jquery.uploadify.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/uploadify/jquery.uploadify.min.js rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/uploadify/jquery.uploadify.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/uploadify/uploadify-cancel.png b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/uploadify/uploadify-cancel.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/uploadify/uploadify-cancel.png rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/uploadify/uploadify-cancel.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/uploadify/uploadify.swf b/miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/uploadify/uploadify.swf similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/static/js/plugins/uploadify/uploadify.swf rename to miaosha-v2/miaosha-web/src/main/resources/static/js/plugins/uploadify/uploadify.swf diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/layer/layer.js b/miaosha-v2/miaosha-web/src/main/resources/static/layer/layer.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/layer/layer.js rename to miaosha-v2/miaosha-web/src/main/resources/static/layer/layer.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/layer/mobile/layer.js b/miaosha-v2/miaosha-web/src/main/resources/static/layer/mobile/layer.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/layer/mobile/layer.js rename to miaosha-v2/miaosha-web/src/main/resources/static/layer/mobile/layer.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/layer/mobile/need/layer.css b/miaosha-v2/miaosha-web/src/main/resources/static/layer/mobile/need/layer.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/layer/mobile/need/layer.css rename to miaosha-v2/miaosha-web/src/main/resources/static/layer/mobile/need/layer.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/layer/skin/default/icon-ext.png b/miaosha-v2/miaosha-web/src/main/resources/static/layer/skin/default/icon-ext.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/layer/skin/default/icon-ext.png rename to miaosha-v2/miaosha-web/src/main/resources/static/layer/skin/default/icon-ext.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/layer/skin/default/icon.png b/miaosha-v2/miaosha-web/src/main/resources/static/layer/skin/default/icon.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/layer/skin/default/icon.png rename to miaosha-v2/miaosha-web/src/main/resources/static/layer/skin/default/icon.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/layer/skin/default/layer.css b/miaosha-v2/miaosha-web/src/main/resources/static/layer/skin/default/layer.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/layer/skin/default/layer.css rename to miaosha-v2/miaosha-web/src/main/resources/static/layer/skin/default/layer.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/layer/skin/default/loading-0.gif b/miaosha-v2/miaosha-web/src/main/resources/static/layer/skin/default/loading-0.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/layer/skin/default/loading-0.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/layer/skin/default/loading-0.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/layer/skin/default/loading-1.gif b/miaosha-v2/miaosha-web/src/main/resources/static/layer/skin/default/loading-1.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/layer/skin/default/loading-1.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/layer/skin/default/loading-1.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/layer/skin/default/loading-2.gif b/miaosha-v2/miaosha-web/src/main/resources/static/layer/skin/default/loading-2.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/layer/skin/default/loading-2.gif rename to miaosha-v2/miaosha-web/src/main/resources/static/layer/skin/default/loading-2.gif diff --git a/src/main/resources/static/order_detail.htm b/miaosha-v2/miaosha-web/src/main/resources/static/order_detail.htm similarity index 100% rename from src/main/resources/static/order_detail.htm rename to miaosha-v2/miaosha-web/src/main/resources/static/order_detail.htm diff --git a/src/main/resources/static/bootstrap/css/bootstrap-theme.css b/miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap-theme.css similarity index 100% rename from src/main/resources/static/bootstrap/css/bootstrap-theme.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap-theme.css diff --git a/src/main/resources/static/bootstrap/css/bootstrap-theme.css.map b/miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap-theme.css.map similarity index 100% rename from src/main/resources/static/bootstrap/css/bootstrap-theme.css.map rename to miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap-theme.css.map diff --git a/src/main/resources/static/bootstrap/css/bootstrap-theme.min.css b/miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap-theme.min.css similarity index 100% rename from src/main/resources/static/bootstrap/css/bootstrap-theme.min.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap-theme.min.css diff --git a/src/main/resources/static/bootstrap/css/bootstrap-theme.min.css.map b/miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap-theme.min.css.map similarity index 100% rename from src/main/resources/static/bootstrap/css/bootstrap-theme.min.css.map rename to miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap-theme.min.css.map diff --git a/src/main/resources/static/bootstrap/css/bootstrap.css b/miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap.css similarity index 100% rename from src/main/resources/static/bootstrap/css/bootstrap.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap.css diff --git a/src/main/resources/static/bootstrap/css/bootstrap.css.map b/miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap.css.map similarity index 100% rename from src/main/resources/static/bootstrap/css/bootstrap.css.map rename to miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap.css.map diff --git a/src/main/resources/static/bootstrap/css/bootstrap.min.css b/miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap.min.css similarity index 100% rename from src/main/resources/static/bootstrap/css/bootstrap.min.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap.min.css diff --git a/src/main/resources/static/bootstrap/css/bootstrap.min.css.map b/miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap.min.css.map similarity index 100% rename from src/main/resources/static/bootstrap/css/bootstrap.min.css.map rename to miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/css/bootstrap.min.css.map diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.eot b/miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.eot rename to miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.svg b/miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.svg rename to miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.ttf b/miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.ttf rename to miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.woff b/miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.woff rename to miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.woff2 b/miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.woff2 rename to miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/fonts/glyphicons-halflings-regular.woff2 diff --git a/src/main/resources/static/bootstrap/js/bootstrap.js b/miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/js/bootstrap.js similarity index 100% rename from src/main/resources/static/bootstrap/js/bootstrap.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/js/bootstrap.js diff --git a/src/main/resources/static/bootstrap/js/bootstrap.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/js/bootstrap.min.js similarity index 100% rename from src/main/resources/static/bootstrap/js/bootstrap.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/js/bootstrap.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/js/npm.js b/miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/js/npm.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/js/npm.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap/js/npm.js diff --git a/src/main/resources/static/css/common.css b/miaosha-v2/miaosha-web/src/main/resources/templates/css/common.css similarity index 100% rename from src/main/resources/static/css/common.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/css/common.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/css/common1.css b/miaosha-v2/miaosha-web/src/main/resources/templates/css/common1.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/css/common1.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/css/common1.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/css/font-awesome.min.css b/miaosha-v2/miaosha-web/src/main/resources/templates/css/font-awesome.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/css/font-awesome.min.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/css/font-awesome.min.css diff --git a/src/main/resources/static/css/reset.css b/miaosha-v2/miaosha-web/src/main/resources/templates/css/reset.css similarity index 100% rename from src/main/resources/static/css/reset.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/css/reset.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/css/slide-unlock.css b/miaosha-v2/miaosha-web/src/main/resources/templates/css/slide-unlock.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/css/slide-unlock.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/css/slide-unlock.css diff --git a/src/main/resources/static/fonts/FontAwesome.otf b/miaosha-v2/miaosha-web/src/main/resources/templates/fonts/FontAwesome.otf similarity index 100% rename from src/main/resources/static/fonts/FontAwesome.otf rename to miaosha-v2/miaosha-web/src/main/resources/templates/fonts/FontAwesome.otf diff --git a/src/main/resources/static/fonts/fontawesome-webfont.eot b/miaosha-v2/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.eot similarity index 100% rename from src/main/resources/static/fonts/fontawesome-webfont.eot rename to miaosha-v2/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.eot diff --git a/src/main/resources/static/fonts/fontawesome-webfont.svg b/miaosha-v2/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.svg similarity index 100% rename from src/main/resources/static/fonts/fontawesome-webfont.svg rename to miaosha-v2/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.svg diff --git a/src/main/resources/static/fonts/fontawesome-webfont.ttf b/miaosha-v2/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.ttf similarity index 100% rename from src/main/resources/static/fonts/fontawesome-webfont.ttf rename to miaosha-v2/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.ttf diff --git a/src/main/resources/static/fonts/fontawesome-webfont.woff b/miaosha-v2/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.woff similarity index 100% rename from src/main/resources/static/fonts/fontawesome-webfont.woff rename to miaosha-v2/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.woff diff --git a/src/main/resources/static/fonts/fontawesome-webfont.woff2 b/miaosha-v2/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.woff2 similarity index 100% rename from src/main/resources/static/fonts/fontawesome-webfont.woff2 rename to miaosha-v2/miaosha-web/src/main/resources/templates/fonts/fontawesome-webfont.woff2 diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/goods_list.html b/miaosha-v2/miaosha-web/src/main/resources/templates/goods_list.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/goods_list.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/goods_list.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/hello.html b/miaosha-v2/miaosha-web/src/main/resources/templates/hello.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/hello.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/hello.html diff --git a/src/main/resources/static/img/bg.jpg b/miaosha-v2/miaosha-web/src/main/resources/templates/img/bg.jpg similarity index 100% rename from src/main/resources/static/img/bg.jpg rename to miaosha-v2/miaosha-web/src/main/resources/templates/img/bg.jpg diff --git a/src/main/resources/static/img/bg2.jpg b/miaosha-v2/miaosha-web/src/main/resources/templates/img/bg2.jpg similarity index 100% rename from src/main/resources/static/img/bg2.jpg rename to miaosha-v2/miaosha-web/src/main/resources/templates/img/bg2.jpg diff --git a/src/main/resources/static/img/iphone8.png b/miaosha-v2/miaosha-web/src/main/resources/templates/img/iphone8.png similarity index 100% rename from src/main/resources/static/img/iphone8.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/img/iphone8.png diff --git a/src/main/resources/static/img/iphonex.png b/miaosha-v2/miaosha-web/src/main/resources/templates/img/iphonex.png similarity index 100% rename from src/main/resources/static/img/iphonex.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/img/iphonex.png diff --git a/src/main/resources/static/img/logo_bg.jpg b/miaosha-v2/miaosha-web/src/main/resources/templates/img/logo_bg.jpg similarity index 100% rename from src/main/resources/static/img/logo_bg.jpg rename to miaosha-v2/miaosha-web/src/main/resources/templates/img/logo_bg.jpg diff --git a/src/main/resources/static/img/logowz.png b/miaosha-v2/miaosha-web/src/main/resources/templates/img/logowz.png similarity index 100% rename from src/main/resources/static/img/logowz.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/img/logowz.png diff --git a/src/main/resources/static/img/meta10.png b/miaosha-v2/miaosha-web/src/main/resources/templates/img/meta10.png similarity index 100% rename from src/main/resources/static/img/meta10.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/img/meta10.png diff --git a/src/main/resources/static/img/mi6.png b/miaosha-v2/miaosha-web/src/main/resources/templates/img/mi6.png similarity index 100% rename from src/main/resources/static/img/mi6.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/img/mi6.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/index.html b/miaosha-v2/miaosha-web/src/main/resources/templates/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/index.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/index2.html b/miaosha-v2/miaosha-web/src/main/resources/templates/index2.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/index2.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/index2.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/jquery-validation/additional-methods.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/jquery-validation/additional-methods.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/jquery-validation/additional-methods.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/jquery-validation/additional-methods.min.js diff --git a/src/main/resources/static/jquery-validation/jquery.validate.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/jquery-validation/jquery.validate.min.js similarity index 100% rename from src/main/resources/static/jquery-validation/jquery.validate.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/jquery-validation/jquery.validate.min.js diff --git a/src/main/resources/static/jquery-validation/localization/messages_zh.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/jquery-validation/localization/messages_zh.min.js similarity index 100% rename from src/main/resources/static/jquery-validation/localization/messages_zh.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/jquery-validation/localization/messages_zh.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/My97DatePicker.htm b/miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/My97DatePicker.htm similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/My97DatePicker.htm rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/My97DatePicker.htm diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/WdatePicker.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/WdatePicker.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/WdatePicker.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/WdatePicker.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/calendar.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/calendar.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/calendar.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/calendar.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/config.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/config.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/config.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/config.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/lang/en.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/lang/en.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/lang/en.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/lang/en.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/lang/zh-cn.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/lang/zh-cn.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/lang/zh-cn.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/lang/zh-cn.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/lang/zh-tw.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/lang/zh-tw.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/lang/zh-tw.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/lang/zh-tw.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/WdatePicker.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/WdatePicker.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/WdatePicker.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/WdatePicker.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/datePicker.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/datePicker.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/datePicker.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/datePicker.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/default/datepicker.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/default/datepicker.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/default/datepicker.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/default/datepicker.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/default/img.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/default/img.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/default/img.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/default/img.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/whyGreen/bg.jpg b/miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/whyGreen/bg.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/whyGreen/bg.jpg rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/whyGreen/bg.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/whyGreen/datepicker.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/whyGreen/datepicker.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/whyGreen/datepicker.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/whyGreen/datepicker.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/whyGreen/img.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/whyGreen/img.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/whyGreen/img.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/whyGreen/img.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/bank.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/bank.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/bank.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/bank.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css.map b/miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css.map similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css.map rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css.map diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap-theme.min.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap-theme.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap-theme.min.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap-theme.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap.css.map b/miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap.css.map similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap.css.map rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap.css.map diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap.min.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap.min.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap.min.css diff --git a/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.eot b/miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.eot rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.eot diff --git a/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.svg b/miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.svg rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.svg diff --git a/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.ttf b/miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.ttf diff --git a/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff b/miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.woff diff --git a/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff2 rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/fonts/glyphicons-halflings-regular.woff2 diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/js/bootstrap.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/js/bootstrap.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/js/bootstrap.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/js/bootstrap.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/js/bootstrap.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/js/bootstrap.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/js/bootstrap.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/js/bootstrap.min.js diff --git a/src/main/resources/static/bootstrap/js/npm.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/js/npm.js similarity index 100% rename from src/main/resources/static/bootstrap/js/npm.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/js/npm.js diff --git a/src/main/resources/static/js/common.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/common.js similarity index 100% rename from src/main/resources/static/js/common.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/common.js diff --git a/src/main/resources/static/js/common1.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/common1.js similarity index 100% rename from src/main/resources/static/js/common1.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/common1.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/jquery.bootstrap.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/jquery.bootstrap.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/jquery.bootstrap.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/jquery.bootstrap.min.js diff --git a/src/main/resources/static/js/jquery.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/jquery.min.js similarity index 100% rename from src/main/resources/static/js/jquery.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/jquery.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/jquery/jquery-2.1.3.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/jquery/jquery-2.1.3.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/jquery/jquery-2.1.3.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/jquery/jquery-2.1.3.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/jquery/jquery-2.1.3.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/jquery/jquery-2.1.3.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/jquery/jquery-2.1.3.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/jquery/jquery-2.1.3.min.js diff --git a/src/main/resources/static/js/md5.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/md5.min.js similarity index 100% rename from src/main/resources/static/js/md5.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/md5.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/metisMenu/metisMenu.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/metisMenu/metisMenu.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/metisMenu/metisMenu.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/metisMenu/metisMenu.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/metisMenu/metisMenu.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/metisMenu/metisMenu.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/metisMenu/metisMenu.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/metisMenu/metisMenu.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins-override.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins-override.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins-override.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins-override.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/.gitattributes b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/.gitattributes similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/.gitattributes rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/.gitattributes diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/.gitignore b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/.gitignore similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/.gitignore rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/.gitignore diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/.travis.yml b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/.travis.yml similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/.travis.yml rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/.travis.yml diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/README.md b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/README.md similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/README.md rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/README.md diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/css/bootstrap-datetimepicker.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/css/bootstrap-datetimepicker.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/css/bootstrap-datetimepicker.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/css/bootstrap-datetimepicker.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/css/bootstrap-datetimepicker.min.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/css/bootstrap-datetimepicker.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/css/bootstrap-datetimepicker.min.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/css/bootstrap-datetimepicker.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/js/bootstrap-datetimepicker.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/js/bootstrap-datetimepicker.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/js/bootstrap-datetimepicker.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/js/bootstrap-datetimepicker.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/js/bootstrap-datetimepicker.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/js/bootstrap-datetimepicker.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/js/bootstrap-datetimepicker.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/js/bootstrap-datetimepicker.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.min.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.min.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings-white.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings-white.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings-white.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings-white.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/index.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/index.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/jquery/jquery-1.8.3.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/jquery/jquery-1.8.3.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/jquery/jquery-1.8.3.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/jquery/jquery-1.8.3.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.min.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.min.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.min.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.min.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.min.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.min.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.eot b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.eot rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.svg b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.svg rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.ttf b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.woff b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.woff rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/index.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/index.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/jquery/jquery-1.8.3.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/jquery/jquery-1.8.3.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/jquery/jquery-1.8.3.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/jquery/jquery-1.8.3.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/.gitattributes b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/.gitattributes similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/.gitattributes rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/.gitattributes diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/.gitignore b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/.gitignore similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/.gitignore rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/.gitignore diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/MIT-LICENSE.txt b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/MIT-LICENSE.txt similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/MIT-LICENSE.txt rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/MIT-LICENSE.txt diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/README.md b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/README.md similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/README.md rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/README.md diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/bower.json b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/bower.json similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/bower.json rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/bower.json diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/flipcountdown.jquery.json b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/flipcountdown.jquery.json similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/flipcountdown.jquery.json rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/flipcountdown.jquery.json diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/am-pm-1.psd b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/am-pm-1.psd similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/am-pm-1.psd rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/am-pm-1.psd diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-lg-dark.psd b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-lg-dark.psd similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-lg-dark.psd rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-lg-dark.psd diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-lg.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-lg.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-lg.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-lg.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-lg.psd b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-lg.psd similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-lg.psd rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-lg.psd diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-md.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-md.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-md.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-md.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-sm.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-sm.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-sm.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-sm.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-xs.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-xs.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-xs.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-xs.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/index.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/index.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/jquery.flipcountdown.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/jquery.flipcountdown.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/jquery.flipcountdown.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/jquery.flipcountdown.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/jquery.flipcountdown.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/jquery.flipcountdown.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/jquery.flipcountdown.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/jquery.flipcountdown.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/jquery.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/jquery.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/jquery.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/jquery.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/package.json b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/package.json similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/package.json rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/package.json diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/screen/1.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/screen/1.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/screen/1.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/screen/1.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/screen/2.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/screen/2.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/screen/2.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/screen/2.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/.gitattributes b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/.gitattributes similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/.gitattributes rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/.gitattributes diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/.gitignore b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/.gitignore similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/.gitignore rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/.gitignore diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/.travis.yml b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/.travis.yml similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/.travis.yml rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/.travis.yml diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/ajaxSubmit-intergration-demo.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/ajaxSubmit-intergration-demo.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/ajaxSubmit-intergration-demo.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/ajaxSubmit-intergration-demo.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/captcha.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/captcha.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/captcha.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/captcha.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/fonts/Anorexia.ttf b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/fonts/Anorexia.ttf similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/fonts/Anorexia.ttf rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/fonts/Anorexia.ttf diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/image_req.php b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/image_req.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/image_req.php rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/image_req.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/images/.htaccess b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/images/.htaccess similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/images/.htaccess rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/images/.htaccess diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/images/button.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/images/button.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/images/button.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/images/button.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/images/image.php b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/images/image.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/images/image.php rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/images/image.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/index.php b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/index.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/index.php rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/index.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/newsession.php b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/newsession.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/newsession.php rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/newsession.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/process.php b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/process.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/process.php rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/process.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/rand.php b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/rand.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/rand.php rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/rand.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/style.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/style.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/style.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/style.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/chili.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/chili.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/chili.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/chili.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/cmxform.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/cmxform.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/cmxform.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/cmxform.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/cmxformTemplate.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/cmxformTemplate.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/cmxformTemplate.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/cmxformTemplate.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/core.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/core.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/core.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/core.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/reset.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/reset.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/reset.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/reset.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/screen.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/screen.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/screen.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/screen.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/custom-messages-data-demo.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/custom-messages-data-demo.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/custom-messages-data-demo.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/custom-messages-data-demo.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/custom-methods-demo.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/custom-methods-demo.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/custom-methods-demo.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/custom-methods-demo.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/dynamic-totals.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/dynamic-totals.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/dynamic-totals.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/dynamic-totals.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/errorcontainer-demo.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/errorcontainer-demo.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/errorcontainer-demo.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/errorcontainer-demo.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/file_input.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/file_input.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/file_input.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/file_input.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/form.php b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/form.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/form.php rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/form.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/form.phps b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/form.phps similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/form.phps rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/form.phps diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/bg.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/bg.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/bg.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/bg.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/checked.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/checked.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/checked.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/checked.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/cmxform-divider.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/cmxform-divider.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/cmxform-divider.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/cmxform-divider.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/cmxform-fieldset.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/cmxform-fieldset.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/cmxform-fieldset.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/cmxform-fieldset.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/loading.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/loading.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/loading.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/loading.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/unchecked.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/unchecked.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/unchecked.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/unchecked.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/index.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/index.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/jquerymobile.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/jquerymobile.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/jquerymobile.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/jquerymobile.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/js/chili-1.7.pack.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/js/chili-1.7.pack.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/js/chili-1.7.pack.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/js/chili-1.7.pack.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/bg.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/bg.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/bg.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/bg.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/header1.jpg b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/header1.jpg similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/header1.jpg rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/header1.jpg diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/page.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/page.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/page.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/page.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/required_star.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/required_star.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/required_star.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/required_star.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/index.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/index.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/screen.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/screen.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/screen.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/screen.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/emails.php b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/emails.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/emails.php rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/emails.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/emails.phps b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/emails.phps similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/emails.phps rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/emails.phps diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/ie6.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/ie6.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/ie6.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/ie6.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/backRequiredGray.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/backRequiredGray.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/backRequiredGray.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/backRequiredGray.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/back_green-fade.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/back_green-fade.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/back_green-fade.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/back_green-fade.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/back_nav_blue.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/back_nav_blue.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/back_nav_blue.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/back_nav_blue.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/blank.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/blank.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/blank.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/blank.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/button-submit.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/button-submit.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/button-submit.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/button-submit.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/favicon.ico b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/favicon.ico similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/favicon.ico rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/favicon.ico diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/help.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/help.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/help.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/help.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/left-nav-callout-long.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/left-nav-callout-long.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/left-nav-callout-long.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/left-nav-callout-long.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/login-sprite.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/login-sprite.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/login-sprite.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/login-sprite.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/logo_marketo.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/logo_marketo.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/logo_marketo.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/logo_marketo.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/sf.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/sf.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/sf.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/sf.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/step1-24.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/step1-24.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/step1-24.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/step1-24.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/step2-24.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/step2-24.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/step2-24.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/step2-24.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/step3-24.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/step3-24.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/step3-24.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/step3-24.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/tab-sprite.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/tab-sprite.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/tab-sprite.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/tab-sprite.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/tab_green.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/tab_green.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/tab_green.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/tab_green.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/time.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/time.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/time.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/time.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/toggle.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/toggle.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/toggle.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/toggle.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/warning.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/warning.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/warning.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/warning.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/index.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/index.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/jquery.maskedinput.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/jquery.maskedinput.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/jquery.maskedinput.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/jquery.maskedinput.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/mktSignup.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/mktSignup.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/mktSignup.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/mktSignup.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/step2.htm b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/step2.htm similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/step2.htm rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/step2.htm diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/stylesheet.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/stylesheet.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/stylesheet.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/stylesheet.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/bg.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/bg.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/bg.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/bg.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/emails.php b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/emails.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/emails.php rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/emails.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/emails.phps b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/emails.phps similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/emails.phps rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/emails.phps diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/index.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/index.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/left_white.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/left_white.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/left_white.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/left_white.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/milk.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/milk.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/milk.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/milk.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/milk.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/milk.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/milk.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/milk.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/right_white.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/right_white.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/right_white.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/right_white.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/users.php b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/users.php similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/users.php rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/users.php diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/users.phps b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/users.phps similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/users.phps rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/users.phps diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/index.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/index.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/js/jquery.maskedinput-1.0.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/js/jquery.maskedinput-1.0.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/js/jquery.maskedinput-1.0.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/js/jquery.maskedinput-1.0.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/js/ui.accordion.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/js/ui.accordion.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/js/ui.accordion.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/js/ui.accordion.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/js/ui.core.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/js/ui.core.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/js/ui.core.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/js/ui.core.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/style.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/style.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/style.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/style.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/radio-checkbox-select-demo.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/radio-checkbox-select-demo.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/radio-checkbox-select-demo.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/radio-checkbox-select-demo.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tabs/index.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tabs/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tabs/index.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tabs/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/themerollered.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/themerollered.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/themerollered.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/themerollered.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/index.html b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/index.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/index.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/index.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/editor_template.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/editor_template.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/editor_template.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/editor_template.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/img/icons.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/img/icons.gif similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/img/icons.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/img/icons.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/langs/en.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/langs/en.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/langs/en.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/langs/en.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/skins/default/ui.css b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/skins/default/ui.css similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/skins/default/ui.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/skins/default/ui.css diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/tiny_mce.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/tiny_mce.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/tiny_mce.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/tiny_mce.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/jquery.validate.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/jquery.validate.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/jquery.validate.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/jquery.validate.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.6.4.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.6.4.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.6.4.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.6.4.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.7.2.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.7.2.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.7.2.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.7.2.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.8.3.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.8.3.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.8.3.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.8.3.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.9.0.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.9.0.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.9.0.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.9.0.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery.form.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery.form.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery.form.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery.form.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery.mockjax.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery.mockjax.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery.mockjax.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery.mockjax.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/localization/messages_zh.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/localization/messages_zh.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/localization/messages_zh.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/localization/messages_zh.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery.form.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery.form.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery.form.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery.form.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery.twbsPagination.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery.twbsPagination.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery.twbsPagination.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery.twbsPagination.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery.twbsPagination.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery.twbsPagination.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/jquery.twbsPagination.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/jquery.twbsPagination.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/uploadify/jquery.uploadify.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/uploadify/jquery.uploadify.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/uploadify/jquery.uploadify.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/uploadify/jquery.uploadify.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/uploadify/jquery.uploadify.min.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/uploadify/jquery.uploadify.min.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/uploadify/jquery.uploadify.min.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/uploadify/jquery.uploadify.min.js diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/uploadify/uploadify-cancel.png b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/uploadify/uploadify-cancel.png similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/uploadify/uploadify-cancel.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/uploadify/uploadify-cancel.png diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/uploadify/uploadify.swf b/miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/uploadify/uploadify.swf similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/plugins/uploadify/uploadify.swf rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/plugins/uploadify/uploadify.swf diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/js/slideunlock/slideunlock.js b/miaosha-v2/miaosha-web/src/main/resources/templates/js/slideunlock/slideunlock.js similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/js/slideunlock/slideunlock.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/js/slideunlock/slideunlock.js diff --git a/src/main/resources/static/layer/layer.js b/miaosha-v2/miaosha-web/src/main/resources/templates/layer/layer.js similarity index 100% rename from src/main/resources/static/layer/layer.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/layer/layer.js diff --git a/src/main/resources/static/layer/mobile/layer.js b/miaosha-v2/miaosha-web/src/main/resources/templates/layer/mobile/layer.js similarity index 100% rename from src/main/resources/static/layer/mobile/layer.js rename to miaosha-v2/miaosha-web/src/main/resources/templates/layer/mobile/layer.js diff --git a/src/main/resources/static/layer/mobile/need/layer.css b/miaosha-v2/miaosha-web/src/main/resources/templates/layer/mobile/need/layer.css similarity index 100% rename from src/main/resources/static/layer/mobile/need/layer.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/layer/mobile/need/layer.css diff --git a/src/main/resources/static/layer/skin/default/icon-ext.png b/miaosha-v2/miaosha-web/src/main/resources/templates/layer/skin/default/icon-ext.png similarity index 100% rename from src/main/resources/static/layer/skin/default/icon-ext.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/layer/skin/default/icon-ext.png diff --git a/src/main/resources/static/layer/skin/default/icon.png b/miaosha-v2/miaosha-web/src/main/resources/templates/layer/skin/default/icon.png similarity index 100% rename from src/main/resources/static/layer/skin/default/icon.png rename to miaosha-v2/miaosha-web/src/main/resources/templates/layer/skin/default/icon.png diff --git a/src/main/resources/static/layer/skin/default/layer.css b/miaosha-v2/miaosha-web/src/main/resources/templates/layer/skin/default/layer.css similarity index 100% rename from src/main/resources/static/layer/skin/default/layer.css rename to miaosha-v2/miaosha-web/src/main/resources/templates/layer/skin/default/layer.css diff --git a/src/main/resources/static/layer/skin/default/loading-0.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/layer/skin/default/loading-0.gif similarity index 100% rename from src/main/resources/static/layer/skin/default/loading-0.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/layer/skin/default/loading-0.gif diff --git a/src/main/resources/static/layer/skin/default/loading-1.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/layer/skin/default/loading-1.gif similarity index 100% rename from src/main/resources/static/layer/skin/default/loading-1.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/layer/skin/default/loading-1.gif diff --git a/src/main/resources/static/layer/skin/default/loading-2.gif b/miaosha-v2/miaosha-web/src/main/resources/templates/layer/skin/default/loading-2.gif similarity index 100% rename from src/main/resources/static/layer/skin/default/loading-2.gif rename to miaosha-v2/miaosha-web/src/main/resources/templates/layer/skin/default/loading-2.gif diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/login.html b/miaosha-v2/miaosha-web/src/main/resources/templates/login.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/login.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/login.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/login222.html b/miaosha-v2/miaosha-web/src/main/resources/templates/login222.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/login222.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/login222.html diff --git a/src/main/resources/templates/message_list.html b/miaosha-v2/miaosha-web/src/main/resources/templates/message_list.html similarity index 100% rename from src/main/resources/templates/message_list.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/message_list.html diff --git a/src/main/resources/templates/miaosha_fail.html b/miaosha-v2/miaosha-web/src/main/resources/templates/miaosha_fail.html similarity index 100% rename from src/main/resources/templates/miaosha_fail.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/miaosha_fail.html diff --git a/src/main/resources/templates/order_detail.html b/miaosha-v2/miaosha-web/src/main/resources/templates/order_detail.html similarity index 100% rename from src/main/resources/templates/order_detail.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/order_detail.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/register.html b/miaosha-v2/miaosha-web/src/main/resources/templates/register.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/register.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/register.html diff --git a/src/main/resources/templates/register1.html b/miaosha-v2/miaosha-web/src/main/resources/templates/register1.html similarity index 100% rename from src/main/resources/templates/register1.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/register1.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/register2.html b/miaosha-v2/miaosha-web/src/main/resources/templates/register2.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/register2.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/register2.html diff --git a/miaosha-2version/miaosha-web/src/main/resources/templates/test.html b/miaosha-v2/miaosha-web/src/main/resources/templates/test.html similarity index 100% rename from miaosha-2version/miaosha-web/src/main/resources/templates/test.html rename to miaosha-v2/miaosha-web/src/main/resources/templates/test.html diff --git a/miaosha-2version/miaosha.sql b/miaosha-v2/miaosha.sql similarity index 100% rename from miaosha-2version/miaosha.sql rename to miaosha-v2/miaosha.sql diff --git a/miaosha-2version/mvnw b/miaosha-v2/mvnw similarity index 100% rename from miaosha-2version/mvnw rename to miaosha-v2/mvnw diff --git a/miaosha-2version/mvnw.cmd b/miaosha-v2/mvnw.cmd similarity index 100% rename from miaosha-2version/mvnw.cmd rename to miaosha-v2/mvnw.cmd diff --git a/miaosha-2version/pom.xml b/miaosha-v2/pom.xml similarity index 66% rename from miaosha-2version/pom.xml rename to miaosha-v2/pom.xml index a4352ce..d083500 100644 --- a/miaosha-2version/pom.xml +++ b/miaosha-v2/pom.xml @@ -2,24 +2,23 @@ 4.0.0 + + com.geekq + miaosha-parent + ${revision} + ../pom.xml + + ${revision} + ${project.artifactId} pom + com.geekq.v2 + miaosha-v2 miaosha-common miaosha-service miaosha-web - - org.springframework.boot - spring-boot-starter-parent - 2.1.2.RELEASE - - - com.geekq - miaosha - 0.0.1-SNAPSHOT - miaosha Demo project for Spring Boot - 1.8 1.3.2 @@ -31,54 +30,60 @@ 4.0.1 0.2.0 - + + + + com.geekq.v2 + miaosha-common + ${revision} + + + com.geekq.v2 + miaosha-service + ${revision} + + + com.geekq.api + miaosha-order-api + ${revision} + + + org.springframework.boot spring-boot-starter - + + org.projectlombok + lombok + org.springframework.boot spring-boot-starter-test test - - - com.geekq - miaosha-common - 0.0.1-SNAPSHOT - - org.springframework.boot spring-boot-starter-web - - org.mybatis.spring.boot mybatis-spring-boot-starter ${org.mybatis.version} - - mysql mysql-connector-java - com.alibaba druid ${com.alibaba.druid} - - org.springframework.boot spring-boot-starter-thymeleaf - 2.1.1.RELEASE @@ -95,7 +100,6 @@ net.sourceforge.nekohtml nekohtml - 1.9.22 @@ -111,9 +115,7 @@ org.apache.commons commons-lang3 - 3.6 - joda-time joda-time @@ -130,51 +132,21 @@ dubbo-spring-boot-starter ${dubbo.starter.version} - org.apache.curator curator-framework ${curator-framework.version} - - - org.apache.zookeeper - zookeeper - ${com.zk.version} - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - com.github.sgroschupf zkclient ${com.zk.client} - - org.projectlombok - lombok - 1.18.2 - provided - - - com.github.sgroschupf - zkclient - ${com.zk.client} - - com.geekq.api miaosha-order-api - 0.0.1-SNAPSHOT + ${revision} - @@ -184,32 +156,32 @@ spring-boot-maven-plugin - - - src/main/java - - **/*.properties - **/*.xml - - true - - - src/main/resources - + + + src/main/java + + **/*.properties + **/*.xml + + true + + + src/main/resources + - - false - - - src/main/resources - true - - - application.properties - - - - + + false + + + src/main/resources + true + + + application.properties + + + + diff --git a/pom.xml b/pom.xml index c21041e..194fa42 100644 --- a/pom.xml +++ b/pom.xml @@ -3,215 +3,100 @@ 4.0.0 com.geekq - miaosha - 0.0.1-SNAPSHOT - jar - - org.springframework.boot - spring-boot-starter-parent - 1.5.8.RELEASE - + miaosha-parent + ${revision} + pom + 1.0.0 + false + 2.8.2 + 3.8.1 + 3.2.1 + 3.2.3 + 1.7.32 + 31.0.1-jre + 2.13.0 + 4.13.2 + 1.33 + 0.10.2 + 2.6.1 UTF-8 + 1.8 + 1.8 - miaosha - http://maven.apache.org + miaosha-parent + + miaosha-v2 + miaosha-v1 + miaosha-admin + miaosha-order + miaosha-rpc + - - - - com.github.sgroschupf - zkclient - 0.1 - - - - - org.apache.curator - curator-framework - 4.0.0 - - - org.apache.curator - curator-recipes - 4.0.0 - - - - com.alibaba - dubbo - 2.5.3 - - - org.springframework - spring - - - - - org.apache.zookeeper - zookeeper - 3.4.6 - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - - - - - org.springframework.boot - spring-boot-starter-tomcat - - provided - - - - com.google.guava - guava - 18.0 - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 1.3.2 - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - - - - - - - - - - mysql - mysql-connector-java - - - - com.alibaba - druid - 1.0.5 - - - - redis.clients - jedis - - - - com.alibaba - fastjson - 1.2.38 - - - salt - commons-codec - commons-codec - - - org.apache.commons - commons-lang3 - 3.6 - - - - commons-codec - commons-codec - - - org.apache.commons - commons-lang3 - 3.6 - - - - org.springframework.boot - spring-boot-starter-validation - - - - org.springframework.boot - spring-boot-starter-amqp - - - joda-time - joda-time - 2.3 - - - - - - - - - - org.springframework.boot - spring-boot-starter-amqp - - - - org.projectlombok - lombok - 1.18.2 - provided - - - org.springframework.boot - spring-boot-test - - - - - - ${project.artifactId} - - + + + org.springframework.boot - spring-boot-maven-plugin - + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + org.reflections + reflections + ${reflections.version} + + + org.slf4j + slf4j-api + ${slfj4.version} + + + junit + junit + ${junit.version} + + + org.openjdk.jmh + jmh-core + ${jmh.version} + + + com.google.guava + guava + ${guava.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.alibaba + fastjson + 1.2.78 + + + com.alibaba + druid + 1.2.8 + + + + + ${project.artifactId}-${project.version} + org.mybatis.generator mybatis-generator-maven-plugin @@ -228,68 +113,49 @@ + + org.apache.maven.plugins + maven-war-plugin + ${maven.war.version} + + ${project.artifactId}-${project.version} + + + + org.apache.maven.plugins + maven-deploy-plugin + ${maven.deploy.version} + + ${maven.skip.deploy} + + org.springframework.boot spring-boot-maven-plugin - 1.5.2.RELEASE - - com.geekq.miaosha.GeekQMainApplication - + ${spring-boot.version} - + repackage - - - - - - src/main/java - - **/*.xml - - - - - src/main/resources - true - - application-local.properties - application-dev.properties - application-prod.properties - application-test.properties - - - - - src/main/resources - true - - application-${activatedProperties}.properties - application.properties - - - - local - + local - + true dev - + dev diff --git a/springboot-dubbo/.mvn/wrapper/maven-wrapper.jar b/springboot-dubbo/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index e69de29..0000000 diff --git a/springboot-dubbo/.mvn/wrapper/maven-wrapper.properties b/springboot-dubbo/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index b573bb5..0000000 --- a/springboot-dubbo/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip diff --git a/springboot-dubbo/consumer/.mvn/wrapper/maven-wrapper.jar b/springboot-dubbo/consumer/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index e69de29..0000000 diff --git a/springboot-dubbo/consumer/.mvn/wrapper/maven-wrapper.properties b/springboot-dubbo/consumer/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index b573bb5..0000000 --- a/springboot-dubbo/consumer/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip diff --git a/springboot-dubbo/consumer/src/main/java/com/geekq/dubbo/springboot/consumer/config/TCCConfig.java b/springboot-dubbo/consumer/src/main/java/com/geekq/dubbo/springboot/consumer/config/TCCConfig.java deleted file mode 100644 index 8f41d57..0000000 --- a/springboot-dubbo/consumer/src/main/java/com/geekq/dubbo/springboot/consumer/config/TCCConfig.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.geekq.dubbo.springboot.consumer.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.ImportResource; - -@Configuration -@ImportResource(locations = {"classpath:tcc-transaction.xml","classpath:tcc-transaction-dubbo.xml"}) -public class TCCConfig { -} diff --git a/springboot-dubbo/consumer/src/main/resources/tcc-transaction-dubbo.xml b/springboot-dubbo/consumer/src/main/resources/tcc-transaction-dubbo.xml deleted file mode 100644 index 067dcc6..0000000 --- a/springboot-dubbo/consumer/src/main/resources/tcc-transaction-dubbo.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/springboot-dubbo/consumer/src/main/resources/tcc-transaction.xml b/springboot-dubbo/consumer/src/main/resources/tcc-transaction.xml deleted file mode 100644 index 7056370..0000000 --- a/springboot-dubbo/consumer/src/main/resources/tcc-transaction.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - com.alibaba.dubbo.remoting.TimeoutException - - - - - \ No newline at end of file diff --git a/springboot-dubbo/dubbo-api/pom.xml b/springboot-dubbo/dubbo-api/pom.xml deleted file mode 100644 index abc6993..0000000 --- a/springboot-dubbo/dubbo-api/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - springboot-dubbo - com.geekq.dubbo.springboot - 0.0.1-SNAPSHOT - - 4.0.0 - - dubbo-api - - dubbo-api - - http://www.example.com - - - UTF-8 - 1.7 - 1.7 - - - - - junit - junit - 4.11 - test - - - org.mengyun - tcc-transaction-api - 1.2.4.24 - - - - - - - - maven-clean-plugin - 3.0.0 - - - - maven-resources-plugin - 3.0.2 - - - maven-compiler-plugin - 3.7.0 - - - maven-surefire-plugin - 2.20.1 - - - maven-jar-plugin - 3.0.2 - - - maven-install-plugin - 2.5.2 - - - maven-deploy-plugin - 2.8.2 - - - - - diff --git a/springboot-dubbo/pom.xml b/springboot-dubbo/pom.xml deleted file mode 100644 index 27e7810..0000000 --- a/springboot-dubbo/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - - com.geekq.dubbo.springboot - springboot-dubbo - 0.0.1-SNAPSHOT - - dubbo-api - - pom - - springboot-dubbo - SpringBoot与Dubbo集成测试单元 - - - org.springframework.boot - spring-boot-starter-parent - 2.0.3.RELEASE - - - - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - diff --git a/springboot-dubbo/privoder/.mvn/wrapper/maven-wrapper.jar b/springboot-dubbo/privoder/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index e69de29..0000000 diff --git a/springboot-dubbo/privoder/.mvn/wrapper/maven-wrapper.properties b/springboot-dubbo/privoder/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index b573bb5..0000000 --- a/springboot-dubbo/privoder/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip diff --git a/springboot-dubbo/privoder/src/main/java/com/geekq/dubbo/springboot/privoder/config/TCCConfig.java b/springboot-dubbo/privoder/src/main/java/com/geekq/dubbo/springboot/privoder/config/TCCConfig.java deleted file mode 100644 index 1ee8fdf..0000000 --- a/springboot-dubbo/privoder/src/main/java/com/geekq/dubbo/springboot/privoder/config/TCCConfig.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.geekq.dubbo.springboot.privoder.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.ImportResource; - -@Configuration -@ImportResource(locations = {"classpath:tcc-transaction.xml","classpath:tcc-transaction-dubbo.xml"}) -public class TCCConfig { -} diff --git a/springboot-dubbo/privoder/src/main/resources/tcc-transaction-dubbo.xml b/springboot-dubbo/privoder/src/main/resources/tcc-transaction-dubbo.xml deleted file mode 100644 index 6fd7c1f..0000000 --- a/springboot-dubbo/privoder/src/main/resources/tcc-transaction-dubbo.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - \ No newline at end of file diff --git a/springboot-dubbo/privoder/src/main/resources/tcc-transaction.xml b/springboot-dubbo/privoder/src/main/resources/tcc-transaction.xml deleted file mode 100644 index b98eca4..0000000 --- a/springboot-dubbo/privoder/src/main/resources/tcc-transaction.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - com.alibaba.dubbo.remoting.TimeoutException - - - - - \ No newline at end of file diff --git a/miaosha.sql b/sql/miaosha.sql similarity index 100% rename from miaosha.sql rename to sql/miaosha.sql diff --git a/miaosha1.sql b/sql/miaosha1.sql similarity index 100% rename from miaosha1.sql rename to sql/miaosha1.sql diff --git a/src/main/java/com/geekq/miaosha/redis/redismanager/RedisUtil.java b/src/main/java/com/geekq/miaosha/redis/redismanager/RedisUtil.java deleted file mode 100644 index 507ca74..0000000 --- a/src/main/java/com/geekq/miaosha/redis/redismanager/RedisUtil.java +++ /dev/null @@ -1,1876 +0,0 @@ -package com.geekq.miaosha.redis.redismanager; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import redis.clients.jedis.BinaryClient.LIST_POSITION; -import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPool; -import redis.clients.jedis.JedisPoolConfig; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -public class RedisUtil { - - private static final Logger LOGGER = LoggerFactory.getLogger(RedisUtil.class); - - private static JedisPool pool = null; - - private static RedisUtil ru = new RedisUtil(); - - public static void main(String[] args) { - RedisUtil redisUtil = RedisUtil.getInstance(); - redisUtil.set("test", "test"); - LOGGER.info(redisUtil.get("test")); - } - - private RedisUtil() { - if (pool == null) { - String ip = "10.75.202.11"; - int port = 6379; - JedisPoolConfig config = new JedisPoolConfig(); - // һpoolɷٸjedisʵͨpool.getResource()ȡ - // ֵΪ-1ʾƣpoolѾmaxActivejedisʵʱpool״̬Ϊexhausted(ľ) - config.setMaxTotal(10000); - // һpoolжٸ״̬Ϊidle(е)jedisʵ - config.setMaxIdle(2000); - // ʾborrow()һjedisʵʱĵȴʱ䣬ȴʱ䣬ֱ׳JedisConnectionException - config.setMaxWaitMillis(1000 * 100); - config.setTestOnBorrow(true); - pool = new JedisPool(config, ip, port, 100000); - } - - } - - public Jedis getJedis() { - Jedis jedis = pool.getResource(); - return jedis; - } - - public static RedisUtil getInstance() { - return ru; - } - - /** - *

- * ͨkeyȡredisеvalue - *

- *

- * ͷ - *

- * - * @param key - * @return ɹvalue ʧܷnull - */ - public String get(String key) { - Jedis jedis = null; - String value = null; - try { - jedis = pool.getResource(); - value = jedis.get(key); - } catch (Exception e) { - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return value; - } - - /** - *

- * rediskeyvalue,ͷԴ - *

- *

- * keyѾ 򸲸 - *

- * - * @param key - * @param value - * @return ɹ OK ʧܷ 0 - */ - public String set(String key, String value) { - Jedis jedis = null; - try { - jedis = pool.getResource(); - return jedis.set(key, value); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - return "0"; - } finally { - returnResource(pool, jedis); - } - } - - /** - *

- * ɾָkey,ҲԴһkey - *

- * - * @param keys - * һkey Ҳʹ string - * @return ɾɹĸ - */ - public Long del(String... keys) { - Jedis jedis = null; - try { - jedis = pool.getResource(); - return jedis.del(keys); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - return 0L; - } finally { - returnResource(pool, jedis); - } - } - - /** - *

- * ͨkeyָvalueֵ׷ֵ - *

- * - * @param key - * @param str - * @return ɹ Ӻvalueij ʧ ӵ value ij 쳣0L - */ - public Long append(String key, String str) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.append(key, str); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - return 0L; - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * жkeyǷ - *

- * - * @param key - * @return true OR false - */ - public Boolean exists(String key) { - Jedis jedis = null; - try { - jedis = pool.getResource(); - return jedis.exists(key); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - return false; - } finally { - returnResource(pool, jedis); - } - } - - /** - *

- * key value,keyѾ򷵻0,nx==> not exist - *

- * - * @param key - * @param value - * @return ɹ1 쳣 0 - */ - public Long setnx(String key, String value) { - Jedis jedis = null; - try { - jedis = pool.getResource(); - return jedis.setnx(key, value); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - return 0L; - } finally { - returnResource(pool, jedis); - } - } - - /** - *

- * key valueƶֵЧ - *

- * - * @param key - * @param value - * @param seconds - * λ: - * @return ɹOK ʧܺ쳣null - */ - public String setex(String key, String value, int seconds) { - Jedis jedis = null; - String res = null; - try { - jedis = pool.getResource(); - res = jedis.setex(key, seconds, value); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkey offset ָλÿʼԭvalue滻 - *

- *

- * ±0ʼ,offsetʾoffset±꿪ʼ滻 - *

- *

- * 滻ַȹС - *

- *

- * example: - *

- *

- * value : bigsea@zto.cn - *

- *

- * str : abc - *

- *

- * ±7ʼ滻 Ϊ - *

- *

- * RES : bigsea.abc.cn - *

- * - * @param key - * @param str - * @param offset - * ±λ - * @return 滻 value ij - */ - public Long setrange(String key, String str, int offset) { - Jedis jedis = null; - try { - jedis = pool.getResource(); - return jedis.setrange(key, offset, str); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - return 0L; - } finally { - returnResource(pool, jedis); - } - } - - /** - *

- * ͨkeyȡvalue - *

- * - * @param keys - * string Ҳһkey - * @return ɹvalueļ, ʧܷnullļ ,쳣ؿ - */ - public List mget(String... keys) { - Jedis jedis = null; - List values = null; - try { - jedis = pool.getResource(); - values = jedis.mget(keys); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return values; - } - - /** - *

- * key:value,һ - *

- *

- * example: - *

- *

- * obj.mset(new String[]{"key2","value1","key2","value2"}) - *

- * - * @param keysvalues - * @return ɹOK ʧ 쳣 null - * - */ - public String mset(String... keysvalues) { - Jedis jedis = null; - String res = null; - try { - jedis = pool.getResource(); - res = jedis.mset(keysvalues); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * key:value,һ,keyѾʧ,ع - *

- *

- * example: - *

- *

- * obj.msetnx(new String[]{"key2","value1","key2","value2"}) - *

- * - * @param keysvalues - * @return ɹ1 ʧܷ0 - */ - public Long msetnx(String... keysvalues) { - Jedis jedis = null; - Long res = 0L; - try { - jedis = pool.getResource(); - res = jedis.msetnx(keysvalues); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * keyֵ,һֵ - *

- * - * @param key - * @param value - * @return ֵ key 򷵻null - */ - public String getset(String key, String value) { - Jedis jedis = null; - String res = null; - try { - jedis = pool.getResource(); - res = jedis.getSet(key, value); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨ± key ȡָ±λõ value - *

- * - * @param key - * @param startOffset - * ʼλ 0 ʼ ʾұ߿ʼȡ - * @param endOffset - * @return ûзnull - */ - public String getrange(String key, int startOffset, int endOffset) { - Jedis jedis = null; - String res = null; - try { - jedis = pool.getResource(); - res = jedis.getrange(key, startOffset, endOffset); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkey valueмֵ+1,valueintʱ᷵ش,keyvalueΪ1 - *

- * - * @param key - * @return ֵĽ - */ - public Long incr(String key) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.incr(key); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyָvalueֵ,key,valueΪֵ - *

- * - * @param key - * @param integer - * @return - */ - public Long incrBy(String key, Long integer) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.incrBy(key, integer); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * keyֵ,key,keyΪ-1 - *

- * - * @param key - * @return - */ - public Long decr(String key) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.decr(key); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ȥֵָ - *

- * - * @param key - * @param integer - * @return - */ - public Long decrBy(String key, Long integer) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.decrBy(key, integer); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyȡvalueֵij - *

- * - * @param key - * @return ʧܷnull - */ - public Long serlen(String key) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.strlen(key); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyfieldֵָ,key,ȴ - *

- * - * @param key - * @param field - * ֶ - * @param value - * @return ڷ0 쳣null - */ - public Long hset(String key, String field, String value) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.hset(key, field, value); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyfieldֵָ,keyȴ,fieldѾ,0 - *

- * - * @param key - * @param field - * @param value - * @return - */ - public Long hsetnx(String key, String field, String value) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.hsetnx(key, field, value); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyͬʱ hashĶfield - *

- * - * @param key - * @param hash - * @return OK 쳣null - */ - public String hmset(String key, Map hash) { - Jedis jedis = null; - String res = null; - try { - jedis = pool.getResource(); - res = jedis.hmset(key, hash); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkey field ȡָ value - *

- * - * @param key - * @param field - * @return ûзnull - */ - public String hget(String key, String field) { - Jedis jedis = null; - String res = null; - try { - jedis = pool.getResource(); - res = jedis.hget(key, field); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkey fields ȡָvalue ûжӦvalue򷵻null - *

- * - * @param key - * @param fields - * ʹ һString Ҳ String - * @return - */ - public List hmget(String key, String... fields) { - Jedis jedis = null; - List res = null; - try { - jedis = pool.getResource(); - res = jedis.hmget(key, fields); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyָfieldvalueϸֵ - *

- * - * @param key - * @param field - * @param value - * @return - */ - public Long hincrby(String key, String field, Long value) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.hincrBy(key, field, value); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyfieldжǷָvalue - *

- * - * @param key - * @param field - * @return - */ - public Boolean hexists(String key, String field) { - Jedis jedis = null; - Boolean res = false; - try { - jedis = pool.getResource(); - res = jedis.hexists(key, field); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyfield - *

- * - * @param key - * @return - */ - public Long hlen(String key) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.hlen(key); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - - } - - /** - *

- * ͨkey ɾָ field - *

- * - * @param key - * @param fields - * һ field Ҳ һ - * @return - */ - public Long hdel(String key, String... fields) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.hdel(key, fields); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyеfield - *

- * - * @param key - * @return - */ - public Set hkeys(String key) { - Jedis jedis = null; - Set res = null; - try { - jedis = pool.getResource(); - res = jedis.hkeys(key); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyкkeyйصvalue - *

- * - * @param key - * @return - */ - public List hvals(String key) { - Jedis jedis = null; - List res = null; - try { - jedis = pool.getResource(); - res = jedis.hvals(key); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyȡеfieldvalue - *

- * - * @param key - * @return - */ - public Map hgetall(String key) { - Jedis jedis = null; - Map res = null; - try { - jedis = pool.getResource(); - res = jedis.hgetAll(key); - } catch (Exception e) { - // TODO - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeylistͷַ - *

- * - * @param key - * @param strs - * ʹһstring Ҳʹstring - * @return listvalue - */ - public Long lpush(String key, String... strs) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.lpush(key, strs); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeylistβַ - *

- * - * @param key - * @param strs - * ʹһstring Ҳʹstring - * @return listvalue - */ - public Long rpush(String key, String... strs) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.rpush(key, strs); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeylistָλ֮ǰ֮ ַԪ - *

- * - * @param key - * @param where - * LIST_POSITIONö - * @param pivot - * listvalue - * @param value - * ӵvalue - * @return - */ - public Long linsert(String key, LIST_POSITION where, String pivot, String value) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.linsert(key, where, pivot, value); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeylistָ±λõvalue - *

- *

- * ±곬listvalueĸ򱨴 - *

- * - * @param key - * @param index - * 0ʼ - * @param value - * @return ɹOK - */ - public String lset(String key, Long index, String value) { - Jedis jedis = null; - String res = null; - try { - jedis = pool.getResource(); - res = jedis.lset(key, index, value); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyӶӦlistɾָcount valueͬԪ - *

- * - * @param key - * @param count - * countΪ0ʱɾȫ - * @param value - * @return رɾĸ - */ - public Long lrem(String key, long count, String value) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.lrem(key, count, value); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeylistдstrat±꿪ʼend±valueֵ - *

- * - * @param key - * @param start - * @param end - * @return ɹOK - */ - public String ltrim(String key, long start, long end) { - Jedis jedis = null; - String res = null; - try { - jedis = pool.getResource(); - res = jedis.ltrim(key, start, end); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeylistͷɾһvalue,ظvalue - *

- * - * @param key - * @return - */ - synchronized public String lpop(String key) { - Jedis jedis = null; - String res = null; - try { - jedis = pool.getResource(); - res = jedis.lpop(key); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeylistβɾһvalue,ظԪ - *

- * - * @param key - * @return - */ - synchronized public String rpop(String key) { - Jedis jedis = null; - String res = null; - try { - jedis = pool.getResource(); - res = jedis.rpop(key); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyһlistβɾһvalueӵһlistͷ,ظvalue - *

- *

- * һlistΪջ߲򷵻null - *

- * - * @param srckey - * @param dstkey - * @return - */ - public String rpoplpush(String srckey, String dstkey) { - Jedis jedis = null; - String res = null; - try { - jedis = pool.getResource(); - res = jedis.rpoplpush(srckey, dstkey); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyȡlistָ±λõvalue - *

- * - * @param key - * @param index - * @return ûзnull - */ - public String lindex(String key, long index) { - Jedis jedis = null; - String res = null; - try { - jedis = pool.getResource(); - res = jedis.lindex(key, index); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeylistij - *

- * - * @param key - * @return - */ - public Long llen(String key) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.llen(key); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyȡlistָ±λõvalue - *

- *

- * start Ϊ 0 end Ϊ -1 򷵻ȫlistеvalue - *

- * - * @param key - * @param start - * @param end - * @return - */ - public List lrange(String key, long start, long end) { - Jedis jedis = null; - List res = null; - try { - jedis = pool.getResource(); - res = jedis.lrange(key, start, end); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyָsetvalue - *

- * - * @param key - * @param members - * һString ҲһString - * @return ӳɹĸ - */ - public Long sadd(String key, String... members) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.sadd(key, members); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyɾsetжӦvalueֵ - *

- * - * @param key - * @param members - * һString ҲһString - * @return ɾĸ - */ - public Long srem(String key, String... members) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.srem(key, members); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyɾһsetеvalueظֵ - *

- * - * @param key - * @return - */ - public String spop(String key) { - Jedis jedis = null; - String res = null; - try { - jedis = pool.getResource(); - res = jedis.spop(key); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyȡsetеIJ - *

- *

- * ԵһsetΪ׼ - *

- * - * @param keys - * ʹһstring 򷵻setеvalue Ҳstring - * @return - */ - public Set sdiff(String... keys) { - Jedis jedis = null; - Set res = null; - try { - jedis = pool.getResource(); - res = jedis.sdiff(keys); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyȡsetеIJ뵽һkey - *

- *

- * ԵһsetΪ׼ - *

- * - * @param dstkey - * key - * @param keys - * ʹһstring 򷵻setеvalue Ҳstring - * @return - */ - public Long sdiffstore(String dstkey, String... keys) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.sdiffstore(dstkey, keys); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyȡָsetеĽ - *

- * - * @param keys - * ʹһstring Ҳһstring - * @return - */ - public Set sinter(String... keys) { - Jedis jedis = null; - Set res = null; - try { - jedis = pool.getResource(); - res = jedis.sinter(keys); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyȡָsetеĽ µset - *

- * - * @param dstkey - * @param keys - * ʹһstring Ҳһstring - * @return - */ - public Long sinterstore(String dstkey, String... keys) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.sinterstore(dstkey, keys); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeysetIJ - *

- * - * @param keys - * ʹһstring Ҳһstring - * @return - */ - public Set sunion(String... keys) { - Jedis jedis = null; - Set res = null; - try { - jedis = pool.getResource(); - res = jedis.sunion(keys); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeysetIJ,뵽µset - *

- * - * @param dstkey - * @param keys - * ʹһstring Ҳһstring - * @return - */ - public Long sunionstore(String dstkey, String... keys) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.sunionstore(dstkey, keys); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeysetеvalueƳӵڶset - *

- * - * @param srckey - * ҪƳ - * @param dstkey - * ӵ - * @param member - * setеvalue - * @return - */ - public Long smove(String srckey, String dstkey, String member) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.smove(srckey, dstkey, member); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyȡsetvalueĸ - *

- * - * @param key - * @return - */ - public Long scard(String key) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.scard(key); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyжvalueǷsetеԪ - *

- * - * @param key - * @param member - * @return - */ - public Boolean sismember(String key, String member) { - Jedis jedis = null; - Boolean res = null; - try { - jedis = pool.getResource(); - res = jedis.sismember(key, member); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyȡsetvalue,ɾԪ - *

- * - * @param key - * @return - */ - public String srandmember(String key) { - Jedis jedis = null; - String res = null; - try { - jedis = pool.getResource(); - res = jedis.srandmember(key); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyȡsetеvalue - *

- * - * @param key - * @return - */ - public Set smembers(String key) { - Jedis jedis = null; - Set res = null; - try { - jedis = pool.getResource(); - res = jedis.smembers(key); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyzsetvalue,score,score - *

- *

- * valueѾscoreԪ - *

- * - * @param key - * @param score - * @param member - * @return - */ - public Long zadd(String key, double score, String member) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.zadd(key, score, member); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyɾzsetָvalue - *

- * - * @param key - * @param members - * ʹһstring Ҳһstring - * @return - */ - public Long zrem(String key, String... members) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.zrem(key, members); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyӸzsetvaluescoreֵ - *

- * - * @param key - * @param score - * @param member - * @return - */ - public Double zincrby(String key, double score, String member) { - Jedis jedis = null; - Double res = null; - try { - jedis = pool.getResource(); - res = jedis.zincrby(key, score, member); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyzsetvalue - *

- *

- * ±С - *

- * - * @param key - * @param member - * @return - */ - public Long zrank(String key, String member) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.zrank(key, member); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyzsetvalue - *

- *

- * ±ӴС - *

- * - * @param key - * @param member - * @return - */ - public Long zrevrank(String key, String member) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.zrevrank(key, member); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyȡscorestartendzsetvalue - *

- *

- * socreӴС - *

- *

- * startΪ0 endΪ-1ʱȫ - *

- * - * @param key - * @param start - * @param end - * @return - */ - public Set zrevrange(String key, long start, long end) { - Jedis jedis = null; - Set res = null; - try { - jedis = pool.getResource(); - res = jedis.zrevrange(key, start, end); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyָscorezsetеvalue - *

- * - * @param key - * @param max - * @param min - * @return - */ - public Set zrangebyscore(String key, String max, String min) { - Jedis jedis = null; - Set res = null; - try { - jedis = pool.getResource(); - res = jedis.zrevrangeByScore(key, max, min); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyָscorezsetеvalue - *

- * - * @param key - * @param max - * @param min - * @return - */ - public Set zrangeByScore(String key, double max, double min) { - Jedis jedis = null; - Set res = null; - try { - jedis = pool.getResource(); - res = jedis.zrevrangeByScore(key, max, min); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ָzsetvalue - *

- * - * @param key - * @param min - * @param max - * @return - */ - public Long zcount(String key, String min, String max) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.zcount(key, min, max); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyzsetеvalue - *

- * - * @param key - * @return - */ - public Long zcard(String key) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.zcard(key); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyȡzsetvaluescoreֵ - *

- * - * @param key - * @param member - * @return - */ - public Double zscore(String key, String member) { - Jedis jedis = null; - Double res = null; - try { - jedis = pool.getResource(); - res = jedis.zscore(key, member); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyɾڵԪ - *

- * - * @param key - * @param start - * @param end - * @return - */ - public Long zremrangeByRank(String key, long start, long end) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.zremrangeByRank(key, start, end); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyɾָscoreڵԪ - *

- * - * @param key - * @param start - * @param end - * @return - */ - public Long zremrangeByScore(String key, double start, double end) { - Jedis jedis = null; - Long res = null; - try { - jedis = pool.getResource(); - res = jedis.zremrangeByScore(key, start, end); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * patternʽkey - *

- *

- * keys(*) - *

- *

- * еkey - *

- * - * @param pattern - * @return - */ - public Set keys(String pattern) { - Jedis jedis = null; - Set res = null; - try { - jedis = pool.getResource(); - res = jedis.keys(pattern); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - *

- * ͨkeyжֵ - *

- * - * @param key - * @return - */ - public String type(String key) { - Jedis jedis = null; - String res = null; - try { - jedis = pool.getResource(); - res = jedis.type(key); - } catch (Exception e) { - - LOGGER.error(e.getMessage()); - } finally { - returnResource(pool, jedis); - } - return res; - } - - /** - * ӳ - * - * @param pool - * @param jedis - */ - public static void returnResource(JedisPool pool, Jedis jedis) { - if (jedis != null) { - pool.returnResourceObject(jedis); - } - } - - /** - * ӳ - * - * @param pool - * @param jedis - */ - public static void returnResource(Jedis jedis) { - if (jedis != null) { - pool.returnResourceObject(jedis); - } - } -}