parent: 777d32df | patch | commit | ignore whitespace
xiaoyong931011
2022-09-24 48bb23486bc018d13014d8acde4fb51ec3a78a36 
Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy
1 files added
8 files modified
133 ■■■■■ changed files
pom.xml 12 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/quartz/WxxcxJob.java 2 ●●●●● patch | view | raw | blame | history
src/main/resources/application-dev.yml 3 ●●●●● patch | view | raw | blame | history
src/main/resources/application-job.yml 80 ●●●●● patch | view | raw | blame | history
src/main/resources/application-prod.yml 19 ●●●●● patch | view | raw | blame | history
src/main/resources/application-test.yml 11 ●●●●● patch | view | raw | blame | history 
 pom.xml


@@ -59,6 +59,18 @@


        <dependency>


            <groupId>org.springframework.boot</groupId>


            <artifactId>spring-boot-starter-web</artifactId>


            <!-- 移除掉默认支持的 Tomcat -->


            <exclusions>


                <exclusion>


                    <groupId>org.springframework.boot</groupId>


                    <artifactId>spring-boot-starter-tomcat</artifactId>


                </exclusion>


            </exclusions>


        </dependency>


        <!-- 添加 Undertow 容器 -->


        <dependency>


            <groupId>org.springframework.boot</groupId>


            <artifactId>spring-boot-starter-undertow</artifactId>


        </dependency>


        <dependency>


            <groupId>org.springframework.boot</groupId>




 src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java


@@ -12,6 +12,7 @@


import cn.hutool.core.date.DateUtil;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;


import org.springframework.scheduling.annotation.Scheduled;


import org.springframework.stereotype.Component;




@@ -24,6 +25,7 @@


 **/


@Slf4j


@Component


@ConditionalOnProperty(prefix = "system", name = "job", havingValue = "true")


public class OrderOvertimeJob {




    @Autowired




 src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java


@@ -17,6 +17,7 @@


import cn.hutool.core.util.ObjectUtil;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;


import org.springframework.scheduling.annotation.Scheduled;


import org.springframework.stereotype.Component;




@@ -32,6 +33,7 @@


 **/


@Slf4j


@Component


@ConditionalOnProperty(prefix = "system", name = "job", havingValue = "true")


public class OrderSettlementJob {




    @Autowired




 src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java


@@ -17,6 +17,7 @@


import cn.hutool.core.util.StrUtil;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;


import org.springframework.scheduling.annotation.Scheduled;


import org.springframework.stereotype.Component;


import org.springframework.transaction.annotation.Transactional;


@@ -32,6 +33,7 @@


 **/


@Slf4j


@Component


@ConditionalOnProperty(prefix = "system", name = "job", havingValue = "true")


public class ProfitJob {




    @Autowired




 src/main/java/cc/mrbird/febs/mall/quartz/WxxcxJob.java


@@ -11,6 +11,7 @@


import com.baomidou.mybatisplus.extension.exceptions.ApiException;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;


import org.springframework.scheduling.annotation.Scheduled;


import org.springframework.stereotype.Component;


import org.springframework.web.client.RestTemplate;


@@ -22,6 +23,7 @@




@Slf4j


@Component


@ConditionalOnProperty(prefix = "system", name = "job", havingValue = "true")


public class WxxcxJob {




    private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);




 src/main/resources/application-dev.yml


@@ -79,3 +79,6 @@


  wecharpaySecret: YYSC13875978057YYSC13875978057SH


  gaodeKey: 95ede7157929f5f6b6c758971be924b1


  serviceName: yiyuanshucai




system:


  job: false




 src/main/resources/application-job.yml


New file


@@ -0,0 +1,80 @@


spring:


  datasource:


    dynamic:


      # 是否开启 SQL日志输出，生产环境建议关闭，有性能损耗


      p6spy: true


      hikari:


        connection-timeout: 30000


        max-lifetime: 1800000


        max-pool-size: 15


        min-idle: 5


        connection-test-query: select 1


        pool-name: FebsHikariCP


      # 配置默认数据源


      primary: base


      datasource:


        # 数据源-1，名称为 base


        base:


          #          username: db_mall


          #          password: mall!@#123


          #          driver-class-name: com.mysql.cj.jdbc.Driver


          #          url: jdbc:mysql://127.0.0.1:3306/db_pingtuan?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8


          username: db_yyg


          password: yyg123!@#


          driver-class-name: com.mysql.cj.jdbc.Driver


          url: jdbc:mysql://127.0.0.1:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8




  redis:


    # Redis数据库索引（默认为 0）


    database: 0


    # Redis服务器地址


    host: 127.0.0.1


    # Redis服务器连接端口


    port: 6379


    # Redis 密码


    password: d32ncxe@i3#!dV


    lettuce:


      pool:


        # 连接池中的最小空闲连接


        min-idle: 8


        # 连接池中的最大空闲连接


        max-idle: 500


        # 连接池最大连接数（使用负值表示没有限制）


        max-active: 2000


        # 连接池最大阻塞等待时间（使用负值表示没有限制）


        max-wait: 10000


    # 连接超时时间（毫秒）


    timeout: 5000


  rabbitmq:


    host: 127.0.0.1


    port: 5672


    username: hibit


    password: hibit123


    publisher-confirm-type: correlated




pay:


  ali:


    appId: 2016120704000539


    # 支付宝公钥


    publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAobfti31eIy4U59JUrL+eMosuY97jk444eFyMeoxkG1ljJ3GytPV7YlLL6TVgvON6eR0eFvWKK4MoTEW0TkpxgmuurkpTSXDB0bNiuYJQyiju4Bikt83dQo64YKYDSwBNA9hFPHFM1mhWpJM/3mYjbbLT9AoL8q+n1fBxFtcAMmxXBqZiECT8qzuTV3VfTufXsNhY9LJXcDkAr98GZDEbH+Zhr5die2Rzpvj9o8aSs6J0IU+PJpU+SPZEjpITAPtLauKEV2MFGUaxnli1PgJexW8OW9smCDZPhIce6vYYwn0wQKtnFla0zWPe2r85egggE0y9SJs5zQX5F3OlJzLS/wIDAQAB


    # 支付宝私钥


    privateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCht+2LfV4jLhTn0lSsv54yiy5j3uOTjjh4XIx6jGQbWWMncbK09XtiUsvpNWC843p5HR4W9YorgyhMRbROSnGCa66uSlNJcMHRs2K5glDKKO7gGKS3zd1CjrhgpgNLAE0D2EU8cUzWaFakkz/eZiNtstP0Cgvyr6fV8HEW1wAybFcGpmIQJPyrO5NXdV9O59ew2Fj0sldwOQCv3wZkMRsf5mGvl2J7ZHOm+P2jxpKzonQhT48mlT5I9kSOkhMA+0tq4oRXYwUZRrGeWLU+Al7Fbw5b2yYINk+Ehx7q9hjCfTBAq2cWVrTNY97avzl6CCATTL1ImznNBfkXc6UnMtL/AgMBAAECggEAXLwJBr0sV0YcjNcK4Ui8YcV4I6Lzo3ChpzuC/t80pI48kqjbTnOafkZ2UdPfFlHnsD3nPEkvI0aBvEMYYvDDaINxVtaeLfXv3t1cFn7I7zRLzsuy4Qe3AmyvBBUOvFp+z16cTU23Pxfz30nlDRZK6KPscPu14EOkHcVUREGkBkU6Gqft38Vd21ClRmh76oWsYCGzJkx547blVMAWJw+fGgHerrdwaSOlvD8Tj20dnCU7ifvUNQiWsdn6wOdUz24o4oB8kSBmZbOYCviljvqeHo2SZlIuneiXwz9TanOvlIaGkVeHnJvNd3S6FRXTmcTZQpW9RtDBZF0o1Oh+W44Q6QKBgQDbVwsD3GdFFlYWUMvtTGUcHqtzrvWDln6Lh0vtEmQIA28aDBre2URRYm+AhqfsjiAz1WwVVVeBjbSk7ZJv0kWWvJiA8/2XyZhHdDidWvhndQJD5HLK9IqPNDd6WA9cW/SQs2ehtqUVM55IzsYZK2Tbnb9UYuIHTHiMExL/jOGq0wKBgQC8v2rPC02+qVJyx82Gq6CD57EuirKTA1ZUFQIBRbfccqMoYaJogREUjlUNN5mZAuQ6yLqOHi79v6G/7NegP4WavIRJ/W9jqjLXP1AJ/jeo9IGu96HCsV2+M/5DRD/zrZakQMJPZYrgZOqjtL1qLcKdpuXumT0VAyy41yoU0jvDpQKBgQCvyABR5c71dUMkuzfTQ0g80u+A1JR6Ep/z3kghBH4aVfYyH8VhFypDNuo5TLFDSVvRbpciObTZZOGC08ppx1Bxz09A+Ukg3jUl/qRop0EwWHuqQWkl8fkhby2O5Qfacu97D+xbk26VoTqXCu+DuF0qDDALxvtx8f0h9R9iolswdQKBgE5+sLWwNsHe+vnfHBswjw2sMmRvq/o1vhYzsmTDEMauKipmCDu7yVWqJ7bac5dNu4qy5dqqtNI0etktbzMml7KVSdLXghaJtqELpIazYYRzQud39p7YUmsChnCFFq+JdoeSovyP9ySA84/nX4qjwzb7LM6AjgWKD3RDjy2fjNk9AoGBANEJdXJhwon+cMfPT9XfCVee0Cr//91WzfGYnVpevRuYp/q29rcZ0mZiXPfvge0vogZEFHIzsQfjtW84W4H81aSbFj9lncIzRl4O8yFGsr1Y9wkewmQqylM+A/I4eu9UcpK/hJX5G07EnCuZCabj12CGnA3uA9Icgg28jbg2BCR6


    # 回调地址


    noticeUrl: http://120.27.238.55:8801/api/pay/aliCallBack


    domain: https://openapi.alipay.com/gateway.do




xcx:


  wechar_login_url: https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code


  xcx_appid: wx0b515f652282158e


  xcx_secret: 8d3d3c14221f7dc37650b861dc0fc570


  debug: false


  wecharPaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/wxpayCallback


  wecharRechargePaynotifyUrl: http://groupbuy.csxuncong.com/api/xcxPay/rechargeCallBack


  certLocalPath: /home/yyscCert/apiclient_cert.p12


  wecharpayMchid: 1631084809


  wecharpaySecret: YYSC13875978057YYSC13875978057SH


  gaodeKey: 95ede7157929f5f6b6c758971be924b1


  serviceName: yiyuanshucai




system:


  job: true




 src/main/resources/application-prod.yml


@@ -15,14 +15,14 @@


      datasource:


        # 数据源-1，名称为 base


        base:


#          username: db_mall


#          password: mall!@#123


#          driver-class-name: com.mysql.cj.jdbc.Driver


#          url: jdbc:mysql://127.0.0.1:3306/db_pingtuan?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8


          #          username: db_mall


          #          password: mall!@#123


          #          driver-class-name: com.mysql.cj.jdbc.Driver


          #          url: jdbc:mysql://127.0.0.1:3306/db_pingtuan?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8


          username: db_yyg


          password: yyg123!@#


          driver-class-name: com.mysql.cj.jdbc.Driver


          url: jdbc:mysql://121.37.162.173:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8


          url: jdbc:mysql://127.0.0.1:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8




  redis:


    # Redis数据库索引（默认为 0）


@@ -32,7 +32,7 @@


    # Redis服务器连接端口


    port: 6379


    # Redis 密码


    password: zhongji-mall=-0


    password: d32ncxe@i3#!dV


    lettuce:


      pool:


        # 连接池中的最小空闲连接


@@ -48,8 +48,8 @@


  rabbitmq:


    host: 127.0.0.1


    port: 5672


    username: zj_mall


    password: zj_mall123


    username: hibit


    password: hibit123


    publisher-confirm-type: correlated




pay:


@@ -75,3 +75,6 @@


  wecharpaySecret: YYSC13875978057YYSC13875978057SH


  gaodeKey: 95ede7157929f5f6b6c758971be924b1


  serviceName: yiyuanshucai




system:


  job: false




 src/main/resources/application-test.yml


@@ -15,10 +15,10 @@


      datasource:


        # 数据源-1，名称为 base


        base:


#          username: ct_test


#          password: 123456


#          driver-class-name: com.mysql.cj.jdbc.Driver


#          url: jdbc:mysql://120.27.238.55:3306/db_pingtuan?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8


          #          username: ct_test


          #          password: 123456


          #          driver-class-name: com.mysql.cj.jdbc.Driver


          #          url: jdbc:mysql://120.27.238.55:3306/db_pingtuan?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8


          username: db_yyg


          password: yyg123!@#


          driver-class-name: com.mysql.cj.jdbc.Driver


@@ -84,3 +84,6 @@


  wecharpaySecret: YYSC13875978057YYSC13875978057SH


  gaodeKey: 95ede7157929f5f6b6c758971be924b1


  serviceName: yiyuanshucai




system:


  job: false