caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加秒杀活动设置

Browse Source
This commit is contained in:
lifenlong 2021-06-02 17:30:32 +08:00
parent b2d149c714
commit 07b9e413d6
8 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buyer-api/src/main/resources/logback.xml
View File

@ -6,7 +6,7 @@
<!--应用名称--> <!--应用名称-->
<property name="APP_NAME" value="buyer-api"/> <property name="APP_NAME" value="buyer-api"/>
<!--日志文件保存路径--> <!--日志文件保存路径-->
<property name="LOG_FILE_PATH" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/logs}"/> <property name="LOG_FILE_PATH" value="lili-logs"/>
<contextName>${APP_NAME}</contextName> <contextName>${APP_NAME}</contextName>
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">

2
common-api/src/main/resources/logback.xml
View File

@ -6,7 +6,7 @@
<!--应用名称--> <!--应用名称-->
<property name="APP_NAME" value="common-api"/> <property name="APP_NAME" value="common-api"/>
<!--日志文件保存路径--> <!--日志文件保存路径-->
<property name="LOG_FILE_PATH" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/logs}"/> <property name="LOG_FILE_PATH" value="lili-logs"/>
<contextName>${APP_NAME}</contextName> <contextName>${APP_NAME}</contextName>
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">

4
consumer/src/main/resources/logback.xml
View File

@ -6,7 +6,7 @@
<!--应用名称--> <!--应用名称-->
<property name="APP_NAME" value="consumer"/> <property name="APP_NAME" value="consumer"/>
<!--日志文件保存路径--> <!--日志文件保存路径-->
<property name="LOG_FILE_PATH" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/logs}"/> <property name="LOG_FILE_PATH" value="lili-logs"/>
<contextName>${APP_NAME}</contextName> <contextName>${APP_NAME}</contextName>
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@ -22,7 +22,7 @@
<!--输出到elk的LOGSTASH--> <!--输出到elk的LOGSTASH-->
<appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender"> <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<!-- 配置elk日志收集 配饰的是 LOGSTASH 的地址--> <!-- 配置elk日志收集 配饰的是 LOGSTASH 的地址-->
<destination>127.0.0.1:4560</destination> <destination>192.168.0.116:4560</destination>
<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"> <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
<providers> <providers>
<timestamp> <timestamp>

2
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
View File

@ -110,7 +110,7 @@ public class SeckillServiceImpl extends ServiceImpl<SeckillMapper, Seckill> impl
// 保存到MYSQL中 // 保存到MYSQL中
boolean result = this.save(seckill); boolean result = this.save(seckill);
// 保存到MONGO中 // 保存到MONGO中
this.mongoTemplate.save(seckill); this.mongoTemplate.save(seckillVO);
//添加秒杀延时任务 //添加秒杀延时任务
this.addSeckillStartTask(seckillVO); this.addSeckillStartTask(seckillVO);
return result; return result;

6
manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java
View File

@ -67,10 +67,8 @@ public class SeckillManagerController {
@ApiOperation(value = "分页查询秒杀活动列表") @ApiOperation(value = "分页查询秒杀活动列表")
@GetMapping @GetMapping
public ResultMessage<IPage<SeckillVO>> getAll(SeckillSearchParams param, PageVO pageVo) { public ResultMessage<IPage<Seckill>> getAll(SeckillSearchParams param, PageVO pageVo) {
pageVo.setNotConvert(true); return ResultUtil.data(seckillService.getSeckillByPageFromMysql(param, pageVo));
IPage<SeckillVO> page = seckillService.getSeckillByPageFromMongo(param, pageVo);
return ResultUtil.data(page);
} }
@ApiOperation(value = "删除一个秒杀活动") @ApiOperation(value = "删除一个秒杀活动")

4
manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java
View File

@ -46,7 +46,7 @@ public class SettingManagerController {
"WECHAT_PC_CONNECT,WECHAT_WAP_CONNECT,WECHAT_APP_CONNECT,WECHAT_MP_CONNECT," + "WECHAT_PC_CONNECT,WECHAT_WAP_CONNECT,WECHAT_APP_CONNECT,WECHAT_MP_CONNECT," +
"QQ_WEB_CONNECT,QQ_APP_CONNECT," + "QQ_WEB_CONNECT,QQ_APP_CONNECT," +
"QQ_WEB_CONNECT,QQ_APP_CONNECT,WEIBO_CONNECT,ALIPAY_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) { public ResultMessage saveConfig(@PathVariable String key, @RequestBody String configValue) {
SettingEnum settingEnum = SettingEnum.valueOf(key); SettingEnum settingEnum = SettingEnum.valueOf(key);
//获取系统配置 //获取系统配置
@ -92,7 +92,7 @@ public class SettingManagerController {
"WECHAT_PC_CONNECT,WECHAT_WAP_CONNECT,WECHAT_APP_CONNECT,WECHAT_MP_CONNECT," + "WECHAT_PC_CONNECT,WECHAT_WAP_CONNECT,WECHAT_APP_CONNECT,WECHAT_MP_CONNECT," +
"QQ_WEB_CONNECT,QQ_APP_CONNECT," + "QQ_WEB_CONNECT,QQ_APP_CONNECT," +
"QQ_WEB_CONNECT,QQ_APP_CONNECT,WEIBO_CONNECT,ALIPAY_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) { public ResultMessage settingGet(@PathVariable String key) {
return createSetting(key); return createSetting(key);

2
manager-api/src/main/resources/manager.xml
View File

@ -6,7 +6,7 @@
<!--应用名称--> <!--应用名称-->
<property name="APP_NAME" value="common-api"/> <property name="APP_NAME" value="common-api"/>
<!--日志文件保存路径--> <!--日志文件保存路径-->
<property name="LOG_FILE_PATH" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/logs}"/> <property name="LOG_FILE_PATH" value="lili-logs"/>
<contextName>${APP_NAME}</contextName> <contextName>${APP_NAME}</contextName>
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">

2
seller-api/src/main/resources/logback.xml
View File

@ -6,7 +6,7 @@
<!--应用名称--> <!--应用名称-->
<property name="APP_NAME" value="seller-api"/> <property name="APP_NAME" value="seller-api"/>
<!--日志文件保存路径--> <!--日志文件保存路径-->
<property name="LOG_FILE_PATH" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/logs}"/> <property name="LOG_FILE_PATH" value="lili-logs"/>
<contextName>${APP_NAME}</contextName> <contextName>${APP_NAME}</contextName>
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">