diff --git a/buyer-api/src/main/resources/logback.xml b/buyer-api/src/main/resources/logback.xml index 4e5e5ef5..5837ff17 100644 --- a/buyer-api/src/main/resources/logback.xml +++ b/buyer-api/src/main/resources/logback.xml @@ -6,7 +6,7 @@ - + ${APP_NAME} diff --git a/common-api/src/main/resources/logback.xml b/common-api/src/main/resources/logback.xml index 46c868ce..46dec7c7 100644 --- a/common-api/src/main/resources/logback.xml +++ b/common-api/src/main/resources/logback.xml @@ -6,7 +6,7 @@ - + ${APP_NAME} diff --git a/consumer/src/main/resources/logback.xml b/consumer/src/main/resources/logback.xml index e4de4ff4..45ee2e13 100644 --- a/consumer/src/main/resources/logback.xml +++ b/consumer/src/main/resources/logback.xml @@ -6,7 +6,7 @@ - + ${APP_NAME} @@ -22,7 +22,7 @@ - 127.0.0.1:4560 + 192.168.0.116:4560 diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java index 8be37013..2a3c5415 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java @@ -110,7 +110,7 @@ public class SeckillServiceImpl extends ServiceImpl impl // 保存到MYSQL中 boolean result = this.save(seckill); // 保存到MONGO中 - this.mongoTemplate.save(seckill); + this.mongoTemplate.save(seckillVO); //添加秒杀延时任务 this.addSeckillStartTask(seckillVO); return result; diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java index e4ecc423..454d1d14 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java @@ -67,10 +67,8 @@ public class SeckillManagerController { @ApiOperation(value = "分页查询秒杀活动列表") @GetMapping - public ResultMessage> getAll(SeckillSearchParams param, PageVO pageVo) { - pageVo.setNotConvert(true); - IPage page = seckillService.getSeckillByPageFromMongo(param, pageVo); - return ResultUtil.data(page); + public ResultMessage> getAll(SeckillSearchParams param, PageVO pageVo) { + return ResultUtil.data(seckillService.getSeckillByPageFromMysql(param, pageVo)); } @ApiOperation(value = "删除一个秒杀活动") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java index 534765f0..916e3956 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java @@ -46,7 +46,7 @@ public class SettingManagerController { "WECHAT_PC_CONNECT,WECHAT_WAP_CONNECT,WECHAT_APP_CONNECT,WECHAT_MP_CONNECT," + "QQ_WEB_CONNECT,QQ_APP_CONNECT," + "QQ_WEB_CONNECT,QQ_APP_CONNECT,WEIBO_CONNECT,ALIPAY_CONNECT," + - "PAYMENT_SUPPORT,ALIPAY_PAYMENT,WECHAT_PAYMENT") + "PAYMENT_SUPPORT,ALIPAY_PAYMENT,WECHAT_PAYMENT,SECKILL_SETTING") public ResultMessage saveConfig(@PathVariable String key, @RequestBody String configValue) { SettingEnum settingEnum = SettingEnum.valueOf(key); //获取系统配置 @@ -92,7 +92,7 @@ public class SettingManagerController { "WECHAT_PC_CONNECT,WECHAT_WAP_CONNECT,WECHAT_APP_CONNECT,WECHAT_MP_CONNECT," + "QQ_WEB_CONNECT,QQ_APP_CONNECT," + "QQ_WEB_CONNECT,QQ_APP_CONNECT,WEIBO_CONNECT,ALIPAY_CONNECT," + - "PAYMENT_SUPPORT,ALIPAY_PAYMENT,WECHAT_PAYMENT" + "PAYMENT_SUPPORT,ALIPAY_PAYMENT,WECHAT_PAYMENT,SECKILL_SETTING" ) public ResultMessage settingGet(@PathVariable String key) { return createSetting(key); diff --git a/manager-api/src/main/resources/manager.xml b/manager-api/src/main/resources/manager.xml index 46c868ce..46dec7c7 100644 --- a/manager-api/src/main/resources/manager.xml +++ b/manager-api/src/main/resources/manager.xml @@ -6,7 +6,7 @@ - + ${APP_NAME} diff --git a/seller-api/src/main/resources/logback.xml b/seller-api/src/main/resources/logback.xml index 28ed75c2..ce08fb6f 100644 --- a/seller-api/src/main/resources/logback.xml +++ b/seller-api/src/main/resources/logback.xml @@ -6,7 +6,7 @@ - + ${APP_NAME}