Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/resources/bootstrap-prd.properties

@@ -76,9 +76,9 @@ gree.url.token=
 allIn.payment.notifyUrl=${sys.url}${server.servlet.context-path}/pay/allinpay/callback
 
 #内部接口
-inf.url=http://121.43.111.127:11111
-inf.token.appid=zfire-jsm-sxb
-inf.token.appSecret=3e7iee31ub94rvvesp7266kwske7fple
+inf.url=https://gjmall.zfire.top/interface
+inf.token.appid=material
+inf.token.appSecret=kaksladjaklsdjlasjdlasjdlaskijwsmk
 
 #分销商城appid
 share.mall.appid=wx21d155e8a449d9b1

mall-server-api/src/main/java/com/gree/mall/manager/schedule/InsureEmailSchedule.java

@@ -5,7 +5,6 @@ package com.gree.mall.manager.schedule;
 import com.gree.mall.manager.logic.policy.AgreementLogic;
 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 javax.mail.MessagingException;
@@ -25,21 +24,21 @@ public class InsureEmailSchedule {
 
 
     //每小时执行1次
-    @Scheduled(fixedDelay = 60*60* 1000)
+//    @Scheduled(fixedDelay = 60*60* 1000)
     public void task() throws IOException {
         agreementLogic.sendEmailSche();
     }
 
 
     //监测今天是否有回执邮件，如果有则表示今天买保险的回执成功
-    @Scheduled(fixedDelay = 60* 1000)
+//    @Scheduled(fixedDelay = 60* 1000)
     public void task2() throws IOException, MessagingException {
         agreementLogic.receEmail();
     }
 
 
     //保险过期
-    @Scheduled(fixedDelay = 60*60* 1000)
+//    @Scheduled(fixedDelay = 60*60* 1000)
     public void task3(){
         agreementLogic.offInsure();
     }

mall-server-api/src/main/resources/bootstrap-prd.properties

@@ -1,8 +1,8 @@
 sys.url=https://fw.greeapps.com
 #֧���ص���ַ
-wechat.payment.notifyUrl=${sys.url}/zfminiapp/pay/payCall
+wechat.payment.notifyUrl=${sys.url}/zfdminiapp/pay/payCall
 #�˿�ص���ַ
-wechat.payment.refundNotifyUrl=${sys.url}/zfminiapp/pay/refundCall
+wechat.payment.refundNotifyUrl=${sys.url}/zfdminiapp/pay/refundCall
 #�����ص�
 express.callback=${sys.url}/${server.servlet.context-path}/common/express/callback
 
@@ -19,10 +19,10 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.url=jdbc:mysql://rm-bp1gsex17k87vu0np.mysql.rds.aliyuncs.com:3306/sxb-mall?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai
 
 #����
-spring.datasource.url=jdbc:mysql://rm-wz9yahzr80gze34ab35930.mysql.rds.aliyuncs.com:3306/gf2024?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://121.43.111.127:3306/zfire-dept-mall?verifyServerCertificate=false&useSSL=false&requireSSL=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=utf8&serverTimezone=Asia/Shanghai
 
-spring.datasource.username=gFgreeJsm_gd2024_system
-spring.datasource.password=Jsm_Gf_2024@)@$_)(*&
+spring.datasource.username=root
+spring.datasource.password=xch!eCdvc124@
 spring.datasource.druid.connection-init-sqls=set names utf8mb4
 spring.datasource.druid.initial-size=5
 spring.datasource.druid.minIdle=5
@@ -76,6 +76,14 @@ wechat.mp.url=https://fw.greeapps.com/
 #通联支付回调地址
 allIn.payment.notifyUrl=${sys.url}/zfdminiapp/pay/allinpay/callback
 
+#内部接口
+inf.url=https://gjmall.zfire.top/interface
+inf.token.appid=material
+inf.token.appSecret=kaksladjaklsdjlasjdlasjdlaskijwsmk
+
+#分销商城appid
+share.mall.appid=wx21d155e8a449d9b1
+
 #cmc bank request setting
 cmc.bank.url=https://cdc.cmbchina.com/cdcserver/api/v2
 
@@ -103,12 +111,14 @@ fadada.app.host=https://testapi04.fadada.com/api/
 fadada.company.auth.page-modify=1
 fadada.company.auth.verified-way=3
 fadada.company.auth.return.url=
-fadada.company.auth.notify.url=${jiasm.system.url}/fdd/notify/company/ca/auth
-fadada.company.auth.auto.notify.url=${jiasm.system.url}/fdd/notify/company/ca/auth/auto
+fadada.company.auth.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/company/ca/auth
+fadada.company.auth.auto.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/company/ca/auth/auto
 fadada.company.sign.return.url=
-fadada.company.sign.notify.url=${jiasm.system.url}/fdd/notify/company/ca/sign
+fadada.company.sign.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/company/ca/sign
 fadada.websit.auth.page-modify=1
 fadada.websit.auth.verified-way=3
-fadada.websit.auth.notify.url=${jiasm.system.url}/fdd/notify/websit/auth
-fadada.websit.sign.notify.url=${jiasm.system.url}/fdd/notify/websit/batch/sign
-fadada.websit.person.auth.notify.url=${jiasm.system.url}/fdd/notify/websit/person
+fadada.websit.auth.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/websit/auth
+fadada.websit.sign.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/websit/batch/sign
+fadada.websit.person.auth.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/websit/person
+
+gree.url=https://api.sms-test.gree.com/api/sso/sms-server-order-external

mall-server-api/src/main/resources/logback.xml

@@ -49,13 +49,13 @@
 
 
     <!--日志归集-->
-<!--        <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">-->
-<!--            <destination>116.62.158.92:5044</destination>-->
-<!--            &lt;!&ndash; encoder必须配置,有多种可选 &ndash;&gt;-->
-<!--            <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >-->
-<!--                <customFields>{"server_name":"jsm-mall-manager-service"}</customFields>-->
-<!--            </encoder>-->
-<!--        </appender>-->
+        <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+            <destination>116.62.158.92:5044</destination>
+            <!-- encoder必须配置,有多种可选 -->
+            <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >
+                <customFields>{"server_name":"zfire-jsm-home"}</customFields>
+            </encoder>
+        </appender>
 
 
     <logger name="com.ibatis" level="INFO" />