From 6226b57e8e27c24a1d5c4923965564c6881e1fef Mon Sep 17 00:00:00 2001 From: "anran.war" Date: Thu, 9 Dec 2021 19:47:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 51 +- Readme2.md | 1 - .../.mvn/wrapper/maven-wrapper.jar | Bin 48337 -> 0 bytes .../.mvn/wrapper/maven-wrapper.properties | 1 - miaosha-admin/miaosha-admin-api/pom.xml | 6 +- .../.gitignore | 0 .../pom.xml | 9 +- .../com/geekq/common/enums/Constants.java | 0 .../com/geekq/common/enums/MessageStatus.java | 0 .../geekq/common/enums/OrderStatusEnum.java | 0 .../com/geekq/common/enums/ResultStatus.java | 0 .../java/com/geekq/common/enums/SexEnum.java | 0 .../java/com/geekq/common/enums/YesOrNo.java | 0 .../com/geekq/common/utils/Constanst.java | 0 .../com/geekq/common/utils/DBContextUtil.java | 0 .../java/com/geekq/common/utils/DateUtil.java | 0 .../com/geekq/common/utils/JsonUtils.java | 0 .../com/geekq/common/utils/MD5/MD5Utils.java | 0 .../geekq/common/utils/SnowflakeIdWorker.java | 0 .../com/geekq/common/utils/ValidatorUtil.java | 0 .../geekq/common/utils/numcal/BidConst.java | 0 .../common/utils/numcal/BitStatesUtils.java | 0 .../common/utils/numcal/CalculatetUtil.java | 0 .../utils/numcal/DecimalFormatUtil.java | 0 .../utils/resultbean/AbstractResult.java | 0 .../common/utils/resultbean/ResultGeekQ.java | 0 .../common/utils/resultbean/ResultJSON.java | 0 .../geekq/common/validator/MobileCheck.java | 0 .../common/validator/MobileValidator.java | 0 .../java/com/geekq/common/vo/LoginVo.java | 0 .../org.eclipse.wst.common.component | 2 +- miaosha-admin/miaosha-admin-service/pom.xml | 11 +- .../org.eclipse.wst.common.component | 6 +- miaosha-admin/miaosha-admin-web/pom.xml | 11 +- miaosha-admin/pom.xml | 36 +- miaosha-order/miaosha-order-api/pom.xml | 16 +- miaosha-order/miaosha-order-provider/pom.xml | 16 +- miaosha-order/pom.xml | 47 +- {springboot-dubbo => miaosha-rpc}/.gitignore | 0 miaosha-rpc/dubbo-api/pom.xml | 26 + .../CapAccountTradeOrderService.java | 7 +- .../geekq/dubbo/springboot/ServiceAPI.java | 10 +- .../main/java/dto/CapitalTradeOrderDto.java | 0 .../com/geekq/dubbo/springboot/AppTest.java | 0 .../dubbo-consumer}/.gitignore | 0 .../dubbo-consumer}/mvnw | 0 .../dubbo-consumer}/mvnw.cmd | 0 .../dubbo-consumer}/pom.xml | 60 +- .../consumer/ConsumerApplication.java | 0 .../springboot/consumer/config/TCCConfig.java | 7 + .../quickstart/QuickstartConsumer.java | 4 +- .../transaction/TransactionConsumer.java | 16 +- .../src/main/resources/application.properties | 0 .../dubbo-provider}/.gitignore | 0 .../dubbo-provider}/mvnw | 0 .../dubbo-provider}/mvnw.cmd | 0 .../dubbo-provider}/pom.xml | 50 +- .../privoder/PrivoderApplication.java | 0 .../springboot/privoder/config/TCCConfig.java | 7 + .../quickstart/QuickstartServiceImpl.java | 3 +- .../privoder/transaction/CapServiceImpl.java | 0 .../transaction/TransactionServiceImpl.java | 35 +- .../src/main/resources/application.properties | 0 .../privoder => miaosha-rpc}/mvnw | 0 .../privoder => miaosha-rpc}/mvnw.cmd | 0 miaosha-rpc/pom.xml | 45 + .../SpringbootDubboApplication.java | 0 .../src/main/resources/application.properties | 0 miaosha-v1/pom.xml | 195 ++ .../geekq/miaosha/GeekQMainApplication.java | 0 .../miaosha/access/AccessInterceptor.java | 1 - .../com/geekq/miaosha/access/AccessKey.java | 0 .../com/geekq/miaosha/access/AccessLimit.java | 0 .../com/geekq/miaosha/access/UserContext.java | 0 .../com/geekq/miaosha/common/Constanst.java | 0 .../miaosha/common/SnowflakeIdWorker.java | 0 .../miaosha/common/enums/MessageStatus.java | 0 .../miaosha/common/enums/ResultStatus.java | 0 .../common/resultbean/AbstractResult.java | 0 .../common/resultbean/ResultGeekQ.java | 0 .../com/geekq/miaosha/config/DruidConfig.java | 0 .../miaosha/config/UserArgumentResolver.java | 0 .../com/geekq/miaosha/config/WebConfig.java | 0 .../miaosha/controller/BaseController.java | 2 +- .../miaosha/controller/GoodsController.java | 17 +- .../miaosha/controller/LoginController.java | 0 .../controller/MiaoShaMessageController.java | 0 .../miaosha/controller/MiaoshaController.java | 0 .../miaosha/controller/OrderController.java | 0 .../controller/RegisterController.java | 0 .../java/com/geekq/miaosha/dao/GoodsDao.java | 0 .../geekq/miaosha/dao/MiaoShaMessageDao.java | 0 .../com/geekq/miaosha/dao/MiaoShaUserDao.java | 0 .../java/com/geekq/miaosha/dao/OrderDao.java | 0 .../java/com/geekq/miaosha/dao/UserDao.java | 0 .../java/com/geekq/miaosha/domain/Goods.java | 0 .../miaosha/domain/MiaoShaMessageInfo.java | 0 .../miaosha/domain/MiaoShaMessageUser.java | 0 .../geekq/miaosha/domain/MiaoshaGoods.java | 0 .../geekq/miaosha/domain/MiaoshaOrder.java | 0 .../com/geekq/miaosha/domain/MiaoshaUser.java | 0 .../com/geekq/miaosha/domain/OrderInfo.java | 0 .../java/com/geekq/miaosha/domain/User.java | 0 .../miaosha/exception/GlobleException.java | 0 .../exception/GlobleExceptionHandler.java | 0 .../miaosha/mybatis/Mapper/UserMapper.java | 0 .../java/com/geekq/miaosha/mybatis/README.md | 0 .../mybatis/controller/UbatisController.java | 51 +- .../geekq/miaosha/mybatis/entity/User.java | 0 .../miaosha/mybatis/vo/TeacherListVo.java | 1 - .../geekq/miaosha/mybatis/vo/TeacherVo.java | 0 .../com/geekq/miaosha/rabbitmq/MQConfig.java | 0 .../geekq/miaosha/rabbitmq/MQReceiver.java | 0 .../com/geekq/miaosha/rabbitmq/MQSender.java | 1 - .../miaosha/rabbitmq/MiaoshaMessage.java | 0 .../com/geekq/miaosha/redis/BasePrefix.java | 0 .../miaosha/redis/DistributedLocker.java | 0 .../com/geekq/miaosha/redis/GoodsKey.java | 0 .../com/geekq/miaosha/redis/KeyPrefix.java | 0 .../geekq/miaosha/redis/MiaoShaUserKey.java | 0 .../com/geekq/miaosha/redis/MiaoshaKey.java | 0 .../com/geekq/miaosha/redis/OrderKey.java | 0 .../com/geekq/miaosha/redis/RedisConfig.java | 0 .../geekq/miaosha/redis/RedisPoolFactory.java | 0 .../com/geekq/miaosha/redis/RedisService.java | 2 +- .../geekq/miaosha/redis/RedissLockUtil.java | 0 .../redis/RedissonAutoConfiguration.java | 0 .../redis/RedissonDistributedLocker.java | 0 .../miaosha/redis/RedissonProperties.java | 0 .../geekq/miaosha/redis/RedissonService.java | 0 .../java/com/geekq/miaosha/redis/Userkey.java | 0 .../redismanager/OptimisticLockTest.java | 1 - .../miaosha/redis/redismanager/RedisLock.java | 0 .../miaosha/redis/redismanager/RedisLua.java | 1 - .../redis/redismanager/RedisManager.java | 0 .../miaosha/redis/redismanager/RedisUtil.java | 1172 ++++++++++ .../redis/redismanager/lua/RedisLuaLock.java | 0 .../redis/redismanager/lua/luaLockScript.lua | 0 .../miaosha/redis/redismanager/lua/test.lua | 0 .../redis/redismanager/lua/testlua.lua | 0 .../geekq/miaosha/service/GoodsService.java | 0 .../service/MiaoShaMessageService.java | 3 - .../miaosha/service/MiaoShaUserService.java | 4 - .../geekq/miaosha/service/MiaoshaService.java | 0 .../geekq/miaosha/service/OrderService.java | 0 .../geekq/miaosha/service/UserService.java | 0 .../rpchander/RpcCompensateService.java | 9 - .../miaosha/service/rpchander/RpcHandler.java | 0 .../rpchander/enums/PlanStepStatus.java | 0 .../service/rpchander/enums/PlanStepType.java | 0 .../service/rpchander/vo/HandlerParam.java | 0 .../service/rpchander/vo/PlanOrder.java | 0 .../service/rpchander/vo/PlanStep.java | 0 .../miaosha/timeTask/OrderCloseTask.java | 0 .../java/com/geekq/miaosha/utils/DBUtil.java | 0 .../geekq/miaosha/utils/DateTimeUtils.java | 0 .../com/geekq/miaosha/utils/HttpUtil.java | 0 .../java/com/geekq/miaosha/utils/MD5Util.java | 0 .../com/geekq/miaosha/utils/MD5Utils.java | 0 .../com/geekq/miaosha/utils/UUIDUtil.java | 0 .../com/geekq/miaosha/utils/UserUtil.java | 0 .../geekq/miaosha/utils/ValidatorUtil.java | 0 .../geekq/miaosha/validator/MobileCheck.java | 0 .../miaosha/validator/MobileValidator.java | 0 .../com/geekq/miaosha/vo/GoodsDetailVo.java | 0 .../java/com/geekq/miaosha/vo/GoodsVo.java | 0 .../java/com/geekq/miaosha/vo/LoginVo.java | 0 .../geekq/miaosha/vo/MiaoShaMessageVo.java | 0 .../com/geekq/miaosha/vo/OrderDetailVo.java | 0 .../main/resources/application-dev.properties | 0 .../resources/application-prod.properties | 0 .../resources/application-test.properties | 0 .../main/resources/application.properties | 0 .../config/application-test.properties | 0 .../applicationContext-dubbo-consumer.xml | 0 .../src}/main/resources/generatorConfig.xml | 0 .../src}/main/resources/mybatis/conf.xml | 0 .../resources/mybatis/mapper/userMapper.xml | 0 .../main/resources/mybatis/mybatis-config.xml | 0 .../static/bootstrap/css/bootstrap-theme.css | 0 .../bootstrap/css/bootstrap-theme.css.map | 0 .../bootstrap/css/bootstrap-theme.min.css | 0 .../bootstrap/css/bootstrap-theme.min.css.map | 0 .../static/bootstrap/css/bootstrap.css | 0 .../static/bootstrap/css/bootstrap.css.map | 0 .../static/bootstrap/css/bootstrap.min.css | 0 .../bootstrap/css/bootstrap.min.css.map | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../static/bootstrap/js/bootstrap.js | 0 .../static/bootstrap/js/bootstrap.min.js | 0 .../main/resources/static/bootstrap/js/npm.js | 0 .../src/main/resources/static/css/common.css | 0 .../resources/static/css/font-awesome.min.css | 0 .../src/main/resources/static/css/reset.css | 0 .../resources/static/fonts/FontAwesome.otf | Bin .../static/fonts/fontawesome-webfont.eot | Bin .../static/fonts/fontawesome-webfont.svg | 0 .../static/fonts/fontawesome-webfont.ttf | Bin .../static/fonts/fontawesome-webfont.woff | Bin .../static/fonts/fontawesome-webfont.woff2 | Bin .../main/resources/static/goods_detail.htm | 0 .../src/main/resources/static/img/bg.jpg | Bin .../src/main/resources/static/img/bg2.jpg | Bin .../src/main/resources/static/img/iphone8.png | Bin .../src/main/resources/static/img/iphonex.png | Bin .../src/main/resources/static/img/logo_bg.jpg | Bin .../src/main/resources/static/img/logowz.png | Bin .../src/main/resources/static/img/meta10.png | Bin .../src/main/resources/static/img/mi6.png | Bin .../additional-methods.min.js | 0 .../jquery-validation/jquery.validate.min.js | 0 .../localization/messages_zh.min.js | 0 .../src/main/resources/static/js/common.js | 0 .../src/main/resources/static/js/common1.js | 0 .../main/resources/static/js/jquery.min.js | 0 .../src/main/resources/static/js/md5.min.js | 0 .../src/main/resources/static/layer/layer.js | 0 .../resources/static/layer/mobile/layer.js | 0 .../static/layer/mobile/need/layer.css | 0 .../static/layer/skin/default/icon-ext.png | Bin .../static/layer/skin/default/icon.png | Bin .../static/layer/skin/default/layer.css | 0 .../static/layer/skin/default/loading-0.gif | Bin .../static/layer/skin/default/loading-1.gif | Bin .../static/layer/skin/default/loading-2.gif | Bin .../main/resources/static/order_detail.htm | 0 .../resources/templates/goods_detail.html | 0 .../main/resources/templates/goods_list.html | 0 .../src}/main/resources/templates/hello.html | 0 .../src}/main/resources/templates/index.html | 0 .../src}/main/resources/templates/login.html | 0 .../resources/templates/message_list.html | 0 .../resources/templates/miaosha_fail.html | 0 .../resources/templates/order_detail.html | 0 .../main/resources/templates/register.html | 0 .../main/resources/templates/register1.html | 0 {miaosha-2version => miaosha-v2}/.gitignore | 0 .../miaosha-common/pom.xml | 9 +- .../com/geekq/miasha/entity/BaseDomain.java | 0 .../java/com/geekq/miasha/entity/Goods.java | 0 .../java/com/geekq/miasha/entity/IpLog.java | 0 .../com/geekq/miasha/entity/Logininfo.java | 0 .../miasha/entity/MiaoShaMessageInfo.java | 0 .../miasha/entity/MiaoShaMessageUser.java | 0 .../com/geekq/miasha/entity/MiaoshaGoods.java | 0 .../com/geekq/miasha/entity/MiaoshaOrder.java | 0 .../com/geekq/miasha/entity/MiaoshaUser.java | 0 .../com/geekq/miasha/entity/OrderInfo.java | 0 .../com/geekq/miasha/enums/Constanst.java | 0 .../com/geekq/miasha/enums/Constants.java | 0 .../com/geekq/miasha/enums/MessageStatus.java | 0 .../geekq/miasha/enums/OrderStatusEnum.java | 0 .../java/com/geekq/miasha/enums/SexEnum.java | 0 .../java/com/geekq/miasha/enums/YesOrNo.java | 0 .../miasha/enums/enums/MessageStatus.java | 0 .../miasha/enums/enums/ResultStatus.java | 0 .../enums/resultbean/AbstractResult.java | 0 .../miasha/enums/resultbean/ResultGeekQ.java | 0 .../miasha/exception/GlobleException.java | 0 .../com/geekq/miasha/utils/DateTimeUtils.java | 0 .../java/com/geekq/miasha/utils/MD5Utils.java | 0 .../geekq/miasha/utils/SnowflakeIdWorker.java | 0 .../java/com/geekq/miasha/utils/UUIDUtil.java | 0 .../com/geekq/miasha/utils/UserContext.java | 0 .../com/geekq/miasha/utils/UserContext2.java | 0 .../com/geekq/miasha/utils/ValidatorUtil.java | 0 .../geekq/miasha/validator/MobileCheck.java | 0 .../miasha/validator/MobileValidator.java | 0 .../com/geekq/miasha/vo/GoodsDetailVo.java | 0 .../java/com/geekq/miasha/vo/GoodsVo.java | 0 .../java/com/geekq/miasha/vo/LoginVo.java | 0 .../com/geekq/miasha/vo/MiaoShaMessageVo.java | 0 .../com/geekq/miasha/vo/OrderDetailVo.java | 0 .../miaosha-service/pom.xml | 18 +- .../com/geekq/miaosha/mapper/GoodsMapper.java | 0 .../com/geekq/miaosha/mapper/GoodsMapper.xml | 0 .../com/geekq/miaosha/mapper/IpLogMapper.java | 0 .../com/geekq/miaosha/mapper/IpLogMapper.xml | 0 .../geekq/miaosha/mapper/LogininfoMapper.java | 0 .../geekq/miaosha/mapper/LogininfoMapper.xml | 0 .../miaosha/mapper/MiaoShaUserMapper.java | 0 .../miaosha/mapper/MiaoShaUserMapper.xml | 0 .../com/geekq/miaosha/mapper/OrderMapper.java | 0 .../com/geekq/miaosha/mapper/OrderMapper.xml | 0 .../com/geekq/miaosha/rabbitmq/MQConfig.java | 0 .../geekq/miaosha/rabbitmq/MQReceiver.java | 0 .../com/geekq/miaosha/rabbitmq/MQSender.java | 0 .../miaosha/rabbitmq/MiaoshaMessage.java | 0 .../com/geekq/miaosha/redis/BasePrefix.java | 0 .../miaosha/redis/DistributedLocker.java | 0 .../com/geekq/miaosha/redis/GoodsKey.java | 0 .../com/geekq/miaosha/redis/KeyPrefix.java | 0 .../geekq/miaosha/redis/MiaoShaUserKey.java | 0 .../com/geekq/miaosha/redis/MiaoshaKey.java | 0 .../com/geekq/miaosha/redis/OrderKey.java | 0 .../com/geekq/miaosha/redis/RedisConfig.java | 0 .../geekq/miaosha/redis/RedisPoolFactory.java | 0 .../com/geekq/miaosha/redis/RedisService.java | 3 +- .../geekq/miaosha/redis/RedissLockUtil.java | 0 .../redis/RedissonAutoConfiguration.java | 0 .../redis/RedissonDistributedLocker.java | 0 .../miaosha/redis/RedissonProperties.java | 0 .../geekq/miaosha/redis/RedissonService.java | 0 .../java/com/geekq/miaosha/redis/Userkey.java | 0 .../redismanager/RedisLimitRateWithLUA.java | 0 .../miaosha/redis/redismanager/RedisLock.java | 0 .../miaosha/redis/redismanager/RedisLua.java | 2 - .../redis/redismanager/RedisManager.java | 0 .../redis/redismanager/lua/RedisLuaLock.java | 0 .../miaosha/redis/redismanager/lua/limit.lua | 0 .../redis/redismanager/lua/luaLockScript.lua | 0 .../miaosha/redis/redismanager/lua/test.lua | 0 .../redis/redismanager/lua/testlua.lua | 0 .../geekq/miaosha/service/GoodsService.java | 0 .../miaosha/service/LoginInfoService.java | 0 .../service/MiaoShaMessageService.java | 0 .../miaosha/service/MiaoShaUserService.java | 0 .../geekq/miaosha/service/MiaoshaService.java | 0 .../geekq/miaosha/service/OrderService.java | 0 .../service/impl/LoginInfoServiceImpl.java | 0 .../src/main/resources/limit.lua | 0 .../miaosha-web/pom.xml | 11 +- .../geekq/miaosha/GeekQMainApplication.java | 0 .../com/geekq/miaosha/config/DruidConfig.java | 0 .../miaosha/config/UserArgumentResolver.java | 0 .../com/geekq/miaosha/config/WebConfig.java | 0 .../miaosha/controller/BaseController.java | 0 .../miaosha/controller/GoodsController.java | 0 .../miaosha/controller/LoginController.java | 6 - .../controller/MiaoShaMessageController.java | 2 - .../miaosha/controller/MiaoshaController.java | 0 .../miaosha/controller/OrderController.java | 0 .../controller/RegisterController.java | 1 - .../geekq/miaosha/interceptor/AccessKey.java | 0 .../interceptor/GlobalExceptionHandler.java | 0 .../interceptor/GlobalParamAdvice.java | 0 .../miaosha/interceptor/LoginInterceptor.java | 0 .../miaosha/interceptor/RequireLogin.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/consumer.xml | 0 .../src/main/resources/css/account.css | 0 .../src/main/resources/css/bank.css | 0 .../src/main/resources/css/core.css | 0 .../src/main/resources/css/slide-unlock.css | 0 .../src/main/resources/images/add.png | Bin .../src/main/resources/images/bank_list.png | Bin .../src/main/resources/images/banner01.jpg | Bin .../src/main/resources/images/banner02.jpg | Bin .../src/main/resources/images/baozhan.jpg | Bin .../src/main/resources/images/dtg.gif | Bin .../src/main/resources/images/example.jpg | Bin .../src/main/resources/images/feature01.png | Bin .../src/main/resources/images/feature02.png | Bin .../src/main/resources/images/feature03.png | Bin .../src/main/resources/images/geekq.png | Bin .../src/main/resources/images/logo.png | Bin .../main/resources/images/miaoshaxitong.png | Bin .../src/main/resources/images/person_icon.png | Bin .../src/main/resources/images/phone2.png | Bin .../src/main/resources/images/sequare.png | Bin .../src/main/resources/images/shiming.png | Bin .../src/main/resources/images/shouji.jpg | Bin .../src/main/resources/images/sina.png | Bin .../resources/images/social-icons-set.png | Bin .../src/main/resources/images/tecent.png | Bin .../src/main/resources/images/txwb.png | Bin .../main/resources/images/upload_source_2.jpg | Bin .../resources/images/upload_source_2_1.jpg | Bin .../src/main/resources/images/wx.jpg | Bin .../src/main/resources/images/wxsm.png | Bin .../src/main/resources/images/xlwb.png | Bin .../src/main/resources/images/youxiang.jpg | Bin .../static}/bootstrap/css/bootstrap-theme.css | 0 .../bootstrap/css/bootstrap-theme.css.map | 0 .../bootstrap/css/bootstrap-theme.min.css | 0 .../bootstrap/css/bootstrap-theme.min.css.map | 0 .../static}/bootstrap/css/bootstrap.css | 0 .../static}/bootstrap/css/bootstrap.css.map | 0 .../static}/bootstrap/css/bootstrap.min.css | 0 .../bootstrap/css/bootstrap.min.css.map | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../static}/bootstrap/js/bootstrap.js | 0 .../static}/bootstrap/js/bootstrap.min.js | 0 .../resources/static/bootstrap}/js/npm.js | 0 .../src/main/resources/static}/css/common.css | 0 .../resources/static/css/font-awesome.min.css | 0 .../src/main/resources/static}/css/reset.css | 0 .../resources/static}/fonts/FontAwesome.otf | Bin .../static}/fonts/fontawesome-webfont.eot | Bin .../static}/fonts/fontawesome-webfont.svg | 0 .../static}/fonts/fontawesome-webfont.ttf | Bin .../static}/fonts/fontawesome-webfont.woff | Bin .../static}/fonts/fontawesome-webfont.woff2 | Bin .../main/resources/static/goods_detail.htm | 0 .../src/main/resources/static}/img/bg.jpg | Bin .../src/main/resources/static}/img/bg2.jpg | Bin .../main/resources/static}/img/iphone8.png | Bin .../main/resources/static}/img/iphonex.png | Bin .../main/resources/static}/img/logo_bg.jpg | Bin .../src/main/resources/static}/img/logowz.png | Bin .../src/main/resources/static}/img/meta10.png | Bin .../src/main/resources/static}/img/mi6.png | Bin .../additional-methods.min.js | 0 .../jquery-validation/jquery.validate.min.js | 0 .../localization/messages_zh.min.js | 0 .../js/My97DatePicker/My97DatePicker.htm | 0 .../static/js/My97DatePicker/WdatePicker.js | 0 .../static/js/My97DatePicker/calendar.js | 0 .../static/js/My97DatePicker/config.js | 0 .../static/js/My97DatePicker/lang/en.js | 0 .../static/js/My97DatePicker/lang/zh-cn.js | 0 .../static/js/My97DatePicker/lang/zh-tw.js | 0 .../js/My97DatePicker/skin/WdatePicker.css | 0 .../js/My97DatePicker/skin/datePicker.gif | Bin .../skin/default/datepicker.css | 0 .../js/My97DatePicker/skin/default/img.gif | Bin .../js/My97DatePicker/skin/whyGreen/bg.jpg | Bin .../skin/whyGreen/datepicker.css | 0 .../js/My97DatePicker/skin/whyGreen/img.gif | Bin .../src/main/resources/static/js/bank.js | 0 .../css/bootstrap-theme.css | 0 .../css/bootstrap-theme.css.map | 0 .../css/bootstrap-theme.min.css | 0 .../js/bootstrap-3.3.2-dist/css/bootstrap.css | 0 .../css/bootstrap.css.map | 0 .../css/bootstrap.min.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../js/bootstrap-3.3.2-dist/js/bootstrap.js | 0 .../bootstrap-3.3.2-dist/js/bootstrap.min.js | 0 .../static/js/bootstrap-3.3.2-dist}/js/npm.js | 0 .../src/main/resources/static}/js/common.js | 0 .../src/main/resources/static}/js/common1.js | 0 .../static/js/jquery.bootstrap.min.js | 0 .../main/resources/static}/js/jquery.min.js | 0 .../static/js/jquery/jquery-2.1.3.js | 0 .../static/js/jquery/jquery-2.1.3.min.js | 0 .../src/main/resources/static}/js/md5.min.js | 0 .../static/js/metisMenu/metisMenu.css | 0 .../static/js/metisMenu/metisMenu.js | 0 .../resources/static/js/plugins-override.js | 0 .../js/plugins/datetimepicker/.gitattributes | 0 .../js/plugins/datetimepicker/.gitignore | 0 .../js/plugins/datetimepicker/.travis.yml | 0 .../js/plugins/datetimepicker/README.md | 0 .../css/bootstrap-datetimepicker.css | 0 .../css/bootstrap-datetimepicker.min.css | 0 .../js/bootstrap-datetimepicker.js | 0 .../js/bootstrap-datetimepicker.min.js | 0 .../locales/bootstrap-datetimepicker.zh-CN.js | 0 .../bootstrap/css/bootstrap.css | 0 .../bootstrap/css/bootstrap.min.css | 0 .../img/glyphicons-halflings-white.png | Bin .../bootstrap/img/glyphicons-halflings.png | Bin .../bootstrap/js/bootstrap.js | 0 .../bootstrap/js/bootstrap.min.js | 0 .../sample in bootstrap v2/index.html | 0 .../jquery/jquery-1.8.3.min.js | 0 .../bootstrap/css/bootstrap-theme.css | 0 .../bootstrap/css/bootstrap-theme.min.css | 0 .../bootstrap/css/bootstrap.css | 0 .../bootstrap/css/bootstrap.min.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../bootstrap/js/bootstrap.js | 0 .../bootstrap/js/bootstrap.min.js | 0 .../sample in bootstrap v3/index.html | 0 .../jquery/jquery-1.8.3.min.js | 0 .../js/plugins/flipcountdown/.gitattributes | 0 .../js/plugins/flipcountdown/.gitignore | 0 .../js/plugins/flipcountdown/MIT-LICENSE.txt | 0 .../static/js/plugins/flipcountdown/README.md | 0 .../js/plugins/flipcountdown/bower.json | 0 .../flipcountdown/flipcountdown.jquery.json | 0 .../js/plugins/flipcountdown/img/am-pm-1.psd | Bin .../flipcountdown/img/digit-lg-dark.psd | Bin .../js/plugins/flipcountdown/img/digit-lg.png | Bin .../js/plugins/flipcountdown/img/digit-lg.psd | Bin .../js/plugins/flipcountdown/img/digit-md.png | Bin .../js/plugins/flipcountdown/img/digit-sm.png | Bin .../js/plugins/flipcountdown/img/digit-xs.png | Bin .../js/plugins/flipcountdown/index.html | 0 .../flipcountdown/jquery.flipcountdown.css | 0 .../flipcountdown/jquery.flipcountdown.js | 0 .../js/plugins/flipcountdown/jquery.min.js | 0 .../js/plugins/flipcountdown/package.json | 0 .../js/plugins/flipcountdown/screen/1.png | Bin .../js/plugins/flipcountdown/screen/2.png | Bin .../plugins/jquery-validation/.gitattributes | 0 .../js/plugins/jquery-validation/.gitignore | 0 .../js/plugins/jquery-validation/.travis.yml | 0 .../demo/ajaxSubmit-intergration-demo.html | 0 .../jquery-validation/demo/captcha/captcha.js | 0 .../demo/captcha/fonts/Anorexia.ttf | Bin .../demo/captcha/image_req.php | 0 .../demo/captcha/images/.htaccess | 0 .../demo/captcha/images/button.png | Bin .../demo/captcha/images/image.php | 0 .../jquery-validation/demo/captcha/index.php | 0 .../demo/captcha/newsession.php | 0 .../demo/captcha/process.php | 0 .../jquery-validation/demo/captcha/rand.php | 0 .../jquery-validation/demo/captcha/style.css | 0 .../jquery-validation/demo/css/chili.css | 0 .../jquery-validation/demo/css/cmxform.css | 0 .../demo/css/cmxformTemplate.css | 0 .../jquery-validation/demo/css/core.css | 0 .../jquery-validation/demo/css/reset.css | 0 .../jquery-validation/demo/css/screen.css | 0 .../demo/custom-messages-data-demo.html | 0 .../demo/custom-methods-demo.html | 0 .../demo/dynamic-totals.html | 0 .../demo/errorcontainer-demo.html | 0 .../jquery-validation/demo/file_input.html | 0 .../plugins/jquery-validation/demo/form.php | 0 .../plugins/jquery-validation/demo/form.phps | 0 .../jquery-validation/demo/images/bg.gif | Bin .../jquery-validation/demo/images/checked.gif | Bin .../demo/images/cmxform-divider.gif | Bin .../demo/images/cmxform-fieldset.gif | Bin .../jquery-validation/demo/images/loading.gif | Bin .../demo/images/unchecked.gif | Bin .../plugins/jquery-validation/demo/index.html | 0 .../jquery-validation/demo/jquerymobile.html | 0 .../demo/js/chili-1.7.pack.js | 0 .../demo/login/images/bg.gif | Bin .../demo/login/images/header1.jpg | Bin .../demo/login/images/page.gif | Bin .../demo/login/images/required_star.gif | Bin .../jquery-validation/demo/login/index.html | 0 .../jquery-validation/demo/login/screen.css | 0 .../jquery-validation/demo/marketo/emails.php | 0 .../demo/marketo/emails.phps | 0 .../jquery-validation/demo/marketo/ie6.css | 0 .../demo/marketo/images/backRequiredGray.gif | Bin .../demo/marketo/images/back_green-fade.gif | Bin .../demo/marketo/images/back_nav_blue.gif | Bin .../demo/marketo/images/blank.gif | Bin .../demo/marketo/images/button-submit.gif | Bin .../demo/marketo/images/favicon.ico | Bin .../demo/marketo/images/help.png | Bin .../marketo/images/left-nav-callout-long.png | Bin .../demo/marketo/images/login-sprite.gif | Bin .../demo/marketo/images/logo_marketo.gif | Bin .../demo/marketo/images/sf.png | Bin .../demo/marketo/images/step1-24.gif | Bin .../demo/marketo/images/step2-24.gif | Bin .../demo/marketo/images/step3-24.gif | Bin .../demo/marketo/images/tab-sprite.gif | Bin .../demo/marketo/images/tab_green.gif | Bin .../demo/marketo/images/time.png | Bin .../demo/marketo/images/toggle.gif | Bin .../demo/marketo/images/warning.gif | Bin .../jquery-validation/demo/marketo/index.html | 0 .../demo/marketo/jquery.maskedinput.js | 0 .../demo/marketo/mktSignup.js | 0 .../jquery-validation/demo/marketo/step2.htm | 0 .../demo/marketo/stylesheet.css | 0 .../jquery-validation/demo/milk/bg.gif | Bin .../jquery-validation/demo/milk/emails.php | 0 .../jquery-validation/demo/milk/emails.phps | 0 .../jquery-validation/demo/milk/index.html | 0 .../demo/milk/left_white.png | Bin .../jquery-validation/demo/milk/milk.css | 0 .../jquery-validation/demo/milk/milk.png | Bin .../demo/milk/right_white.png | Bin .../jquery-validation/demo/milk/users.php | 0 .../jquery-validation/demo/milk/users.phps | 0 .../demo/multipart/index.html | 0 .../multipart/js/jquery.maskedinput-1.0.js | 0 .../demo/multipart/js/ui.accordion.js | 0 .../demo/multipart/js/ui.core.js | 0 .../demo/multipart/style.css | 0 .../demo/radio-checkbox-select-demo.html | 0 .../jquery-validation/demo/tabs/index.html | 0 .../jquery-validation/demo/themerollered.html | 0 .../jquery-validation/demo/tinymce/index.html | 0 .../tinymce/themes/simple/editor_template.js | 0 .../demo/tinymce/themes/simple/img/icons.gif | Bin .../demo/tinymce/themes/simple/langs/en.js | 0 .../themes/simple/skins/default/ui.css | 0 .../demo/tinymce/tiny_mce.js | 0 .../jquery-validation/jquery.validate.js | 0 .../jquery-validation/lib/jquery-1.6.4.js | 0 .../jquery-validation/lib/jquery-1.7.2.js | 0 .../jquery-validation/lib/jquery-1.8.3.js | 0 .../jquery-validation/lib/jquery-1.9.0.js | 0 .../jquery-validation/lib/jquery.form.js | 0 .../plugins/jquery-validation/lib/jquery.js | 0 .../jquery-validation/lib/jquery.mockjax.js | 0 .../localization/messages_zh.js | 0 .../static/js/plugins/jquery.form.js | 0 .../js/plugins/jquery.twbsPagination.js | 0 .../js/plugins/jquery.twbsPagination.min.js | 0 .../js/plugins/uploadify/jquery.uploadify.js | 0 .../plugins/uploadify/jquery.uploadify.min.js | 0 .../js/plugins/uploadify/uploadify-cancel.png | Bin .../static/js/plugins/uploadify/uploadify.swf | Bin .../src/main/resources/static}/layer/layer.js | 0 .../resources/static}/layer/mobile/layer.js | 0 .../static}/layer/mobile/need/layer.css | 0 .../static}/layer/skin/default/icon-ext.png | Bin .../static}/layer/skin/default/icon.png | Bin .../static}/layer/skin/default/layer.css | 0 .../static}/layer/skin/default/loading-0.gif | Bin .../static}/layer/skin/default/loading-1.gif | Bin .../static}/layer/skin/default/loading-2.gif | Bin .../main/resources/static/order_detail.htm | 0 .../bootstrap/css/bootstrap-theme.css | 0 .../bootstrap/css/bootstrap-theme.css.map | 0 .../bootstrap/css/bootstrap-theme.min.css | 0 .../bootstrap/css/bootstrap-theme.min.css.map | 0 .../templates}/bootstrap/css/bootstrap.css | 0 .../bootstrap/css/bootstrap.css.map | 0 .../bootstrap/css/bootstrap.min.css | 0 .../bootstrap/css/bootstrap.min.css.map | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../templates}/bootstrap/js/bootstrap.js | 0 .../templates}/bootstrap/js/bootstrap.min.js | 0 .../resources/templates/bootstrap}/js/npm.js | 0 .../main/resources/templates}/css/common.css | 0 .../main/resources/templates/css/common1.css | 0 .../templates/css/font-awesome.min.css | 0 .../main/resources/templates}/css/reset.css | 0 .../resources/templates/css/slide-unlock.css | 0 .../templates}/fonts/FontAwesome.otf | Bin .../templates}/fonts/fontawesome-webfont.eot | Bin .../templates}/fonts/fontawesome-webfont.svg | 0 .../templates}/fonts/fontawesome-webfont.ttf | Bin .../templates}/fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin .../main/resources/templates/goods_list.html | 0 .../src/main/resources/templates/hello.html | 0 .../src/main/resources/templates}/img/bg.jpg | Bin .../src/main/resources/templates}/img/bg2.jpg | Bin .../main/resources/templates}/img/iphone8.png | Bin .../main/resources/templates}/img/iphonex.png | Bin .../main/resources/templates}/img/logo_bg.jpg | Bin .../main/resources/templates}/img/logowz.png | Bin .../main/resources/templates}/img/meta10.png | Bin .../src/main/resources/templates}/img/mi6.png | Bin .../src/main/resources/templates/index.html | 0 .../src/main/resources/templates/index2.html | 0 .../additional-methods.min.js | 0 .../jquery-validation/jquery.validate.min.js | 0 .../localization/messages_zh.min.js | 0 .../js/My97DatePicker/My97DatePicker.htm | 0 .../js/My97DatePicker/WdatePicker.js | 0 .../templates/js/My97DatePicker/calendar.js | 0 .../templates/js/My97DatePicker/config.js | 0 .../templates/js/My97DatePicker/lang/en.js | 0 .../templates/js/My97DatePicker/lang/zh-cn.js | 0 .../templates/js/My97DatePicker/lang/zh-tw.js | 0 .../js/My97DatePicker/skin/WdatePicker.css | 0 .../js/My97DatePicker/skin/datePicker.gif | Bin .../skin/default/datepicker.css | 0 .../js/My97DatePicker/skin/default/img.gif | Bin .../js/My97DatePicker/skin/whyGreen/bg.jpg | Bin .../skin/whyGreen/datepicker.css | 0 .../js/My97DatePicker/skin/whyGreen/img.gif | Bin .../src/main/resources/templates/js/bank.js | 0 .../css/bootstrap-theme.css | 0 .../css/bootstrap-theme.css.map | 0 .../css/bootstrap-theme.min.css | 0 .../js/bootstrap-3.3.2-dist/css/bootstrap.css | 0 .../css/bootstrap.css.map | 0 .../css/bootstrap.min.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../js/bootstrap-3.3.2-dist/js/bootstrap.js | 0 .../bootstrap-3.3.2-dist/js/bootstrap.min.js | 0 .../js/bootstrap-3.3.2-dist}/js/npm.js | 0 .../main/resources/templates}/js/common.js | 0 .../main/resources/templates}/js/common1.js | 0 .../templates/js/jquery.bootstrap.min.js | 0 .../resources/templates}/js/jquery.min.js | 0 .../templates/js/jquery/jquery-2.1.3.js | 0 .../templates/js/jquery/jquery-2.1.3.min.js | 0 .../main/resources/templates}/js/md5.min.js | 0 .../templates/js/metisMenu/metisMenu.css | 0 .../templates/js/metisMenu/metisMenu.js | 0 .../templates/js/plugins-override.js | 0 .../js/plugins/datetimepicker/.gitattributes | 0 .../js/plugins/datetimepicker/.gitignore | 0 .../js/plugins/datetimepicker/.travis.yml | 0 .../js/plugins/datetimepicker/README.md | 0 .../css/bootstrap-datetimepicker.css | 0 .../css/bootstrap-datetimepicker.min.css | 0 .../js/bootstrap-datetimepicker.js | 0 .../js/bootstrap-datetimepicker.min.js | 0 .../locales/bootstrap-datetimepicker.zh-CN.js | 0 .../bootstrap/css/bootstrap.css | 0 .../bootstrap/css/bootstrap.min.css | 0 .../img/glyphicons-halflings-white.png | Bin .../bootstrap/img/glyphicons-halflings.png | Bin .../bootstrap/js/bootstrap.js | 0 .../bootstrap/js/bootstrap.min.js | 0 .../sample in bootstrap v2/index.html | 0 .../jquery/jquery-1.8.3.min.js | 0 .../bootstrap/css/bootstrap-theme.css | 0 .../bootstrap/css/bootstrap-theme.min.css | 0 .../bootstrap/css/bootstrap.css | 0 .../bootstrap/css/bootstrap.min.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../bootstrap/js/bootstrap.js | 0 .../bootstrap/js/bootstrap.min.js | 0 .../sample in bootstrap v3/index.html | 0 .../jquery/jquery-1.8.3.min.js | 0 .../js/plugins/flipcountdown/.gitattributes | 0 .../js/plugins/flipcountdown/.gitignore | 0 .../js/plugins/flipcountdown/MIT-LICENSE.txt | 0 .../js/plugins/flipcountdown/README.md | 0 .../js/plugins/flipcountdown/bower.json | 0 .../flipcountdown/flipcountdown.jquery.json | 0 .../js/plugins/flipcountdown/img/am-pm-1.psd | Bin .../flipcountdown/img/digit-lg-dark.psd | Bin .../js/plugins/flipcountdown/img/digit-lg.png | Bin .../js/plugins/flipcountdown/img/digit-lg.psd | Bin .../js/plugins/flipcountdown/img/digit-md.png | Bin .../js/plugins/flipcountdown/img/digit-sm.png | Bin .../js/plugins/flipcountdown/img/digit-xs.png | Bin .../js/plugins/flipcountdown/index.html | 0 .../flipcountdown/jquery.flipcountdown.css | 0 .../flipcountdown/jquery.flipcountdown.js | 0 .../js/plugins/flipcountdown/jquery.min.js | 0 .../js/plugins/flipcountdown/package.json | 0 .../js/plugins/flipcountdown/screen/1.png | Bin .../js/plugins/flipcountdown/screen/2.png | Bin .../plugins/jquery-validation/.gitattributes | 0 .../js/plugins/jquery-validation/.gitignore | 0 .../js/plugins/jquery-validation/.travis.yml | 0 .../demo/ajaxSubmit-intergration-demo.html | 0 .../jquery-validation/demo/captcha/captcha.js | 0 .../demo/captcha/fonts/Anorexia.ttf | Bin .../demo/captcha/image_req.php | 0 .../demo/captcha/images/.htaccess | 0 .../demo/captcha/images/button.png | Bin .../demo/captcha/images/image.php | 0 .../jquery-validation/demo/captcha/index.php | 0 .../demo/captcha/newsession.php | 0 .../demo/captcha/process.php | 0 .../jquery-validation/demo/captcha/rand.php | 0 .../jquery-validation/demo/captcha/style.css | 0 .../jquery-validation/demo/css/chili.css | 0 .../jquery-validation/demo/css/cmxform.css | 0 .../demo/css/cmxformTemplate.css | 0 .../jquery-validation/demo/css/core.css | 0 .../jquery-validation/demo/css/reset.css | 0 .../jquery-validation/demo/css/screen.css | 0 .../demo/custom-messages-data-demo.html | 0 .../demo/custom-methods-demo.html | 0 .../demo/dynamic-totals.html | 0 .../demo/errorcontainer-demo.html | 0 .../jquery-validation/demo/file_input.html | 0 .../plugins/jquery-validation/demo/form.php | 0 .../plugins/jquery-validation/demo/form.phps | 0 .../jquery-validation/demo/images/bg.gif | Bin .../jquery-validation/demo/images/checked.gif | Bin .../demo/images/cmxform-divider.gif | Bin .../demo/images/cmxform-fieldset.gif | Bin .../jquery-validation/demo/images/loading.gif | Bin .../demo/images/unchecked.gif | Bin .../plugins/jquery-validation/demo/index.html | 0 .../jquery-validation/demo/jquerymobile.html | 0 .../demo/js/chili-1.7.pack.js | 0 .../demo/login/images/bg.gif | Bin .../demo/login/images/header1.jpg | Bin .../demo/login/images/page.gif | Bin .../demo/login/images/required_star.gif | Bin .../jquery-validation/demo/login/index.html | 0 .../jquery-validation/demo/login/screen.css | 0 .../jquery-validation/demo/marketo/emails.php | 0 .../demo/marketo/emails.phps | 0 .../jquery-validation/demo/marketo/ie6.css | 0 .../demo/marketo/images/backRequiredGray.gif | Bin .../demo/marketo/images/back_green-fade.gif | Bin .../demo/marketo/images/back_nav_blue.gif | Bin .../demo/marketo/images/blank.gif | Bin .../demo/marketo/images/button-submit.gif | Bin .../demo/marketo/images/favicon.ico | Bin .../demo/marketo/images/help.png | Bin .../marketo/images/left-nav-callout-long.png | Bin .../demo/marketo/images/login-sprite.gif | Bin .../demo/marketo/images/logo_marketo.gif | Bin .../demo/marketo/images/sf.png | Bin .../demo/marketo/images/step1-24.gif | Bin .../demo/marketo/images/step2-24.gif | Bin .../demo/marketo/images/step3-24.gif | Bin .../demo/marketo/images/tab-sprite.gif | Bin .../demo/marketo/images/tab_green.gif | Bin .../demo/marketo/images/time.png | Bin .../demo/marketo/images/toggle.gif | Bin .../demo/marketo/images/warning.gif | Bin .../jquery-validation/demo/marketo/index.html | 0 .../demo/marketo/jquery.maskedinput.js | 0 .../demo/marketo/mktSignup.js | 0 .../jquery-validation/demo/marketo/step2.htm | 0 .../demo/marketo/stylesheet.css | 0 .../jquery-validation/demo/milk/bg.gif | Bin .../jquery-validation/demo/milk/emails.php | 0 .../jquery-validation/demo/milk/emails.phps | 0 .../jquery-validation/demo/milk/index.html | 0 .../demo/milk/left_white.png | Bin .../jquery-validation/demo/milk/milk.css | 0 .../jquery-validation/demo/milk/milk.png | Bin .../demo/milk/right_white.png | Bin .../jquery-validation/demo/milk/users.php | 0 .../jquery-validation/demo/milk/users.phps | 0 .../demo/multipart/index.html | 0 .../multipart/js/jquery.maskedinput-1.0.js | 0 .../demo/multipart/js/ui.accordion.js | 0 .../demo/multipart/js/ui.core.js | 0 .../demo/multipart/style.css | 0 .../demo/radio-checkbox-select-demo.html | 0 .../jquery-validation/demo/tabs/index.html | 0 .../jquery-validation/demo/themerollered.html | 0 .../jquery-validation/demo/tinymce/index.html | 0 .../tinymce/themes/simple/editor_template.js | 0 .../demo/tinymce/themes/simple/img/icons.gif | Bin .../demo/tinymce/themes/simple/langs/en.js | 0 .../themes/simple/skins/default/ui.css | 0 .../demo/tinymce/tiny_mce.js | 0 .../jquery-validation/jquery.validate.js | 0 .../jquery-validation/lib/jquery-1.6.4.js | 0 .../jquery-validation/lib/jquery-1.7.2.js | 0 .../jquery-validation/lib/jquery-1.8.3.js | 0 .../jquery-validation/lib/jquery-1.9.0.js | 0 .../jquery-validation/lib/jquery.form.js | 0 .../plugins/jquery-validation/lib/jquery.js | 0 .../jquery-validation/lib/jquery.mockjax.js | 0 .../localization/messages_zh.js | 0 .../templates/js/plugins/jquery.form.js | 0 .../js/plugins/jquery.twbsPagination.js | 0 .../js/plugins/jquery.twbsPagination.min.js | 0 .../js/plugins/uploadify/jquery.uploadify.js | 0 .../plugins/uploadify/jquery.uploadify.min.js | 0 .../js/plugins/uploadify/uploadify-cancel.png | Bin .../js/plugins/uploadify/uploadify.swf | Bin .../templates/js/slideunlock/slideunlock.js | 0 .../main/resources/templates}/layer/layer.js | 0 .../templates}/layer/mobile/layer.js | 0 .../templates}/layer/mobile/need/layer.css | 0 .../layer/skin/default/icon-ext.png | Bin .../templates}/layer/skin/default/icon.png | Bin .../templates}/layer/skin/default/layer.css | 0 .../layer/skin/default/loading-0.gif | Bin .../layer/skin/default/loading-1.gif | Bin .../layer/skin/default/loading-2.gif | Bin .../src/main/resources/templates/login.html | 0 .../main/resources/templates/login222.html | 0 .../resources/templates/message_list.html | 0 .../resources/templates/miaosha_fail.html | 0 .../resources/templates/order_detail.html | 0 .../main/resources/templates/register.html | 0 .../main/resources/templates/register1.html | 0 .../main/resources/templates/register2.html | 0 .../src/main/resources/templates/test.html | 0 {miaosha-2version => miaosha-v2}/miaosha.sql | 0 {miaosha-2version => miaosha-v2}/mvnw | 0 {miaosha-2version => miaosha-v2}/mvnw.cmd | 0 {miaosha-2version => miaosha-v2}/pom.xml | 146 +- pom.xml | 354 +--- .../.mvn/wrapper/maven-wrapper.jar | 0 .../.mvn/wrapper/maven-wrapper.properties | 1 - .../consumer/.mvn/wrapper/maven-wrapper.jar | 0 .../.mvn/wrapper/maven-wrapper.properties | 1 - .../springboot/consumer/config/TCCConfig.java | 9 - .../main/resources/tcc-transaction-dubbo.xml | 17 - .../src/main/resources/tcc-transaction.xml | 75 - springboot-dubbo/dubbo-api/pom.xml | 73 - springboot-dubbo/pom.xml | 53 - .../privoder/.mvn/wrapper/maven-wrapper.jar | 0 .../.mvn/wrapper/maven-wrapper.properties | 1 - .../springboot/privoder/config/TCCConfig.java | 9 - .../main/resources/tcc-transaction-dubbo.xml | 10 - .../src/main/resources/tcc-transaction.xml | 75 - miaosha.sql => sql/miaosha.sql | 0 miaosha1.sql => sql/miaosha1.sql | 0 .../miaosha/redis/redismanager/RedisUtil.java | 1876 ----------------- 902 files changed, 1776 insertions(+), 2919 deletions(-) delete mode 100644 Readme2.md delete mode 100644 miaosha-2version/.mvn/wrapper/maven-wrapper.jar delete mode 100644 miaosha-2version/.mvn/wrapper/maven-wrapper.properties rename miaosha-admin/{miaosha-common => miaosha-admin-common}/.gitignore (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/pom.xml (93%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/enums/Constants.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/enums/MessageStatus.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/enums/OrderStatusEnum.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/enums/ResultStatus.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/enums/SexEnum.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/enums/YesOrNo.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/utils/Constanst.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/utils/DBContextUtil.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/utils/DateUtil.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/utils/JsonUtils.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/utils/MD5/MD5Utils.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/utils/SnowflakeIdWorker.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/utils/ValidatorUtil.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/utils/numcal/BidConst.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/utils/numcal/BitStatesUtils.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/utils/numcal/CalculatetUtil.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/utils/numcal/DecimalFormatUtil.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/utils/resultbean/AbstractResult.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/utils/resultbean/ResultGeekQ.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/utils/resultbean/ResultJSON.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/validator/MobileCheck.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/validator/MobileValidator.java (100%) rename miaosha-admin/{miaosha-common => miaosha-admin-common}/src/main/java/com/geekq/common/vo/LoginVo.java (100%) rename {springboot-dubbo => miaosha-rpc}/.gitignore (100%) create mode 100644 miaosha-rpc/dubbo-api/pom.xml rename {springboot-dubbo => miaosha-rpc}/dubbo-api/src/main/java/com/geekq/dubbo/springboot/CapAccountTradeOrderService.java (66%) rename {springboot-dubbo => miaosha-rpc}/dubbo-api/src/main/java/com/geekq/dubbo/springboot/ServiceAPI.java (78%) rename {springboot-dubbo => miaosha-rpc}/dubbo-api/src/main/java/dto/CapitalTradeOrderDto.java (100%) rename {springboot-dubbo => miaosha-rpc}/dubbo-api/src/test/java/com/geekq/dubbo/springboot/AppTest.java (100%) rename {springboot-dubbo/consumer => miaosha-rpc/dubbo-consumer}/.gitignore (100%) rename {springboot-dubbo/consumer => miaosha-rpc/dubbo-consumer}/mvnw (100%) rename {springboot-dubbo/consumer => miaosha-rpc/dubbo-consumer}/mvnw.cmd (100%) rename {springboot-dubbo/consumer => miaosha-rpc/dubbo-consumer}/pom.xml (69%) rename {springboot-dubbo/consumer => miaosha-rpc/dubbo-consumer}/src/main/java/com/geekq/dubbo/springboot/consumer/ConsumerApplication.java (100%) create mode 100644 miaosha-rpc/dubbo-consumer/src/main/java/com/geekq/dubbo/springboot/consumer/config/TCCConfig.java rename {springboot-dubbo/consumer => miaosha-rpc/dubbo-consumer}/src/main/java/com/geekq/dubbo/springboot/consumer/quickstart/QuickstartConsumer.java (88%) rename {springboot-dubbo/consumer => miaosha-rpc/dubbo-consumer}/src/main/java/com/geekq/dubbo/springboot/consumer/transaction/TransactionConsumer.java (65%) rename {springboot-dubbo/consumer => miaosha-rpc/dubbo-consumer}/src/main/resources/application.properties (100%) rename {springboot-dubbo/privoder => miaosha-rpc/dubbo-provider}/.gitignore (100%) rename {springboot-dubbo => miaosha-rpc/dubbo-provider}/mvnw (100%) rename {springboot-dubbo => miaosha-rpc/dubbo-provider}/mvnw.cmd (100%) rename {springboot-dubbo/privoder => miaosha-rpc/dubbo-provider}/pom.xml (74%) rename {springboot-dubbo/privoder => miaosha-rpc/dubbo-provider}/src/main/java/com/geekq/dubbo/springboot/privoder/PrivoderApplication.java (100%) create mode 100644 miaosha-rpc/dubbo-provider/src/main/java/com/geekq/dubbo/springboot/privoder/config/TCCConfig.java rename {springboot-dubbo/privoder => miaosha-rpc/dubbo-provider}/src/main/java/com/geekq/dubbo/springboot/privoder/quickstart/QuickstartServiceImpl.java (91%) rename {springboot-dubbo/privoder => miaosha-rpc/dubbo-provider}/src/main/java/com/geekq/dubbo/springboot/privoder/transaction/CapServiceImpl.java (100%) rename {springboot-dubbo/privoder => miaosha-rpc/dubbo-provider}/src/main/java/com/geekq/dubbo/springboot/privoder/transaction/TransactionServiceImpl.java (64%) rename {springboot-dubbo/privoder => miaosha-rpc/dubbo-provider}/src/main/resources/application.properties (100%) rename {springboot-dubbo/privoder => miaosha-rpc}/mvnw (100%) rename {springboot-dubbo/privoder => miaosha-rpc}/mvnw.cmd (100%) create mode 100644 miaosha-rpc/pom.xml rename {springboot-dubbo => miaosha-rpc}/src/main/java/com/mooc/jiangzh/dubbo/springboot/springbootdubbo/SpringbootDubboApplication.java (100%) rename {springboot-dubbo => miaosha-rpc}/src/main/resources/application.properties (100%) create mode 100644 miaosha-v1/pom.xml rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/GeekQMainApplication.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/access/AccessInterceptor.java (98%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/access/AccessKey.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/access/AccessLimit.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/access/UserContext.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/common/Constanst.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/common/SnowflakeIdWorker.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/common/enums/MessageStatus.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/common/enums/ResultStatus.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/common/resultbean/AbstractResult.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/common/resultbean/ResultGeekQ.java (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/java/com/geekq/miaosha/config/DruidConfig.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/config/UserArgumentResolver.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/config/WebConfig.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/controller/BaseController.java (97%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/controller/GoodsController.java (90%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/controller/LoginController.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/controller/MiaoShaMessageController.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/controller/MiaoshaController.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/controller/OrderController.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/controller/RegisterController.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/dao/GoodsDao.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/dao/MiaoShaMessageDao.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/dao/MiaoShaUserDao.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/dao/OrderDao.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/dao/UserDao.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/domain/Goods.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/domain/MiaoShaMessageInfo.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/domain/MiaoShaMessageUser.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/domain/MiaoshaUser.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/domain/OrderInfo.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/domain/User.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/exception/GlobleException.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/exception/GlobleExceptionHandler.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/mybatis/Mapper/UserMapper.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/mybatis/README.md (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/mybatis/controller/UbatisController.java (61%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/mybatis/entity/User.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/mybatis/vo/TeacherListVo.java (96%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/mybatis/vo/TeacherVo.java (100%) rename {miaosha-2version/miaosha-service => miaosha-v1}/src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/rabbitmq/MQSender.java (96%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/redis/BasePrefix.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/redis/DistributedLocker.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/redis/GoodsKey.java (100%) rename {miaosha-2version/miaosha-service => miaosha-v1}/src/main/java/com/geekq/miaosha/redis/KeyPrefix.java (100%) rename {miaosha-2version/miaosha-service => miaosha-v1}/src/main/java/com/geekq/miaosha/redis/MiaoShaUserKey.java (100%) rename {miaosha-2version/miaosha-service => miaosha-v1}/src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java (100%) rename {miaosha-2version/miaosha-service => miaosha-v1}/src/main/java/com/geekq/miaosha/redis/OrderKey.java (100%) rename {miaosha-2version/miaosha-service => miaosha-v1}/src/main/java/com/geekq/miaosha/redis/RedisConfig.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/redis/RedisService.java (99%) rename {miaosha-2version/miaosha-service => miaosha-v1}/src/main/java/com/geekq/miaosha/redis/RedissLockUtil.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/redis/RedissonProperties.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/redis/RedissonService.java (100%) rename {miaosha-2version/miaosha-service => miaosha-v1}/src/main/java/com/geekq/miaosha/redis/Userkey.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/redis/redismanager/OptimisticLockTest.java (98%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/redis/redismanager/RedisLock.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/redis/redismanager/RedisLua.java (98%) rename {miaosha-2version/miaosha-service => miaosha-v1}/src/main/java/com/geekq/miaosha/redis/redismanager/RedisManager.java (100%) create mode 100644 miaosha-v1/src/main/java/com/geekq/miaosha/redis/redismanager/RedisUtil.java rename {miaosha-2version/miaosha-service => miaosha-v1}/src/main/java/com/geekq/miaosha/redis/redismanager/lua/RedisLuaLock.java (100%) rename {miaosha-2version/miaosha-service => miaosha-v1}/src/main/java/com/geekq/miaosha/redis/redismanager/lua/luaLockScript.lua (100%) rename {miaosha-2version/miaosha-service => miaosha-v1}/src/main/java/com/geekq/miaosha/redis/redismanager/lua/test.lua (100%) rename {miaosha-2version/miaosha-service => miaosha-v1}/src/main/java/com/geekq/miaosha/redis/redismanager/lua/testlua.lua (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/service/GoodsService.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/service/MiaoShaMessageService.java (91%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/service/MiaoShaUserService.java (96%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/service/MiaoshaService.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/service/OrderService.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/service/UserService.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/service/rpchander/RpcCompensateService.java (90%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/service/rpchander/RpcHandler.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/service/rpchander/enums/PlanStepStatus.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/service/rpchander/enums/PlanStepType.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/service/rpchander/vo/HandlerParam.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/service/rpchander/vo/PlanOrder.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/service/rpchander/vo/PlanStep.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/utils/DBUtil.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/utils/DateTimeUtils.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/utils/HttpUtil.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/utils/MD5Util.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/utils/MD5Utils.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/utils/UUIDUtil.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/utils/UserUtil.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/utils/ValidatorUtil.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/validator/MobileCheck.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/validator/MobileValidator.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/vo/GoodsVo.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/vo/LoginVo.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/vo/MiaoShaMessageVo.java (100%) rename {src => miaosha-v1/src}/main/java/com/geekq/miaosha/vo/OrderDetailVo.java (100%) rename {src => miaosha-v1/src}/main/resources/application-dev.properties (100%) rename {src => miaosha-v1/src}/main/resources/application-prod.properties (100%) rename {src => miaosha-v1/src}/main/resources/application-test.properties (100%) rename {src => miaosha-v1/src}/main/resources/application.properties (100%) rename {src => miaosha-v1/src}/main/resources/config/application-test.properties (100%) rename {src => miaosha-v1/src}/main/resources/dubbo/applicationContext-dubbo-consumer.xml (100%) rename {src => miaosha-v1/src}/main/resources/generatorConfig.xml (100%) rename {src => miaosha-v1/src}/main/resources/mybatis/conf.xml (100%) rename {src => miaosha-v1/src}/main/resources/mybatis/mapper/userMapper.xml (100%) rename {src => miaosha-v1/src}/main/resources/mybatis/mybatis-config.xml (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/bootstrap/css/bootstrap-theme.css (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/bootstrap/css/bootstrap-theme.css.map (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/bootstrap/css/bootstrap-theme.min.css (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/bootstrap/css/bootstrap-theme.min.css.map (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/bootstrap/css/bootstrap.css (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/bootstrap/css/bootstrap.css.map (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/bootstrap/css/bootstrap.min.css (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/bootstrap/css/bootstrap.min.css.map (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.eot (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.svg (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.ttf (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/bootstrap/fonts/glyphicons-halflings-regular.woff2 (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/bootstrap/js/bootstrap.js (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/bootstrap/js/bootstrap.min.js (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/bootstrap/js/npm.js (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/css/common.css (100%) rename {src => miaosha-v1/src}/main/resources/static/css/font-awesome.min.css (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/css/reset.css (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/fonts/FontAwesome.otf (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/fonts/fontawesome-webfont.eot (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/fonts/fontawesome-webfont.svg (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/fonts/fontawesome-webfont.ttf (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/fonts/fontawesome-webfont.woff (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/fonts/fontawesome-webfont.woff2 (100%) rename {src => miaosha-v1/src}/main/resources/static/goods_detail.htm (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/img/bg.jpg (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/img/bg2.jpg (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/img/iphone8.png (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/img/iphonex.png (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/img/logo_bg.jpg (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/img/logowz.png (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/img/meta10.png (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/img/mi6.png (100%) rename {src => miaosha-v1/src}/main/resources/static/jquery-validation/additional-methods.min.js (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/jquery-validation/jquery.validate.min.js (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/jquery-validation/localization/messages_zh.min.js (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/js/common.js (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/js/common1.js (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/js/jquery.min.js (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/js/md5.min.js (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/layer/layer.js (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/layer/mobile/layer.js (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/layer/mobile/need/layer.css (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/layer/skin/default/icon-ext.png (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/layer/skin/default/icon.png (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/layer/skin/default/layer.css (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/layer/skin/default/loading-0.gif (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/layer/skin/default/loading-1.gif (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/layer/skin/default/loading-2.gif (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/static/order_detail.htm (100%) rename {src => miaosha-v1/src}/main/resources/templates/goods_detail.html (100%) rename {src => miaosha-v1/src}/main/resources/templates/goods_list.html (100%) rename {src => miaosha-v1/src}/main/resources/templates/hello.html (100%) rename {src => miaosha-v1/src}/main/resources/templates/index.html (100%) rename {src => miaosha-v1/src}/main/resources/templates/login.html (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/templates/message_list.html (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/templates/miaosha_fail.html (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/templates/order_detail.html (100%) rename {src => miaosha-v1/src}/main/resources/templates/register.html (100%) rename {miaosha-2version/miaosha-web => miaosha-v1}/src/main/resources/templates/register1.html (100%) rename {miaosha-2version => miaosha-v2}/.gitignore (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/pom.xml (79%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/entity/BaseDomain.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/entity/Goods.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/entity/IpLog.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/entity/Logininfo.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoShaMessageInfo.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoShaMessageUser.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoshaGoods.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoshaOrder.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/entity/MiaoshaUser.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/entity/OrderInfo.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/enums/Constanst.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/enums/Constants.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/enums/MessageStatus.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/enums/OrderStatusEnum.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/enums/SexEnum.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/enums/YesOrNo.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/enums/enums/MessageStatus.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/enums/enums/ResultStatus.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/enums/resultbean/AbstractResult.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/enums/resultbean/ResultGeekQ.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/exception/GlobleException.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/utils/DateTimeUtils.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/utils/MD5Utils.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/utils/SnowflakeIdWorker.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/utils/UUIDUtil.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/utils/UserContext.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/utils/UserContext2.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/utils/ValidatorUtil.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/validator/MobileCheck.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/validator/MobileValidator.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/vo/GoodsDetailVo.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/vo/GoodsVo.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/vo/LoginVo.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/vo/MiaoShaMessageVo.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-common/src/main/java/com/geekq/miasha/vo/OrderDetailVo.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/pom.xml (81%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/mapper/GoodsMapper.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/mapper/GoodsMapper.xml (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/mapper/IpLogMapper.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/mapper/IpLogMapper.xml (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/mapper/LogininfoMapper.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/mapper/LogininfoMapper.xml (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/mapper/MiaoShaUserMapper.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/mapper/MiaoShaUserMapper.xml (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/mapper/OrderMapper.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/mapper/OrderMapper.xml (100%) rename {src => miaosha-v2/miaosha-service/src}/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/redis/BasePrefix.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/redis/DistributedLocker.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/redis/GoodsKey.java (100%) rename {src => miaosha-v2/miaosha-service/src}/main/java/com/geekq/miaosha/redis/KeyPrefix.java (100%) rename {src => miaosha-v2/miaosha-service/src}/main/java/com/geekq/miaosha/redis/MiaoShaUserKey.java (100%) rename {src => miaosha-v2/miaosha-service/src}/main/java/com/geekq/miaosha/redis/MiaoshaKey.java (100%) rename {src => miaosha-v2/miaosha-service/src}/main/java/com/geekq/miaosha/redis/OrderKey.java (100%) rename {src => miaosha-v2/miaosha-service/src}/main/java/com/geekq/miaosha/redis/RedisConfig.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedisService.java (99%) rename {src => miaosha-v2/miaosha-service/src}/main/java/com/geekq/miaosha/redis/RedissLockUtil.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/redis/RedissonService.java (100%) rename {src => miaosha-v2/miaosha-service/src}/main/java/com/geekq/miaosha/redis/Userkey.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLimitRateWithLUA.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLock.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/RedisLua.java (98%) rename {src => miaosha-v2/miaosha-service/src}/main/java/com/geekq/miaosha/redis/redismanager/RedisManager.java (100%) rename {src => miaosha-v2/miaosha-service/src}/main/java/com/geekq/miaosha/redis/redismanager/lua/RedisLuaLock.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/redis/redismanager/lua/limit.lua (100%) rename {src => miaosha-v2/miaosha-service/src}/main/java/com/geekq/miaosha/redis/redismanager/lua/luaLockScript.lua (100%) rename {src => miaosha-v2/miaosha-service/src}/main/java/com/geekq/miaosha/redis/redismanager/lua/test.lua (100%) rename {src => miaosha-v2/miaosha-service/src}/main/java/com/geekq/miaosha/redis/redismanager/lua/testlua.lua (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/service/GoodsService.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/service/LoginInfoService.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/service/MiaoShaMessageService.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/service/MiaoshaService.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/service/OrderService.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/java/com/geekq/miaosha/service/impl/LoginInfoServiceImpl.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-service/src/main/resources/limit.lua (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/pom.xml (69%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/java/com/geekq/miaosha/GeekQMainApplication.java (100%) rename {src => miaosha-v2/miaosha-web/src}/main/java/com/geekq/miaosha/config/DruidConfig.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/java/com/geekq/miaosha/config/WebConfig.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/java/com/geekq/miaosha/controller/BaseController.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/java/com/geekq/miaosha/controller/GoodsController.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/java/com/geekq/miaosha/controller/LoginController.java (89%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/java/com/geekq/miaosha/controller/MiaoShaMessageController.java (98%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/java/com/geekq/miaosha/controller/OrderController.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/java/com/geekq/miaosha/controller/RegisterController.java (98%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/AccessKey.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/GlobalExceptionHandler.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/GlobalParamAdvice.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/LoginInterceptor.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/java/com/geekq/miaosha/interceptor/RequireLogin.java (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/application.properties (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/consumer.xml (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/css/account.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/css/bank.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/css/core.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/css/slide-unlock.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/add.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/bank_list.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/banner01.jpg (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/banner02.jpg (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/baozhan.jpg (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/dtg.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/example.jpg (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/feature01.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/feature02.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/feature03.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/geekq.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/logo.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/miaoshaxitong.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/person_icon.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/phone2.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/sequare.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/shiming.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/shouji.jpg (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/sina.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/social-icons-set.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/tecent.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/txwb.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/upload_source_2.jpg (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/upload_source_2_1.jpg (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/wx.jpg (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/wxsm.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/xlwb.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/images/youxiang.jpg (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/bootstrap/css/bootstrap-theme.css (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/bootstrap/css/bootstrap-theme.css.map (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/bootstrap/css/bootstrap-theme.min.css (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/bootstrap/css/bootstrap-theme.min.css.map (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/bootstrap/css/bootstrap.css (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/bootstrap/css/bootstrap.css.map (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/bootstrap/css/bootstrap.min.css (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/bootstrap/css/bootstrap.min.css.map (100%) rename {miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist => miaosha-v2/miaosha-web/src/main/resources/static/bootstrap}/fonts/glyphicons-halflings-regular.eot (100%) rename {miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist => miaosha-v2/miaosha-web/src/main/resources/static/bootstrap}/fonts/glyphicons-halflings-regular.svg (100%) rename {miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist => miaosha-v2/miaosha-web/src/main/resources/static/bootstrap}/fonts/glyphicons-halflings-regular.ttf (100%) rename {miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist => miaosha-v2/miaosha-web/src/main/resources/static/bootstrap}/fonts/glyphicons-halflings-regular.woff (100%) rename {miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist => miaosha-v2/miaosha-web/src/main/resources/static/bootstrap}/fonts/glyphicons-halflings-regular.woff2 (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/bootstrap/js/bootstrap.js (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/bootstrap/js/bootstrap.min.js (100%) rename {miaosha-2version/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist => miaosha-v2/miaosha-web/src/main/resources/static/bootstrap}/js/npm.js (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/css/common.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/css/font-awesome.min.css (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/css/reset.css (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/fonts/FontAwesome.otf (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/fonts/fontawesome-webfont.eot (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/fonts/fontawesome-webfont.svg (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/fonts/fontawesome-webfont.ttf (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/fonts/fontawesome-webfont.woff (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/fonts/fontawesome-webfont.woff2 (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/goods_detail.htm (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/img/bg.jpg (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/img/bg2.jpg (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/img/iphone8.png (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/img/iphonex.png (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/img/logo_bg.jpg (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/img/logowz.png (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/img/meta10.png (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/img/mi6.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/jquery-validation/additional-methods.min.js (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/jquery-validation/jquery.validate.min.js (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/jquery-validation/localization/messages_zh.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/My97DatePicker/My97DatePicker.htm (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/My97DatePicker/WdatePicker.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/My97DatePicker/calendar.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/My97DatePicker/config.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/My97DatePicker/lang/en.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/My97DatePicker/lang/zh-cn.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/My97DatePicker/lang/zh-tw.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/WdatePicker.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/datePicker.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/default/datepicker.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/default/img.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/whyGreen/bg.jpg (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/whyGreen/datepicker.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/My97DatePicker/skin/whyGreen/img.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/bank.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css.map (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap-theme.min.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap.css.map (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/css/bootstrap.min.css (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap => miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist}/fonts/glyphicons-halflings-regular.eot (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap => miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist}/fonts/glyphicons-halflings-regular.svg (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap => miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist}/fonts/glyphicons-halflings-regular.ttf (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap => miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist}/fonts/glyphicons-halflings-regular.woff (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap => miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist}/fonts/glyphicons-halflings-regular.woff2 (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/js/bootstrap.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist/js/bootstrap.min.js (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates/bootstrap => miaosha-v2/miaosha-web/src/main/resources/static/js/bootstrap-3.3.2-dist}/js/npm.js (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/js/common.js (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/js/common1.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/jquery.bootstrap.min.js (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/js/jquery.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/jquery/jquery-2.1.3.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/jquery/jquery-2.1.3.min.js (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/js/md5.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/metisMenu/metisMenu.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/metisMenu/metisMenu.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins-override.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/.gitattributes (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/.gitignore (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/.travis.yml (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/README.md (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/css/bootstrap-datetimepicker.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/css/bootstrap-datetimepicker.min.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/js/bootstrap-datetimepicker.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/js/bootstrap-datetimepicker.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.min.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings-white.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v2/jquery/jquery-1.8.3.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.min.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.min.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.eot (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.svg (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.ttf (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.woff (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/datetimepicker/sample in bootstrap v3/jquery/jquery-1.8.3.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/.gitattributes (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/.gitignore (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/MIT-LICENSE.txt (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/README.md (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/bower.json (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/flipcountdown.jquery.json (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/am-pm-1.psd (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-lg-dark.psd (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-lg.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-lg.psd (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-md.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-sm.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/img/digit-xs.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/jquery.flipcountdown.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/jquery.flipcountdown.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/jquery.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/package.json (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/screen/1.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/flipcountdown/screen/2.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/.gitattributes (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/.gitignore (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/.travis.yml (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/ajaxSubmit-intergration-demo.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/captcha.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/fonts/Anorexia.ttf (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/image_req.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/images/.htaccess (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/images/button.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/images/image.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/index.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/newsession.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/process.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/rand.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/captcha/style.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/chili.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/cmxform.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/cmxformTemplate.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/core.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/reset.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/css/screen.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/custom-messages-data-demo.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/custom-methods-demo.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/dynamic-totals.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/errorcontainer-demo.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/file_input.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/form.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/form.phps (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/bg.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/checked.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/cmxform-divider.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/cmxform-fieldset.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/loading.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/images/unchecked.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/jquerymobile.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/js/chili-1.7.pack.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/bg.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/header1.jpg (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/page.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/images/required_star.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/login/screen.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/emails.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/emails.phps (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/ie6.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/backRequiredGray.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/back_green-fade.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/back_nav_blue.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/blank.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/button-submit.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/favicon.ico (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/help.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/left-nav-callout-long.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/login-sprite.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/logo_marketo.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/sf.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/step1-24.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/step2-24.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/step3-24.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/tab-sprite.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/tab_green.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/time.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/toggle.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/images/warning.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/jquery.maskedinput.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/mktSignup.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/step2.htm (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/marketo/stylesheet.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/bg.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/emails.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/emails.phps (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/left_white.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/milk.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/milk.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/right_white.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/users.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/milk/users.phps (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/js/jquery.maskedinput-1.0.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/js/ui.accordion.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/js/ui.core.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/multipart/style.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/radio-checkbox-select-demo.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tabs/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/themerollered.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/editor_template.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/img/icons.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/langs/en.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/themes/simple/skins/default/ui.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/demo/tinymce/tiny_mce.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/jquery.validate.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.6.4.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.7.2.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.8.3.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery-1.9.0.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery.form.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/lib/jquery.mockjax.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery-validation/localization/messages_zh.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery.form.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery.twbsPagination.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/jquery.twbsPagination.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/uploadify/jquery.uploadify.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/uploadify/jquery.uploadify.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/uploadify/uploadify-cancel.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/static/js/plugins/uploadify/uploadify.swf (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/layer/layer.js (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/layer/mobile/layer.js (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/layer/mobile/need/layer.css (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/layer/skin/default/icon-ext.png (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/layer/skin/default/icon.png (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/layer/skin/default/layer.css (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/layer/skin/default/loading-0.gif (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/layer/skin/default/loading-1.gif (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates => miaosha-v2/miaosha-web/src/main/resources/static}/layer/skin/default/loading-2.gif (100%) rename {src => miaosha-v2/miaosha-web/src}/main/resources/static/order_detail.htm (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/bootstrap/css/bootstrap-theme.css (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/bootstrap/css/bootstrap-theme.css.map (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/bootstrap/css/bootstrap-theme.min.css (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/bootstrap/css/bootstrap-theme.min.css.map (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/bootstrap/css/bootstrap.css (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/bootstrap/css/bootstrap.css.map (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/bootstrap/css/bootstrap.min.css (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/bootstrap/css/bootstrap.min.css.map (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist => miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap}/fonts/glyphicons-halflings-regular.eot (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist => miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap}/fonts/glyphicons-halflings-regular.svg (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist => miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap}/fonts/glyphicons-halflings-regular.ttf (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist => miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap}/fonts/glyphicons-halflings-regular.woff (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist => miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap}/fonts/glyphicons-halflings-regular.woff2 (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/bootstrap/js/bootstrap.js (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/bootstrap/js/bootstrap.min.js (100%) rename {miaosha-2version/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist => miaosha-v2/miaosha-web/src/main/resources/templates/bootstrap}/js/npm.js (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/css/common.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/css/common1.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/css/font-awesome.min.css (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/css/reset.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/css/slide-unlock.css (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/fonts/FontAwesome.otf (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/fonts/fontawesome-webfont.eot (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/fonts/fontawesome-webfont.svg (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/fonts/fontawesome-webfont.ttf (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/fonts/fontawesome-webfont.woff (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/fonts/fontawesome-webfont.woff2 (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/goods_list.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/hello.html (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/img/bg.jpg (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/img/bg2.jpg (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/img/iphone8.png (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/img/iphonex.png (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/img/logo_bg.jpg (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/img/logowz.png (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/img/meta10.png (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/img/mi6.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/index2.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/jquery-validation/additional-methods.min.js (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/jquery-validation/jquery.validate.min.js (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/jquery-validation/localization/messages_zh.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/My97DatePicker/My97DatePicker.htm (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/My97DatePicker/WdatePicker.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/My97DatePicker/calendar.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/My97DatePicker/config.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/My97DatePicker/lang/en.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/My97DatePicker/lang/zh-cn.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/My97DatePicker/lang/zh-tw.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/WdatePicker.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/datePicker.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/default/datepicker.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/default/img.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/whyGreen/bg.jpg (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/whyGreen/datepicker.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/My97DatePicker/skin/whyGreen/img.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/bank.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap-theme.css.map (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap-theme.min.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap.css.map (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/css/bootstrap.min.css (100%) rename {src/main/resources/static/bootstrap => miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist}/fonts/glyphicons-halflings-regular.eot (100%) rename {src/main/resources/static/bootstrap => miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist}/fonts/glyphicons-halflings-regular.svg (100%) rename {src/main/resources/static/bootstrap => miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist}/fonts/glyphicons-halflings-regular.ttf (100%) rename {src/main/resources/static/bootstrap => miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist}/fonts/glyphicons-halflings-regular.woff (100%) rename {src/main/resources/static/bootstrap => miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist}/fonts/glyphicons-halflings-regular.woff2 (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/js/bootstrap.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist/js/bootstrap.min.js (100%) rename {src/main/resources/static/bootstrap => miaosha-v2/miaosha-web/src/main/resources/templates/js/bootstrap-3.3.2-dist}/js/npm.js (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/js/common.js (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/js/common1.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/jquery.bootstrap.min.js (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/js/jquery.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/jquery/jquery-2.1.3.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/jquery/jquery-2.1.3.min.js (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/js/md5.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/metisMenu/metisMenu.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/metisMenu/metisMenu.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins-override.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/.gitattributes (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/.gitignore (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/.travis.yml (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/README.md (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/css/bootstrap-datetimepicker.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/css/bootstrap-datetimepicker.min.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/js/bootstrap-datetimepicker.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/js/bootstrap-datetimepicker.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/css/bootstrap.min.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings-white.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/img/glyphicons-halflings.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/bootstrap/js/bootstrap.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v2/jquery/jquery-1.8.3.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap-theme.min.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/css/bootstrap.min.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.eot (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.svg (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.ttf (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/fonts/glyphicons-halflings-regular.woff (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/bootstrap/js/bootstrap.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/datetimepicker/sample in bootstrap v3/jquery/jquery-1.8.3.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/.gitattributes (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/.gitignore (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/MIT-LICENSE.txt (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/README.md (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/bower.json (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/flipcountdown.jquery.json (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/am-pm-1.psd (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-lg-dark.psd (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-lg.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-lg.psd (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-md.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-sm.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/img/digit-xs.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/jquery.flipcountdown.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/jquery.flipcountdown.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/jquery.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/package.json (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/screen/1.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/flipcountdown/screen/2.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/.gitattributes (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/.gitignore (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/.travis.yml (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/ajaxSubmit-intergration-demo.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/captcha.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/fonts/Anorexia.ttf (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/image_req.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/images/.htaccess (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/images/button.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/images/image.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/index.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/newsession.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/process.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/rand.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/captcha/style.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/chili.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/cmxform.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/cmxformTemplate.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/core.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/reset.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/css/screen.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/custom-messages-data-demo.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/custom-methods-demo.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/dynamic-totals.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/errorcontainer-demo.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/file_input.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/form.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/form.phps (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/bg.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/checked.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/cmxform-divider.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/cmxform-fieldset.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/loading.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/images/unchecked.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/jquerymobile.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/js/chili-1.7.pack.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/bg.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/header1.jpg (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/page.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/images/required_star.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/login/screen.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/emails.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/emails.phps (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/ie6.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/backRequiredGray.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/back_green-fade.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/back_nav_blue.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/blank.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/button-submit.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/favicon.ico (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/help.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/left-nav-callout-long.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/login-sprite.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/logo_marketo.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/sf.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/step1-24.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/step2-24.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/step3-24.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/tab-sprite.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/tab_green.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/time.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/toggle.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/images/warning.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/jquery.maskedinput.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/mktSignup.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/step2.htm (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/marketo/stylesheet.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/bg.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/emails.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/emails.phps (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/left_white.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/milk.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/milk.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/right_white.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/users.php (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/milk/users.phps (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/js/jquery.maskedinput-1.0.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/js/ui.accordion.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/js/ui.core.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/multipart/style.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/radio-checkbox-select-demo.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tabs/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/themerollered.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/index.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/editor_template.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/img/icons.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/langs/en.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/themes/simple/skins/default/ui.css (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/demo/tinymce/tiny_mce.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/jquery.validate.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.6.4.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.7.2.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.8.3.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery-1.9.0.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery.form.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/lib/jquery.mockjax.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery-validation/localization/messages_zh.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery.form.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery.twbsPagination.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/jquery.twbsPagination.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/uploadify/jquery.uploadify.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/uploadify/jquery.uploadify.min.js (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/uploadify/uploadify-cancel.png (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/plugins/uploadify/uploadify.swf (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/js/slideunlock/slideunlock.js (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/layer/layer.js (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/layer/mobile/layer.js (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/layer/mobile/need/layer.css (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/layer/skin/default/icon-ext.png (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/layer/skin/default/icon.png (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/layer/skin/default/layer.css (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/layer/skin/default/loading-0.gif (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/layer/skin/default/loading-1.gif (100%) rename {src/main/resources/static => miaosha-v2/miaosha-web/src/main/resources/templates}/layer/skin/default/loading-2.gif (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/login.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/login222.html (100%) rename {src => miaosha-v2/miaosha-web/src}/main/resources/templates/message_list.html (100%) rename {src => miaosha-v2/miaosha-web/src}/main/resources/templates/miaosha_fail.html (100%) rename {src => miaosha-v2/miaosha-web/src}/main/resources/templates/order_detail.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/register.html (100%) rename {src => miaosha-v2/miaosha-web/src}/main/resources/templates/register1.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/register2.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha-web/src/main/resources/templates/test.html (100%) rename {miaosha-2version => miaosha-v2}/miaosha.sql (100%) rename {miaosha-2version => miaosha-v2}/mvnw (100%) rename {miaosha-2version => miaosha-v2}/mvnw.cmd (100%) rename {miaosha-2version => miaosha-v2}/pom.xml (66%) delete mode 100644 springboot-dubbo/.mvn/wrapper/maven-wrapper.jar delete mode 100644 springboot-dubbo/.mvn/wrapper/maven-wrapper.properties delete mode 100644 springboot-dubbo/consumer/.mvn/wrapper/maven-wrapper.jar delete mode 100644 springboot-dubbo/consumer/.mvn/wrapper/maven-wrapper.properties delete mode 100644 springboot-dubbo/consumer/src/main/java/com/geekq/dubbo/springboot/consumer/config/TCCConfig.java delete mode 100644 springboot-dubbo/consumer/src/main/resources/tcc-transaction-dubbo.xml delete mode 100644 springboot-dubbo/consumer/src/main/resources/tcc-transaction.xml delete mode 100644 springboot-dubbo/dubbo-api/pom.xml delete mode 100644 springboot-dubbo/pom.xml delete mode 100644 springboot-dubbo/privoder/.mvn/wrapper/maven-wrapper.jar delete mode 100644 springboot-dubbo/privoder/.mvn/wrapper/maven-wrapper.properties delete mode 100644 springboot-dubbo/privoder/src/main/java/com/geekq/dubbo/springboot/privoder/config/TCCConfig.java delete mode 100644 springboot-dubbo/privoder/src/main/resources/tcc-transaction-dubbo.xml delete mode 100644 springboot-dubbo/privoder/src/main/resources/tcc-transaction.xml rename miaosha.sql => sql/miaosha.sql (100%) rename miaosha1.sql => sql/miaosha1.sql (100%) delete mode 100644 src/main/java/com/geekq/miaosha/redis/redismanager/RedisUtil.java 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 01e67997377a393fd672c7dcde9dccbedf0cb1e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 48337 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 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); - } - } -}