16 Commits

Author SHA1 Message Date
Chopper
bea807c7b4 demosite相关补充提交 2021-11-30 16:55:58 +08:00
paulGao
a44f06b3e8 优化管理端登录,权限菜单读取缓存 2021-11-04 14:42:12 +08:00
Chopper
fe8523ca3f Merge branch 'backup'
# Conflicts:
#	manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java
#	manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java
#	manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
#	manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
#	manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
#	manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java
2021-07-25 17:51:05 +08:00
lifenlong
1ee60c02d3 添加引用 2021-07-23 19:58:32 +08:00
Chopper
280c5dec39 注解包调整 2021-07-22 17:33:57 +08:00
Chopper
fdb55bc426 Merge branch 'backup'
# Conflicts:
#	framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
#	framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
#	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java
#	framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java
2021-07-22 12:07:22 +08:00
Chopper
bd3aceaeac 完善方法注释 2021-07-21 17:46:46 +08:00
Chopper
fe021f8a11 暂时备份一下代码,准备切换master 2021-07-20 15:44:09 +08:00
Chopper
a9c79eedd4 代码结构优化,缩减。一个多次判定问题处理 2021-07-16 10:40:44 +08:00
Chopper
a97b698d8e Merge branch 'master' into Bulbasaur
# Conflicts:
#	consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java
#	consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java
#	framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java
#	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
#	framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java
2021-06-15 15:50:54 +08:00
Chopper
9195292aa9 演示站点部分权限控制 2021-06-10 17:40:53 +08:00
lifenlong
a51e86fd98 去除e.printStackTrace();使用slf4j实现 2021-06-07 16:49:59 +08:00
Chopper
a10110e1f0 调整异常机制 2021-05-19 14:11:12 +08:00
Chopper
0528a1e1ca 错误消息机制问题重新处理 2021-05-18 15:40:26 +08:00
lifenlong
a10c38f3c1 去除final使用@Autowired 2021-05-13 15:07:03 +08:00
Chopper
3785bdb3bb commit message 2021-05-13 10:41:46 +08:00