miaosha/.idea/workspace.xml

1192 lines
73 KiB
XML
Raw Normal View History

2018-09-14 12:34:02 +08:00
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<list default="true" id="c03f8710-3299-4e4e-a70a-393f99f94219" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_11.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_11.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_0_5.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_dubbo_2_5_3.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_38.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_10.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_10.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_18_0.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_rabbitmq_amqp_client_4_0_3.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_rabbitmq_http_client_1_1_1_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_3_7_0_Final.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jline_jline_0_9_94.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_44.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__nz_net_ultraq_thymeleaf_thymeleaf_layout_dialect_1_4_0.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ognl_ognl_3_0_8.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_6.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_4_2.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_8.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_23.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_23.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_23.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_6.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_4_12.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_3_5_Final.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_1_Final.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_netty_netty_3_2_5_Final.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_4_5.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_1.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_1.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_18_2.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_1_7_4_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_1_7_4_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_8_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_8_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_8_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_1_5_8_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_8_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_8_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_1_5_8_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_1_5_8_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_5_8_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_1_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_3_12_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_3_12_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_3_12_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_3_12_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_3_12_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_12_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_messaging_4_3_12_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_3_12_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_3_12_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_12_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_2_1_5_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring4_2_1_5_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_unbescape_unbescape_1_1_0_RELEASE.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/miaosha.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/application-dev.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/DemoTask$1.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/DemoTask$2.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/DemoTask.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/GeekQMainApplication.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/Md5Utils/MD5Utils.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/Test.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/access/AccessInterceptor.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/access/AccessKey.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/access/AccessLimit.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/access/UserContext.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/common/ResponseCode.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/common/ServerResponse.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/config/UserArgumentResolver.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/config/WebConfig.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/controller/DemoController.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/controller/GoodsController.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/controller/LoginController.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/controller/MiaoshaController.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/controller/OrderController.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/controller/RateLimiterController.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/controller/UserController.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/dao/DruidConfig.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/dao/GoodsDao.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/dao/MiaoShaUserDao.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/dao/OrderDao.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/dao/UserDao.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/dao/UserMapper.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/domain/Goods.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/domain/MiaoshaGoods.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/domain/MiaoshaOrder.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/domain/MiaoshaUser.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/domain/OrderInfo.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/domain/User.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/exception/GlobleException.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/exception/GlobleExceptionandler.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/mybatis/controller/MessageController.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/rabbitmq/MQConfig.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/rabbitmq/MQReceiver.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/rabbitmq/MQSender.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/rabbitmq/MiaoshaMessage.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/redis/BasePrefix.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/redis/GoodsKey.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/redis/KeyPrefix.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/redis/MiaoShaUserKey.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/redis/MiaoshaKey.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/redis/OrderKey.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/redis/RedisConfig.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/redis/RedisPoolFactory.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/redis/RedisService.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/redis/Userkey.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/result/CodeMsg.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/result/Result.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/service/GoodsService.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/service/IUserService.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/service/MiaoShaUserService.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/service/MiaoshaService.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/service/OrderService.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/service/UserService.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/utils/UUIDUtil.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/utils/ValidatorUtil.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/validator/IsMobile.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/validator/IsMobileValidator.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/vo/GoodsDetailVo.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/vo/GoodsVo.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/vo/LoginVo.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/com/geekq/miaosha/vo/OrderDetailVo.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/config/application-test.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/dubbo/dubbo_consumer.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/dubbo/springmvc.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/mybatis/config.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/mybatis/mapper/UserMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/bootstrap/css/bootstrap-theme.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/bootstrap/css/bootstrap-theme.css.map" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/bootstrap/css/bootstrap-theme.min.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/bootstrap/css/bootstrap-theme.min.css.map" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/bootstrap/css/bootstrap.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/bootstrap/css/bootstrap.css.map" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/bootstrap/css/bootstrap.min.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/bootstrap/css/bootstrap.min.css.map" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/bootstrap/fonts/glyphicons-halflings-regular.eot" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/bootstrap/fonts/glyphicons-halflings-regular.svg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/bootstrap/fonts/glyphicons-halflings-regular.ttf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/bootstrap/fonts/glyphicons-halflings-regular.woff" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/bootstrap/fonts/glyphicons-halflings-regular.woff2" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/bootstrap/js/bootstrap.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/bootstrap/js/bootstrap.min.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/bootstrap/js/npm.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/goods_detail.htm" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/img/bg.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/img/bg2.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/img/iphone8.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/img/iphonex.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/img/meta10.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/img/mi6.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/jquery-validation/additional-methods.min.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/jquery-validation/jquery.validate.min.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/jquery-validation/localization/messages_zh.min.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/js/common.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/js/jquery.min.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/js/md5.min.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/layer/layer.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/layer/mobile/layer.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/layer/mobile/need/layer.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/layer/skin/default/icon-ext.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/layer/skin/default/icon.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/layer/skin/default/layer.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/layer/skin/default/loading-0.gif" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/layer/skin/default/loading-1.gif" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/layer/skin/default/loading-2.gif" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/static/order_detail.htm" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/templates/goods_detail.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/templates/goods_list.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/templates/hello.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/templates/login.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/templates/miaosha_fail.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/target/classes/templates/order_detail.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
2018-10-27 23:40:10 +08:00
<change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java" afterDir="false" />
2018-12-05 11:48:02 +08:00
<change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java" afterDir="false" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/config/WebConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/config/WebConfig.java" afterDir="false" />
2018-12-05 11:48:02 +08:00
<change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java" afterDir="false" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java" afterDir="false" />
2018-12-05 11:48:02 +08:00
<change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java" afterDir="false" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.properties" afterDir="false" />
2018-12-05 11:48:02 +08:00
<change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<change beforePath="$PROJECT_DIR$/src/main/resources/dubbo/springmvc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/dubbo/springmvc.xml" afterDir="false" />
2018-09-16 22:44:42 +08:00
</list>
2018-09-14 12:34:02 +08:00
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option name="TRACKING_ENABLED" value="true" />
2018-09-14 12:34:02 +08:00
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore">
2018-09-14 12:34:02 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="104">
<caret line="115" column="30" selection-start-line="115" selection-start-column="30" selection-end-line="115" selection-end-column="30" />
2018-10-27 23:40:10 +08:00
</state>
</provider>
</entry>
</file>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<file leaf-file-name="AccessInterceptor.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java">
2018-10-27 23:40:10 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="-1772">
<caret line="11" column="52" selection-start-line="11" selection-start-column="52" selection-end-line="11" selection-end-column="52" />
2018-10-27 23:40:10 +08:00
</state>
</provider>
</entry>
</file>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<file leaf-file-name="CodeMsg.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/result/CodeMsg.java">
2018-12-05 11:48:02 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="425">
<caret line="17" column="26" selection-start-line="17" selection-start-column="26" selection-end-line="17" selection-end-column="26" />
2018-12-05 11:48:02 +08:00
</state>
</provider>
</entry>
</file>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<file leaf-file-name="AccessKey.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/AccessKey.java">
2018-12-05 11:48:02 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="100">
<caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
2018-12-05 11:48:02 +08:00
</state>
</provider>
</entry>
</file>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<file leaf-file-name="RedisService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedisService.java">
2018-12-05 11:48:02 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="2775">
<caret line="111" column="23" selection-start-line="111" selection-start-column="23" selection-end-line="111" selection-end-column="23" />
2018-12-05 11:48:02 +08:00
</state>
</provider>
</entry>
</file>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<file leaf-file-name="KeyPrefix.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/KeyPrefix.java">
2018-12-05 11:48:02 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="50">
<caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
2018-12-05 11:48:02 +08:00
</state>
</provider>
</entry>
</file>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<file leaf-file-name="MiaoShaUserService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java">
2018-12-05 11:48:02 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="2275">
<caret line="107" selection-start-line="107" selection-end-line="107" />
2018-12-05 11:48:02 +08:00
</state>
</provider>
</entry>
</file>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<file leaf-file-name="MiaoshaController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java">
2018-12-05 11:48:02 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="3700">
<caret line="148" selection-start-line="148" selection-end-line="148" />
2018-12-05 11:48:02 +08:00
</state>
</provider>
</entry>
</file>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<file leaf-file-name="MiaoShaUserKey.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/MiaoShaUserKey.java">
2018-12-05 11:48:02 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="100">
<caret line="4" column="33" selection-start-line="4" selection-start-column="33" selection-end-line="4" selection-end-column="33" />
<folding>
<element signature="e#352#353#0" expanded="true" />
<element signature="e#395#396#0" expanded="true" />
</folding>
2018-12-05 11:48:02 +08:00
</state>
</provider>
</entry>
</file>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<file leaf-file-name="LoginController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/LoginController.java">
2018-10-27 23:40:10 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="675">
<caret line="44" column="21" selection-start-line="44" selection-start-column="21" selection-end-line="44" selection-end-column="21" />
<folding>
<element signature="e#1591#1592#0" expanded="true" />
<element signature="e#1649#1650#0" expanded="true" />
</folding>
2018-09-14 12:34:02 +08:00
</state>
</provider>
</entry>
</file>
</leaf>
</component>
2018-09-15 21:46:13 +08:00
<component name="FindInProjectRecents">
<findStrings>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<find>demoService</find>
<find>redis.host</find>
2018-12-05 11:48:02 +08:00
<find>redisson</find>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<find>spring.rabbitmq.host</find>
<find>rabbitmq</find>
<find>JedisPool</find>
<find>redisson.master-name</find>
<find>/register</find>
<find>register</find>
<find>login</find>
<find>AccessInterceptor</find>
<find>mvc:interceptors</find>
<find>interceptor</find>
2018-09-15 21:46:13 +08:00
</findStrings>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<replaceStrings>
<replace />
</replaceStrings>
2018-09-15 21:46:13 +08:00
</component>
2018-09-14 12:34:02 +08:00
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="master" />
</map>
</option>
2018-09-14 12:34:02 +08:00
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
2018-10-27 23:40:10 +08:00
<option value="$PROJECT_DIR$/src/main/resources/dubbo/dubbo_consumer.xml" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option value="$PROJECT_DIR$/src/main/resources/dubbo/springmvc.xml" />
2018-11-11 10:48:03 +08:00
<option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option value="$PROJECT_DIR$/src/main/resources/application-dev.properties" />
<option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java" />
2018-12-05 11:48:02 +08:00
<option value="$PROJECT_DIR$/src/main/resources/application.properties" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/Md5Utils/MD5Utils.java" />
2018-12-05 11:48:02 +08:00
<option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/config/WebConfig.java" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java" />
2018-09-14 12:34:02 +08:00
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
2018-10-27 23:40:10 +08:00
<component name="MavenImportPreferences">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option name="generalSettings">
<MavenGeneralSettings>
<option name="mavenHome" value="E:/develop-tools/apache-maven-3.3.9" />
</MavenGeneralSettings>
</option>
<option name="importingSettings">
<MavenImportingSettings>
<option name="importAutomatically" value="true" />
</MavenImportingSettings>
2018-10-27 23:40:10 +08:00
</option>
</component>
2018-09-16 22:42:47 +08:00
<component name="MavenProjectNavigator">
<treeState>
<expand>
2018-10-27 23:40:10 +08:00
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="Profiles" type="6783ec58:MavenProjectsStructure$ProfilesNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="miaosha" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path>
2018-09-16 22:42:47 +08:00
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="miaosha" type="9519ce18:MavenProjectsStructure$ProjectNode" />
2018-10-27 23:40:10 +08:00
<item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
2018-09-16 22:42:47 +08:00
</path>
</expand>
<select />
</treeState>
</component>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<component name="NodePackageJsonFileManager">
<packageJsonPaths />
</component>
2018-09-16 22:51:06 +08:00
<component name="ProjectFrameBounds" extendedState="6">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option name="x" value="1912" />
2018-12-05 11:48:02 +08:00
<option name="y" value="-8" />
<option name="width" value="1936" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option name="height" value="1096" />
2018-09-14 12:34:02 +08:00
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
<profile-state>
<expanded-state>
2018-10-27 23:40:10 +08:00
<State>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<id />
2018-10-27 23:40:10 +08:00
</State>
<State>
<id>Android</id>
</State>
<State>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<id>Android &gt; Lint &gt; Correctness</id>
2018-10-27 23:40:10 +08:00
</State>
<State>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<id>Android &gt; Lint &gt; Performance</id>
2018-10-27 23:40:10 +08:00
</State>
<State>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<id>Android Lint for Kotlin</id>
2018-10-27 23:40:10 +08:00
</State>
<State>
<id>Java</id>
</State>
<State>
<id>Java language level migration aidsJava</id>
</State>
2018-09-14 12:34:02 +08:00
</expanded-state>
<selected-state>
<State>
<id>Android</id>
</State>
</selected-state>
</profile-state>
</entry>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<pane id="PackagesPane" />
2018-09-14 12:34:02 +08:00
<pane id="ProjectPane">
<subPane>
<expand>
2018-09-18 23:21:28 +08:00
<path>
2018-11-11 10:48:03 +08:00
<item name="miaosha" type="b2602c69:ProjectViewProjectNode" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<item name="miaosha-with-dubbo" type="462c0819:PsiDirectoryNode" />
2018-12-05 11:48:02 +08:00
</path>
2018-09-14 12:34:02 +08:00
</expand>
<select />
</subPane>
</pane>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<pane id="Scope" />
2018-09-14 12:34:02 +08:00
</panes>
</component>
<component name="PropertiesComponent">
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelOrder2" value="2" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
<property name="RequestMappingsPanelWidth2" value="75" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<property name="last_opened_file_path" value="$PROJECT_DIR$/../bim-platform" />
2018-09-14 12:34:02 +08:00
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<property name="project.structure.last.edited" value="Project" />
2018-09-14 12:34:02 +08:00
<property name="project.structure.proportion" value="0.0" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<property name="project.structure.side.proportion" value="0.2505747" />
<property name="settings.editor.selected.configurable" value="editor.preferences.import" />
2018-09-14 12:34:02 +08:00
</component>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<component name="RestServicesNavigator">
<treeState>
<expand>
<path>
<item name="Found 21 services " type="fcff1e1b:RestServiceStructure$RootNode" />
</path>
<path>
<item name="Found 21 services " type="fcff1e1b:RestServiceStructure$RootNode" />
<item name="miaosha-with-dubbo" type="c588b436:RestServiceStructure$ProjectNode" />
</path>
</expand>
<select />
</treeState>
2018-09-14 12:34:02 +08:00
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
2018-10-27 23:40:10 +08:00
<component name="RunManager" selected="Spring Boot.GeekQMainApplication">
2018-09-15 21:46:13 +08:00
<configuration name="MD5Utils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.geekq.miaosha.Md5Utils.MD5Utils" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<module name="miaosha-with-dubbo" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
2018-09-15 21:46:13 +08:00
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.geekq.miaosha.Md5Utils.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
</configuration>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<configuration default="true" type="Application" factoryName="Application">
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
2018-09-21 23:11:31 +08:00
</configuration>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<configuration default="true" type="JUnit" factoryName="JUnit">
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<patterns />
2018-09-27 22:10:09 +08:00
</configuration>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<configuration name="GeekQMainApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="miaosha-with-dubbo" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.geekq.miaosha.GeekQMainApplication" />
2018-10-27 23:40:10 +08:00
</configuration>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<configuration default="true" type="TestNG" factoryName="TestNG">
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="SUITE_NAME" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="GROUP_NAME" />
<option name="TEST_OBJECT" value="CLASS" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
<option name="OUTPUT_DIRECTORY" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<option name="USE_DEFAULT_REPORTERS" value="false" />
<option name="PROPERTIES_FILE" />
<properties />
<listeners />
2018-09-14 12:34:02 +08:00
</configuration>
<list>
2018-10-27 23:40:10 +08:00
<item itemvalue="Spring Boot.GeekQMainApplication" />
2018-09-15 21:46:13 +08:00
<item itemvalue="Application.MD5Utils" />
2018-09-14 12:34:02 +08:00
</list>
<recent_temporary>
<list>
2018-09-15 21:46:13 +08:00
<item itemvalue="Application.MD5Utils" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<item itemvalue="Application.MD5Utils" />
<item itemvalue="Application.MD5Utils" />
2018-09-14 12:34:02 +08:00
</list>
</recent_temporary>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<changelist id="c03f8710-3299-4e4e-a70a-393f99f94219" name="Default" comment="" />
<created>1543898292091</created>
2018-09-14 12:34:02 +08:00
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<updated>1543898292091</updated>
<workItem from="1543898293237" duration="689000" />
<workItem from="1543909920583" duration="122000" />
<workItem from="1543910064161" duration="17620000" />
2018-09-14 12:34:02 +08:00
</task>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<task id="LOCAL-00001" summary="init">
<created>1543898730025</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1543898730025</updated>
</task>
<task id="LOCAL-00002" summary="update config">
<created>1543987560133</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1543987560133</updated>
</task>
<option name="localTasksCounter" value="3" />
2018-09-14 12:34:02 +08:00
<servers />
</component>
<component name="TimeTrackingManager">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option name="totallyTimeSpent" value="18431000" />
2018-09-14 12:34:02 +08:00
</component>
<component name="ToolWindowManager">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<frame x="1912" y="-8" width="1936" height="1096" extended-state="6" />
2018-09-14 12:34:02 +08:00
<layout>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<window_info anchor="right" id="Palette" order="3" />
<window_info anchor="bottom" id="TODO" order="7" />
<window_info anchor="right" id="RestServices" order="8" weight="0.1913646" />
<window_info anchor="bottom" id="Messages" order="0" weight="0.32985386" />
<window_info anchor="right" id="Palette&#9;" order="4" />
<window_info anchor="bottom" id="Java Enterprise" order="14" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.41897655" side_tool="true" weight="0.32985386" />
<window_info anchor="right" id="Maven Projects" order="7" visible="true" weight="0.32995737" />
<window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
<window_info anchor="bottom" id="Run" order="3" sideWeight="0.4989339" weight="0.3434238" />
<window_info active="true" anchor="bottom" id="Version Control" order="13" sideWeight="0.58102345" visible="true" weight="0.32985386" />
<window_info anchor="bottom" id="Spring" order="10" />
<window_info anchor="bottom" id="Terminal" order="12" sideWeight="0.73507464" weight="0.32985386" />
<window_info id="Designer" order="5" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2553305" />
<window_info anchor="right" id="Bean Validation" order="6" />
<window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
<window_info id="Web" order="2" side_tool="true" />
<window_info anchor="right" id="Database" order="5" />
<window_info anchor="bottom" id="Find" order="2" weight="0.32985386" />
2018-09-16 15:22:24 +08:00
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<window_info id="UI Designer" order="3" />
<window_info anchor="bottom" id="Debug" order="4" sideWeight="0.68070364" weight="0.4164927" />
<window_info id="Favorites" order="4" side_tool="true" />
<window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Message" order="1" />
<window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
2018-09-16 15:22:24 +08:00
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
</layout>
<layout-to-restore>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<window_info id="Designer" order="5" />
2018-09-14 12:34:02 +08:00
<window_info anchor="right" id="Palette" order="3" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<window_info anchor="bottom" id="Spring" order="10" />
<window_info anchor="bottom" id="Run" order="3" sideWeight="0.49946696" weight="0.34422657" />
<window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info id="UI Designer" order="3" />
<window_info id="Favorites" order="4" side_tool="true" />
<window_info anchor="bottom" id="Terminal" order="12" sideWeight="0.49840087" weight="0.32985386" />
<window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.3192964" side_tool="true" weight="0.4164927" />
<window_info anchor="bottom" id="Messages" order="0" weight="0.32985386" />
<window_info anchor="bottom" id="TODO" order="7" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Java Enterprise" order="14" />
<window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.4978678" weight="0.32985386" />
<window_info anchor="right" id="Maven Projects" order="7" weight="0.32995737" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info active="true" anchor="bottom" id="Find" order="2" visible="true" weight="0.32985386" />
<window_info content_ui="combo" id="Project" order="0" weight="0.2553305" />
<window_info anchor="right" id="Database" order="5" />
<window_info anchor="bottom" id="Message" order="1" />
<window_info id="Web" order="2" side_tool="true" />
<window_info anchor="right" id="Palette&#9;" order="4" />
<window_info anchor="right" id="RestServices" order="8" weight="0.1913646" />
<window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
<window_info anchor="bottom" id="Debug" order="4" sideWeight="0.68070364" weight="0.4164927" />
<window_info anchor="right" id="Bean Validation" order="6" />
2018-09-16 15:22:24 +08:00
</layout-to-restore>
2018-09-14 12:34:02 +08:00
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
<option name="COLUMN_ORDER">
<list>
<option value="0" />
<option value="1" />
<option value="2" />
<option value="3" />
</list>
</option>
</State>
</value>
</entry>
</map>
</option>
</component>
2018-09-14 12:34:02 +08:00
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<component name="VcsManagerConfiguration">
<option name="LOCAL_CHANGES_DETAILS_PREVIEW_SHOWN" value="true" />
<MESSAGE value="init" />
<MESSAGE value="update config" />
<option name="LAST_COMMIT_MESSAGE" value="update config" />
</component>
<component name="WindowStateProjectService">
<state width="202" height="447" key="Git.Branch.Popup" />
<state width="202" height="447" key="Git.Branch.Popup/1920.1080/1920.1080" />
<state width="202" height="447" key="Git.Branch.Popup@1920.1080" />
</component>
2018-09-16 15:22:24 +08:00
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
2018-11-11 10:48:03 +08:00
<line-breakpoint enabled="true" type="java-line">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<url>file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java</url>
<line>148</line>
2018-11-11 10:48:03 +08:00
<properties />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<url>file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/GoodsController.java</url>
<line>55</line>
2018-11-11 10:48:03 +08:00
<properties />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option name="timeStamp" value="1" />
2018-11-11 10:48:03 +08:00
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<url>file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java</url>
<line>34</line>
2018-11-11 10:48:03 +08:00
<properties />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option name="timeStamp" value="5" />
2018-11-11 10:48:03 +08:00
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<url>file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java</url>
<line>34</line>
2018-11-11 10:48:03 +08:00
<properties />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option name="timeStamp" value="6" />
2018-11-11 10:48:03 +08:00
</line-breakpoint>
2018-12-05 11:48:02 +08:00
<line-breakpoint enabled="true" type="java-line">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<url>file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java</url>
<line>107</line>
2018-12-05 11:48:02 +08:00
<properties />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option name="timeStamp" value="7" />
2018-12-05 11:48:02 +08:00
</line-breakpoint>
2018-09-16 15:22:24 +08:00
</breakpoints>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option name="time" value="9" />
2018-09-16 15:22:24 +08:00
</breakpoint-manager>
</component>
2018-09-15 21:46:13 +08:00
<component name="debuggerHistoryManager">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<expressions id="evaluateCodeFragment">
2018-09-15 21:46:13 +08:00
<expression>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<expression-string>getCookieValue(request, MiaoShaUserService.COOKIE_NAME_TOKEN)</expression-string>
2018-09-15 21:46:13 +08:00
<language-id>JAVA</language-id>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<evaluation-mode>CODE_FRAGMENT</evaluation-mode>
2018-09-15 21:46:13 +08:00
</expression>
<expression>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<expression-string>UserContext.getUser()</expression-string>
2018-09-15 21:46:13 +08:00
<language-id>JAVA</language-id>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<evaluation-mode>CODE_FRAGMENT</evaluation-mode>
2018-09-15 21:46:13 +08:00
</expression>
</expressions>
</component>
2018-09-14 12:34:02 +08:00
<component name="editorHistoryManager">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/.gitignore">
2018-09-15 21:46:13 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="775">
<caret line="31" selection-start-line="31" selection-end-line="31" />
2018-09-14 12:34:02 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/.gitignore">
2018-09-14 12:34:02 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="775">
<caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
2018-09-14 12:34:02 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/resources/dubbo/dubbo_consumer.xml">
2018-09-14 12:34:02 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="564">
<caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
2018-09-14 12:34:02 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/resources/config/application-test.properties">
2018-09-15 21:46:13 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="-684">
<caret line="10" column="53" lean-forward="true" selection-start-line="10" selection-start-column="53" selection-end-line="10" selection-end-column="53" />
2018-09-15 21:46:13 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java">
2018-09-15 21:46:13 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="125">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
2018-09-15 21:46:13 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java">
2018-09-15 21:46:13 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="302">
<caret line="18" column="31" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#820#821#0" expanded="true" />
<element signature="e#856#857#0" expanded="true" />
<element signature="e#931#932#0" expanded="true" />
<element signature="e#974#975#0" expanded="true" />
<element signature="e#1011#1012#0" expanded="true" />
<element signature="e#1054#1055#0" expanded="true" />
<element signature="e#1099#1100#0" expanded="true" />
<element signature="e#1146#1147#0" expanded="true" />
<element signature="e#1187#1188#0" expanded="true" />
<element signature="e#1273#1274#0" expanded="true" />
<element signature="e#1314#1315#0" expanded="true" />
<element signature="e#1397#1398#0" expanded="true" />
<element signature="e#1481#1482#0" expanded="true" />
<element signature="e#1530#1531#0" expanded="true" />
<element signature="e#1572#1573#0" expanded="true" />
<element signature="e#1640#1641#0" expanded="true" />
<element signature="e#1682#1683#0" expanded="true" />
<element signature="e#1750#1751#0" expanded="true" />
<element signature="e#1836#1837#0" expanded="true" />
<element signature="e#1887#1888#0" expanded="true" />
<element signature="e#1925#1926#0" expanded="true" />
<element signature="e#1968#1969#0" expanded="true" />
<element signature="e#2050#2066#0" expanded="true" />
</folding>
2018-09-15 21:46:13 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java">
2018-09-15 21:46:13 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="100">
<caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
2018-09-15 21:46:13 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider editor-type-id="text-editor">
<state relative-caret-position="-3050">
<caret line="25" column="24" lean-forward="true" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24" />
2018-09-15 21:46:13 +08:00
</state>
</provider>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<provider selected="true" editor-type-id="MavenHelperPluginDependencyAnalyzer" />
2018-09-15 21:46:13 +08:00
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedisConfig.java">
2018-09-15 21:46:13 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="150">
<caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
2018-09-14 12:34:02 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="jar://$MAVEN_REPOSITORY$/redis/clients/jedis/2.9.0/jedis-2.9.0-sources.jar!/redis/clients/jedis/JedisPool.java">
2018-09-14 13:02:35 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="310">
<caret line="141" column="9" selection-start-line="141" selection-start-column="9" selection-end-line="141" selection-end-column="9" />
2018-09-15 21:46:13 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.properties">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/static/order_detail.htm">
2018-11-11 10:48:03 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="-150" />
2018-11-11 10:48:03 +08:00
</provider>
2018-10-27 23:40:10 +08:00
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.properties">
2018-09-15 21:46:13 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="383">
<caret line="75" column="43" selection-start-line="75" selection-start-column="24" selection-end-line="75" selection-end-column="43" />
2018-09-15 21:46:13 +08:00
</state>
</provider>
</entry>
2018-12-05 11:48:02 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/DemoController.java">
2018-09-15 21:46:13 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="100">
<caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
2018-09-15 21:46:13 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/miaosha.sql">
2018-09-15 21:46:13 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="50">
<caret line="2" column="39" selection-start-line="2" selection-start-column="32" selection-end-line="2" selection-end-column="39" />
2018-09-15 21:46:13 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/RateLimiterController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
2018-09-15 21:46:13 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/OrderController.java">
2018-09-15 21:46:13 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="150">
<caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
2018-09-15 21:46:13 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/UserController.java">
2018-09-15 21:46:13 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="300">
<caret line="16" column="14" lean-forward="true" selection-start-line="16" selection-start-column="14" selection-end-line="16" selection-end-column="14" />
2018-09-15 21:46:13 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/dao/MiaoShaUserDao.java">
2018-09-15 21:46:13 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="400">
<caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
2018-09-15 21:46:13 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/Md5Utils/MD5Utils.java">
2018-09-15 21:46:13 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="242">
<caret line="37" column="23" lean-forward="true" selection-start-line="37" selection-start-column="23" selection-end-line="37" selection-end-column="23" />
2018-09-16 22:42:47 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.3.12.RELEASE/spring-beans-4.3.12.RELEASE.jar!/org/springframework/beans/factory/InitializingBean.class">
2018-09-16 22:42:47 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="100">
<caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
2018-09-16 22:42:47 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java">
2018-09-18 23:21:28 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="183">
<caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
2018-09-18 23:21:28 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.12.RELEASE/spring-web-4.3.12.RELEASE.jar!/org/springframework/web/method/HandlerMethod.class">
2018-09-21 23:11:31 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="150">
<caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
2018-09-21 23:11:31 +08:00
</state>
</provider>
</entry>
2018-12-05 11:48:02 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/UserContext.java">
2018-09-18 23:21:28 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="100">
2018-12-05 11:48:02 +08:00
<caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<folding>
<element signature="e#179#192#0" expanded="true" />
<element signature="e#244#245#0" expanded="true" />
<element signature="e#271#272#0" expanded="true" />
<element signature="e#312#313#0" expanded="true" />
<element signature="e#342#343#0" expanded="true" />
</folding>
2018-09-21 23:11:31 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/resources/dubbo/springmvc.xml">
2018-09-21 23:11:31 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="707">
<caret line="29" column="62" lean-forward="true" selection-start-line="29" selection-start-column="62" selection-end-line="29" selection-end-column="62" />
2018-09-21 23:11:31 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java">
2018-09-21 23:11:31 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="19">
<caret line="17" column="33" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="33" />
2018-09-21 23:11:31 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/config/WebConfig.java">
2018-09-21 23:11:31 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="575">
<caret line="23" column="51" lean-forward="true" selection-start-line="23" selection-start-column="51" selection-end-line="23" selection-end-column="51" />
<folding>
<element signature="imports" expanded="true" />
</folding>
2018-09-21 23:11:31 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
2018-09-21 23:11:31 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="507">
<caret line="45" column="6" lean-forward="true" selection-start-line="45" selection-start-column="6" selection-end-line="45" selection-end-column="6" />
2018-09-21 23:11:31 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java">
2018-09-21 23:11:31 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="25">
<caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
2018-09-21 23:11:31 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java">
2018-09-16 22:42:47 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="175">
<caret line="12" column="14" lean-forward="true" selection-start-line="12" selection-start-column="14" selection-end-line="12" selection-end-column="14" />
2018-09-16 22:42:47 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/GoodsController.java">
2018-11-11 10:48:03 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="50">
<caret line="91" lean-forward="true" selection-start-line="91" selection-end-line="91" />
2018-11-11 10:48:03 +08:00
</state>
</provider>
2018-10-27 23:40:10 +08:00
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/resources/static/goods_detail.htm">
2018-09-16 22:42:47 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="475">
<caret line="19" column="27" lean-forward="true" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
2018-09-16 22:42:47 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/AccessLimit.java">
2018-09-16 22:42:47 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="175">
<caret line="11" column="11" lean-forward="true" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
2018-09-16 22:42:47 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/BasePrefix.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="11" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
<folding>
<element signature="e#410#411#0" expanded="true" />
<element signature="e#457#458#0" expanded="true" />
</folding>
</state>
</provider>
2018-09-16 22:42:47 +08:00
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.3.12.RELEASE/spring-webmvc-4.3.12.RELEASE.jar!/org/springframework/web/servlet/HandlerExecutionChain.class">
2018-09-18 23:21:28 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="1650">
<caret line="82" selection-start-line="82" selection-end-line="82" />
2018-09-18 23:21:28 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/result/CodeMsg.java">
2018-09-18 23:21:28 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="425">
<caret line="17" column="26" selection-start-line="17" selection-start-column="26" selection-end-line="17" selection-end-column="26" />
2018-09-18 23:21:28 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/AccessKey.java">
2018-09-17 12:18:13 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="100">
<caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
2018-09-17 12:18:13 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/RedisService.java">
2018-09-17 12:18:13 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="2775">
<caret line="111" column="23" selection-start-line="111" selection-start-column="23" selection-end-line="111" selection-end-column="23" />
2018-11-11 10:48:03 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/KeyPrefix.java">
2018-11-11 10:48:03 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="50">
<caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
2018-09-17 12:18:13 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java">
2018-09-17 12:18:13 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="2275">
<caret line="107" selection-start-line="107" selection-end-line="107" />
2018-09-18 23:21:28 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/MiaoshaController.java">
2018-09-18 23:21:28 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="3700">
<caret line="148" selection-start-line="148" selection-end-line="148" />
2018-09-18 23:21:28 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/redis/MiaoShaUserKey.java">
2018-09-18 23:21:28 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="100">
<caret line="4" column="33" selection-start-line="4" selection-start-column="33" selection-end-line="4" selection-end-column="33" />
<folding>
<element signature="e#352#353#0" expanded="true" />
<element signature="e#395#396#0" expanded="true" />
</folding>
2018-09-18 23:21:28 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/controller/LoginController.java">
2018-09-21 23:11:31 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="675">
<caret line="44" column="21" selection-start-line="44" selection-start-column="21" selection-end-line="44" selection-end-column="21" />
<folding>
<element signature="e#1591#1592#0" expanded="true" />
<element signature="e#1649#1650#0" expanded="true" />
</folding>
2018-09-27 22:23:19 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/.gitignore">
2018-09-27 22:23:19 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="104">
<caret line="115" column="30" selection-start-line="115" selection-start-column="30" selection-end-line="115" selection-end-column="30" />
2018-09-21 23:11:31 +08:00
</state>
</provider>
</entry>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<entry file="file://$PROJECT_DIR$/src/main/java/com/geekq/miaosha/access/AccessInterceptor.java">
2018-09-21 23:11:31 +08:00
<provider selected="true" editor-type-id="text-editor">
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state relative-caret-position="-1772">
<caret line="11" column="52" selection-start-line="11" selection-start-column="52" selection-end-line="11" selection-end-column="52" />
2018-09-21 23:11:31 +08:00
</state>
</provider>
</entry>
2018-09-14 12:34:02 +08:00
</component>
<component name="masterDetails">
<states>
<state key="GlobalLibrariesConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option value="0.2505747" />
2018-09-14 12:34:02 +08:00
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="JdkListConfigurable.UI">
<settings>
<last-edited>1.8</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option value="0.2505747" />
2018-09-14 12:34:02 +08:00
</list>
</option>
</splitter-proportions>
</settings>
</state>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<state key="ProjectJDKs.UI">
2018-09-14 12:34:02 +08:00
<settings>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<last-edited>1.8</last-edited>
2018-09-14 12:34:02 +08:00
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master # Conflicts: # .gitignore # README.md # pom.xml # src/main/java/com/geekq/miaosha/GeekQMainApplication.java # src/main/java/com/geekq/miaosha/access/AccessInterceptor.java # src/main/java/com/geekq/miaosha/access/AccessKey.java # src/main/java/com/geekq/miaosha/access/AccessLimit.java # src/main/java/com/geekq/miaosha/access/UserContext.java # src/main/java/com/geekq/miaosha/config/UserArgumentResolver.java # src/main/java/com/geekq/miaosha/config/WebConfig.java # src/main/java/com/geekq/miaosha/controller/DemoController.java # src/main/java/com/geekq/miaosha/controller/MiaoshaController.java # src/main/java/com/geekq/miaosha/controller/OrderController.java # src/main/java/com/geekq/miaosha/dao/DruidConfig.java # src/main/java/com/geekq/miaosha/dao/GoodsDao.java # src/main/java/com/geekq/miaosha/dao/OrderDao.java # src/main/java/com/geekq/miaosha/dao/UserDao.java # src/main/java/com/geekq/miaosha/domain/Goods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaGoods.java # src/main/java/com/geekq/miaosha/domain/MiaoshaOrder.java # src/main/java/com/geekq/miaosha/domain/MiaoshaUser.java # src/main/java/com/geekq/miaosha/domain/OrderInfo.java # src/main/java/com/geekq/miaosha/domain/User.java # src/main/java/com/geekq/miaosha/mybatis/README.md # src/main/java/com/geekq/miaosha/rabbitmq/MQConfig.java # src/main/java/com/geekq/miaosha/rabbitmq/MQReceiver.java # src/main/java/com/geekq/miaosha/rabbitmq/MQSender.java # src/main/java/com/geekq/miaosha/rabbitmq/MiaoshaMessage.java # src/main/java/com/geekq/miaosha/redis/GoodsKey.java # src/main/java/com/geekq/miaosha/redis/MiaoshaKey.java # src/main/java/com/geekq/miaosha/redis/RedisPoolFactory.java # src/main/java/com/geekq/miaosha/redis/RedisService.java # src/main/java/com/geekq/miaosha/redis/RedissonAutoConfiguration.java # src/main/java/com/geekq/miaosha/redis/RedissonDistributedLocker.java # src/main/java/com/geekq/miaosha/redis/RedissonProperties.java # src/main/java/com/geekq/miaosha/redis/RedissonService.java # src/main/java/com/geekq/miaosha/result/CodeMsg.java # src/main/java/com/geekq/miaosha/service/GoodsService.java # src/main/java/com/geekq/miaosha/service/MiaoShaUserService.java # src/main/java/com/geekq/miaosha/service/MiaoshaService.java # src/main/java/com/geekq/miaosha/service/OrderService.java # src/main/java/com/geekq/miaosha/service/UserService.java # src/main/java/com/geekq/miaosha/timeTask/OrderCloseTask.java # src/main/java/com/geekq/miaosha/utils/ValidatorUtil.java # src/main/java/com/geekq/miaosha/vo/GoodsDetailVo.java # src/main/java/com/geekq/miaosha/vo/GoodsVo.java # src/main/java/com/geekq/miaosha/vo/OrderDetailVo.java # src/main/resources/application-dev.properties # src/main/resources/application-prod.properties # src/main/resources/application-test.properties # src/main/resources/application.properties # src/main/resources/config/application-test.properties # src/main/resources/dubbo/springmvc.xml # src/main/resources/static/goods_detail.htm # src/main/resources/static/js/common.js # src/main/resources/static/js/jquery.min.js # src/main/resources/static/order_detail.htm # src/main/resources/templates/goods_detail.html # src/main/resources/templates/goods_list.html # src/main/resources/templates/hello.html # src/main/resources/templates/login.html # src/main/resources/templates/miaosha_fail.html # src/main/resources/templates/order_detail.html
2018-12-05 13:53:09 +08:00
<option value="0.2505747" />
2018-09-14 12:34:02 +08:00
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>