diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java index 793382552..f0e677193 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java @@ -125,13 +125,22 @@ public void execute() { } + /** + * 获取促销修改查询条件 修改活动状态 + * @param ids + * @return + */ private UpdateWrapper getUpdatePromotionWrapper(List ids) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.in("id", ids); updateWrapper.set("promotion_status", PromotionStatusEnum.END.name()); return updateWrapper; } - + /** + * 获取商品的促销修改查询条件 修改商品状态 + * @param ids + * @return + */ private UpdateWrapper getUpdatePromotionGoodsWrapper(List ids) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.in("promotion_id", ids); diff --git a/pom.xml b/pom.xml index b957fccf8..038c1a819 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,6 @@ buyer-api manager-api seller-api - socket-api common-api consumer diff --git a/socket-api/pom.xml b/socket-api/pom.xml deleted file mode 100644 index f798e24c8..000000000 --- a/socket-api/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - socket-api - - cn.lili - lili-shop-parent - 1.0.1 - - - - - cn.lili - framework - 1.0.1 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - \ No newline at end of file diff --git a/socket-api/src/main/java/cn/lili/SocketApiApplication.java b/socket-api/src/main/java/cn/lili/SocketApiApplication.java deleted file mode 100644 index 947991d72..000000000 --- a/socket-api/src/main/java/cn/lili/SocketApiApplication.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.lili; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; - -/** - * @author Chopper - */ -@SpringBootApplication -public class SocketApiApplication extends WebMvcConfigurerAdapter { - - - public static void main(String[] args) { - - System.setProperty("es.set.netty.runtime.available.processors", "false"); - SpringApplication.run(SocketApiApplication.class, args); - } - - @Override - public void addCorsMappings(CorsRegistry registry) { - - registry.addMapping("/**") - .allowCredentials(true) - .allowedHeaders("*") //允许任何头 - .allowedOrigins("*") //允许任何域名 - .allowedMethods("*"); //允许任何方法 - } - - -} diff --git a/socket-api/src/main/java/cn/lili/scocket/listener/MessageSendListener.java b/socket-api/src/main/java/cn/lili/scocket/listener/MessageSendListener.java deleted file mode 100644 index 8e26701a4..000000000 --- a/socket-api/src/main/java/cn/lili/scocket/listener/MessageSendListener.java +++ /dev/null @@ -1,67 +0,0 @@ -package cn.lili.scocket.listener; - -import cn.hutool.json.JSONUtil; -import cn.lili.common.rocketmq.tags.OtherTagsEnum; -import cn.lili.common.utils.BeanUtil; -import cn.lili.modules.message.entity.dos.Message; -import cn.lili.modules.message.entity.enums.MessageShowType; -import cn.lili.modules.message.entity.vos.MessageShowVO; -import cn.lili.modules.message.mapper.StoreMessageMapper; -import lombok.extern.slf4j.Slf4j; -import org.apache.rocketmq.common.message.MessageExt; -import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; -import org.apache.rocketmq.spring.core.RocketMQListener; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.simp.SimpMessagingTemplate; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.CrossOrigin; - -/** - * @author paulG - * @since 2020/12/9 - **/ -@Component -@CrossOrigin -@Slf4j -@RocketMQMessageListener(topic = "${lili.data.rocketmq.other-topic}", consumerGroup = "${lili.data.rocketmq.other-group}") -public class MessageSendListener implements RocketMQListener { - - - - @Autowired - private SimpMessagingTemplate simpMessagingTemplate; - - @Override - public void onMessage(MessageExt messageExt) { - log.info(messageExt.getTags()); - switch (OtherTagsEnum.valueOf(messageExt.getTags())) { - //站内消息提醒 - case MESSAGE: - System.out.println("消息提醒"); - sendNoticeMessage(messageExt); - break; - default: - break; - } - } - - /** - * 给商家发送站内信息 - * - * @param messageExt - */ - private void sendNoticeMessage(MessageExt messageExt) { - MessageShowVO messageVO = new MessageShowVO(); - Message message = JSONUtil.toBean(new String(messageExt.getBody()), Message.class); - //构建vo - BeanUtil.copyProperties(message, messageVO); - messageVO.setType(MessageShowType.NOTICE.name()); - if (message.getMessageRange().equals("ALL")) { - simpMessagingTemplate.convertAndSend("/topic/subscribe", messageVO); - } else { - for (String id : message.getUserIds()) { - simpMessagingTemplate.convertAndSendToUser("SHOP_" + id, "/queue/subscribe", messageVO); - } - } - } -} diff --git a/socket-api/src/main/java/cn/lili/scocket/listener/ScoketSecurityConfig.java b/socket-api/src/main/java/cn/lili/scocket/listener/ScoketSecurityConfig.java deleted file mode 100644 index 85eb85582..000000000 --- a/socket-api/src/main/java/cn/lili/scocket/listener/ScoketSecurityConfig.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.lili.scocket.listener; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer; - -/** - * spring Security 核心配置类 Store安全配置中心 - * - * @author Chopper - * @version v4.0 - * @Description: - * @since 2020/11/14 16:20 - */ -@Slf4j -@Configuration -@EnableGlobalMethodSecurity(prePostEnabled = true) - -public class ScoketSecurityConfig extends WebSecurityConfigurerAdapter { - - - @Override - protected void configure(HttpSecurity http) throws Exception { - - ExpressionUrlAuthorizationConfigurer.ExpressionInterceptUrlRegistry registry = http - .authorizeRequests(); - registry.antMatchers("**").permitAll(); - } - -} diff --git a/socket-api/src/main/resources/application.yml b/socket-api/src/main/resources/application.yml deleted file mode 100644 index c10a84e8a..000000000 --- a/socket-api/src/main/resources/application.yml +++ /dev/null @@ -1,298 +0,0 @@ -server: - port: 8885 - servlet: - context-path: / - - # 正式部署时候，解开此处配置，防止文件夹被清除导致的文件上传失败问题 - # multipart: - # location: /Users/lifenlong/Desktop/ceshi - tomcat: - uri-encoding: UTF-8 - threads: - min-spare: 50 - max: 1000 - -# 与Spring Boot 2一样，默认情况下，大多数端点都不通过http公开，我们公开了所有端点。对于生产，您应该仔细选择要公开的端点。 -management: - # health: - # elasticsearch: - # enabled: false - # datasource: - # enabled: false - endpoints: - web: - exposure: - include: '*' -spring: - # 要在其中注册的Spring Boot Admin Server的URL。 - boot: - admin: - client: - url: http://127.0.0.1:8000 - # mongodb - data: - mongodb: - host: 127.0.0.1 - port: 27017 - database: lilishop - username: root - password: lilishop - authentication-database: admin - # replica-set-name: mongoreplset - cache: - type: redis - - jpa: - # 自动生成表结构 - generate-ddl: true - open-in-view: false - # Redis - redis: - host: 127.0.0.1 - port: 6379 - password: lilishop - lettuce: - pool: - # 连接池最大连接数（使用负值表示没有限制） 默认 8 - max-active: 200 - # 连接池最大阻塞等待时间（使用负值表示没有限制） 默认 -1 - max-wait: 20 - # 连接池中的最大空闲连接 默认 8 - max-idle: 10 - # 连接池中的最小空闲连接 默认 8 - min-idle: 8 - # 文件大小上传配置 - servlet: - multipart: - max-file-size: 20MB - max-request-size: 20MB - jackson: - time-zone: GMT+8 - serialization: - #关闭jackson 对json做解析 - fail-on-empty-beans: false - - shardingsphere: - datasource: - # 数据库名称，可自定义，可以为多个，以逗号隔开，每个在这里定义的库，都要在下面定义连接属性 - names: default-datasource - default-datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - username: root - password: lilishop - maxActive: 20 - initialSize: 5 - maxWait: 60000 - minIdle: 5 - timeBetweenEvictionRunsMillis: 60000 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #是否缓存preparedStatement，也就是PSCache。在mysql下建议关闭。 PSCache对支持游标的数据库性能提升巨大，比如说oracle。 - poolPreparedStatements: false - #要启用PSCache，-1为关闭 必须配置大于0，当大于0时，poolPreparedStatements自动触发修改为true 可以把这个数值配置大一些，比如说100 - maxOpenPreparedStatements: -1 - #配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 - filters: stat,wall,log4j2 - #通过connectProperties属性来打开mergeSql功能；慢SQL记录 - connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - loginUsername: druid - loginPassword: druid - # sharding: - # default-data-source-name: default-datasource - # #需要拆分的表，可以设置多个 在 li_order 级别即可 - # tables: - # #需要进行分表的逻辑表名 - # li_order: - # #实际的表结点,下面代表的是li_order_为开头的所有表，如果能确定表的范围例如按月份分表，这里的写法是data2020.li_order_$->{2020..2021}_$->{01..12} 表示例如 li_order_2020_01 li_order_2020_03 li_order_2021_01 - # actual-data-nodes: data2020.li_order_$->{2019..2021}_$->{01..12} - # table-strategy: - # # 分表策略，根据创建日期 - # standard: - # sharding-column: create_time - # #分表策略 - # precise-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm - # #范围查询实现 - # range-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm - props: - #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭 - sql: - show: true - -# 忽略鉴权url -ignored: - urls: - - /editor-app/** - - /actuator** - - /actuator/** - - /MP_verify_qSyvBPhDsPdxvOhC.txt - - /weixin/** - - /source/** - - /buyer/mini-program/** - - /buyer/cashier/** - - /buyer/pageData/** - - /buyer/article/** - - /buyer/goods/** - - /buyer/category/** - - /buyer/shop/** - - /buyer/connect/** - - /buyer/members/smsLogin - - /buyer/members/refresh/* - - /buyer/members/refresh** - - /buyer/promotion/pintuan - - /buyer/promotion/seckill - - /buyer/memberEvaluation/**/goodsEvaluation - - /buyer/memberEvaluation/**/evaluationNumber - - /store/login/** - - /manager/user/login - - /manager/user/refresh/** - - /druid/** - - /swagger-ui.html - - /doc.html - - /swagger-resources/** - - /swagger/** - - /**/**.js - - /**/**.png - - /**/**.css - - /webjars/** - - /v2/api-docs - - /configuration/ui - - /boot-admin - statics: - - /**/*.js - - /**/*.css - - /**/*.png - - /**/*.ico - -# Swagger界面内容配置 -swagger: - title: lili API接口文档 - description: lili Api Documentation - version: 1.0.0 - termsOfServiceUrl: https://pickmall.cn - contact: - name: lili - url: https://pickmall.cn - email: admin@pickmall.com - -# Mybatis-plus -mybatis-plus: - mapper-locations: classpath*:mapper/*.xml - configuration: - #缓存开启 - cache-enabled: true - #日志 -# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - -# 日志 -logging: - # 输出级别 - level: - cn.lili: info - # org.hibernate: debug - # org.springframework: debug - # org.springframework.data.mongodb.core: debug - file: - # 指定路径 - path: lili-logs - # 最大保存天数 - max-history: 7 - # 每个文件最大大小 - max-size: 5MB -#加密参数 -jasypt: - encryptor: - password: lili - -lili: - system: - isDemoSite: true - statistics: - # 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数 - onlineMember: 48 - # 当前在线人数刷新时间间隔，单位秒，设置为600，则每10分钟刷新一次 - currentOnlineUpdate: 600 - #qq lbs 申请 - lbs: - key: 4BYBZ-7MT6S-PUAOA-6BNWL-FJUD7-UUFXT - sk: zhNKVrJK6UPOhqIjn8AQvG37b9sz6 - #域名 - domain: - pc: http://127.0.0.1:8888 - wap: http://127.0.0.1:8888 - seller: http://127.0.0.1:8888 - admin: http://127.0.0.1:8888 - #api地址 - api: - buyer: https://z171l91606.51mypc.cn/ - base: http://127.0.0.1:8888 - manager: http://127.0.0.1:8888 - seller: http://127.0.0.1:8888 - - # jwt 细节设定 - jwt-setting: - # token过期时间（分钟） - tokenExpireTime: 60 - - # 使用Spring @Cacheable注解失效时间 - cache: - # 过期时间 单位秒 永久不过期设为-1 - timeout: 1500 - #多线程配置 - thread: - corePoolSize: 5 - maxPoolSize: 50 - queueCapacity: 50 - data: - elasticsearch: - cluster-name: elasticsearch - cluster-nodes: 127.0.0.1:9200 - index: - number-of-replicas: 0 - number-of-shards: 3 - index-prefix: lili - schema: http - # account: - # username: elastic - # password: LiLiShopES - - rocketmq: - promotion-topic: lili_promotion_topic - promotion-group: lili_promotion_group - msg-ext-topic: lili_msg_topic - msg-ext-group: lili_msg_group - goods-topic: lili_goods_topic - goods-group: lili_goods_group - order-topic: lili_order_topic - order-group: lili_order_group - member-topic: lili_member_topic - member-group: lili_member_group - other-topic: lili_other_topic - other-group: lili_other_group - notice-topic: lili_notice_topic - notice-group: lili_notice_group - notice-send-topic: lili_send_notice_topic - notice-send-group: lili_send_notice_group -rocketmq: - name-server: 127.0.0.1:9876 - producer: - group: lili_group - send-message-timeout: 30000 - -xxl: - job: - admin: - addresses: http://127.0.0.1:9001/xxl-job-admin - executor: - appname: xxl-job-executor-lilishop - address: - ip: - port: 8891 - logpath: ./xxl-job/executor - logretentiondays: 7 \ No newline at end of file