From d2e413f7fb56034de36df43a3851f53833719d4e Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 11 十二月 2023 14:22:27 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java | 2 +-
ycl-platform/src/main/resources/application-prod.yml | 8 ++++----
ycl-platform/src/main/resources/logback-spring.xml | 4 +---
ycl-platform/src/main/java/com/ycl/PlatformApplication.java | 1 -
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/PlatformApplication.java b/ycl-platform/src/main/java/com/ycl/PlatformApplication.java
index c59d124..b68325a 100644
--- a/ycl-platform/src/main/java/com/ycl/PlatformApplication.java
+++ b/ycl-platform/src/main/java/com/ycl/PlatformApplication.java
@@ -43,5 +43,4 @@
}
-
}
diff --git a/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java b/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java
index cfbd562..941f271 100644
--- a/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java
+++ b/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java
@@ -72,7 +72,7 @@
@Autowired
private UmsAdminRoleRelationService umsAdminRoleRelationService;
- //@Scheduled(cron = "0 50 14 * * ?")
+ //@Scheduled(cron = "0 0 00 * * ?")
@Transactional(rollbackFor = Exception.class)
public void run() {
log.info("寮�濮嬪悓姝ヤ换鍔�");
diff --git a/ycl-platform/src/main/resources/application-prod.yml b/ycl-platform/src/main/resources/application-prod.yml
index d4060ba..ce662ad 100644
--- a/ycl-platform/src/main/resources/application-prod.yml
+++ b/ycl-platform/src/main/resources/application-prod.yml
@@ -89,8 +89,8 @@
#涓撴湁閽夐拤鍙傛暟
zzding :
- app-key : SC_ZHZF-IC5g2YiRDW8tug1DfAfiui
- app-secret : 39RIHFOKd8fUeeW9T7CdBcwEqA6dMKx5d3686B6P
- domain-name : openplatform.dg-work.cn
+ app-key : sczhzfpt-81R3ErbU00G4VoXaEBruq
+ app-secret : 0GPY3aQDL3l38J7p6K37DV6BCXIOLzrynU71Br36
+ domain-name : openplatform-pro.ding.zj.gov.cn
protocal : https
- tenant-id : 50645661
\ No newline at end of file
+ tenant-id : 196729
\ No newline at end of file
diff --git a/ycl-platform/src/main/resources/logback-spring.xml b/ycl-platform/src/main/resources/logback-spring.xml
index 4331451..b1c2d12 100644
--- a/ycl-platform/src/main/resources/logback-spring.xml
+++ b/ycl-platform/src/main/resources/logback-spring.xml
@@ -108,7 +108,7 @@
</root>
</springProfile>
- <springProfile name="pro">
+ <springProfile name="prod">
<!--鎵撳嵃SQL-->
<logger name="java.sql.Connection" level="ERROR" />
<logger name="java.sql.Statement" level="ERROR" />
@@ -121,8 +121,6 @@
<appender-ref ref="Console" />
</root>
</springProfile>
-
-
</configuration>
\ No newline at end of file
--
Gitblit v1.8.0