Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2023-12-11 d2e413f7fb56034de36df43a3851f53833719d4e

Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

# Conflicts:
#	ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java

 ycl-platform/src/main/java/com/ycl/PlatformApplication.java

@@ -43,5 +43,4 @@


    }

}

 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("开始同步任务");

 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
  tenant-id : 196729

 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>