Commit Graph

29 Commits

Author SHA1 Message Date
jay1991115@126.com
a1c90d0446 config AccessInterceptor 2018-12-05 14:35:14 +08:00
jay1991115@126.com
1ff919d21e clean project directory 2018-12-05 14:21:28 +08:00
jay1991115@126.com
87b04b7c9c delete *.iml 2018-12-05 14:15:31 +08:00
jay1991115@126.com
35d3dcbd36 update 2018-12-05 14:10:44 +08:00
jay1991115@126.com
fcff41c787 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
jay1991115@126.com
0f55bf5c45 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:52:55 +08:00
jay1991115@126.com
9455fd6e37 update config 2018-12-05 13:26:00 +08:00
qiurunze
c700c1a307 提交修改 token 重新生成问题 2018-12-05 11:48:02 +08:00
jay1991115@126.com
24acc80920 init 2018-12-04 12:45:29 +08:00
qiurunze123
a07f9a4cba 分布式锁的演进与讲解 2018-11-11 10:48:03 +08:00
qiurunze123
5a8573ba8e maven隔离-- 讲解与说明! 2018-10-27 23:43:59 +08:00
qiurunze123
8d0038c33f maven隔离-- 讲解与说明! 2018-10-27 23:43:02 +08:00
qiurunze123
d94fe1b6bf maven 隔离 --- 讲解和说明! 2018-10-27 23:40:10 +08:00
qiurunze123
87c7ac9ca9 提交 lombok 与 maven 隔离! 2018-10-27 11:44:22 +08:00
qiurunze
55fbc8d08d mybatis xml 写法解析 2018-09-27 22:23:19 +08:00
qiurunze
d053fbcf6c mybatis xml 写法解析 2018-09-27 22:10:09 +08:00
qiurunze
9c73ca56a5 提交threadlocal讲解 2018-09-21 23:11:31 +08:00
qiurunze
133946bdff 提交一些常见问题 2018-09-18 23:21:28 +08:00
qiurunze
08741e946a 提交ngnix负载均衡 2018-09-17 12:27:18 +08:00
qiurunze
09e522c5f7 提交nginx 2018-09-17 12:18:20 +08:00
qiurunze
e7adbae306 提交nginx 2018-09-17 12:18:13 +08:00
qiurunze
bca7221ea4 提交sql构建 2018-09-16 22:51:06 +08:00
qiurunze
62e631f2fc 设计文档 2018-09-16 22:44:42 +08:00
qiurunze
c328810348 设计文档 2018-09-16 22:42:47 +08:00
qiurunze
eedcee12d4 提交接口防刷 2018-09-16 15:28:04 +08:00
qiurunze
b12afa3767 提交接口防刷 2018-09-16 15:22:24 +08:00
qiurunze
919dcaf9ba "分布式session" 2018-09-15 21:46:13 +08:00
qiurunze
7c512b0d46 second 2018-09-14 13:02:35 +08:00
qiurunze
145eb2d1d1 first commit 2018-09-14 12:34:02 +08:00