提交 · liudaze/pr/add-interceptor-config · 晶之木 / miaosha

05 12月, 2018 8 次提交

J

config AccessInterceptor · a1c90d04
由 jay1991115@126.com 提交于 12月 05, 2018

a1c90d04
J

clean project directory · 1ff919d2
由 jay1991115@126.com 提交于 12月 05, 2018

1ff919d2
J

delete *.iml · 87b04b7c
由 jay1991115@126.com 提交于 12月 05, 2018

87b04b7c
J

update · 35d3dcbd
由 jay1991115@126.com 提交于 12月 05, 2018

35d3dcbd

Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master · fcff41c7

由 jay1991115@126.com 提交于 12月 05, 2018

# 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

fcff41c7

Merge branch 'master' of https://github.com/qiurunze123/miaosha into github-master · 0f55bf5c

由 jay1991115@126.com 提交于 12月 05, 2018

# 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

0f55bf5c

J

update config · 9455fd6e
由 jay1991115@126.com 提交于 12月 05, 2018

9455fd6e
Q

提交修改 token 重新生成问题 · c700c1a3
由 qiurunze 提交于 12月 05, 2018

c700c1a3

04 12月, 2018 1 次提交
- J
  
  init · 24acc809
  由 jay1991115@126.com 提交于 12月 04, 2018
  
  24acc809
11 11月, 2018 1 次提交
- Q
  
  分布式锁的演进与讲解 · a07f9a4c
  由 qiurunze123 提交于 11月 11, 2018
  
  a07f9a4c
27 10月, 2018 4 次提交
- Q
  
  maven隔离-- 讲解与说明！ · 5a8573ba
  由 qiurunze123 提交于 10月 27, 2018
  
  5a8573ba
- Q
  
  maven隔离-- 讲解与说明！ · 8d0038c3
  由 qiurunze123 提交于 10月 27, 2018
  
  8d0038c3
- Q
  
  maven 隔离 --- 讲解和说明！ · d94fe1b6
  由 qiurunze123 提交于 10月 27, 2018
  
  d94fe1b6
- Q
  
  提交 lombok 与 maven 隔离！ · 87c7ac9c
  由 qiurunze123 提交于 10月 27, 2018
  
  87c7ac9c
27 9月, 2018 2 次提交
- Q
  
  mybatis xml 写法解析 · 55fbc8d0
  由 qiurunze 提交于 9月 27, 2018
  
  55fbc8d0
- Q
  
  mybatis xml 写法解析 · d053fbcf
  由 qiurunze 提交于 9月 27, 2018
  
  d053fbcf
21 9月, 2018 1 次提交
- Q
  
  提交threadlocal讲解 · 9c73ca56
  由 qiurunze 提交于 9月 21, 2018
  
  9c73ca56
18 9月, 2018 1 次提交
- Q
  
  提交一些常见问题 · 133946bd
  由 qiurunze 提交于 9月 18, 2018
  
  133946bd
17 9月, 2018 3 次提交
- Q
  
  提交ngnix负载均衡 · 08741e94
  由 qiurunze 提交于 9月 17, 2018
  
  08741e94
- Q
  
  提交nginx · 09e522c5
  由 qiurunze 提交于 9月 17, 2018
  
  09e522c5
- Q
  
  提交nginx · e7adbae3
  由 qiurunze 提交于 9月 17, 2018
  
  e7adbae3
16 9月, 2018 5 次提交
- Q
  
  提交sql构建 · bca7221e
  由 qiurunze 提交于 9月 16, 2018
  
  bca7221e
- Q
  
  设计文档 · 62e631f2
  由 qiurunze 提交于 9月 16, 2018
  
  62e631f2
- Q
  
  设计文档 · c3288103
  由 qiurunze 提交于 9月 16, 2018
  
  c3288103
- Q
  
  提交接口防刷 · eedcee12
  由 qiurunze 提交于 9月 16, 2018
  
  eedcee12
- Q
  
  提交接口防刷 · b12afa37
  由 qiurunze 提交于 9月 16, 2018
  
  b12afa37
15 9月, 2018 1 次提交
- Q
  
  ＂分布式session＂ · 919dcaf9
  由 qiurunze 提交于 9月 15, 2018
  
  919dcaf9
14 9月, 2018 2 次提交
- Q
  
  second · 7c512b0d
  由 qiurunze 提交于 9月 14, 2018
  
  7c512b0d
- Q
  
  first commit · 145eb2d1
  由 qiurunze 提交于 9月 14, 2018
  
  145eb2d1

晶之木 / miaosha 与 Fork 源项目一致

晶之木 / miaosha
与 Fork 源项目一致