Merge remote-tracking branch 'origin/master'

Houjie

2025-07-11 bb6bb3e166385332f00e55d0d0e2daafc5dbc717

 lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml

@@ -253,10 +253,10 @@
      client-secret: ??
      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
    WECHAT_ENTERPRISE:
      client-id: ??
      client-secret: ??
      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
      agent-id: ??
      client-id: ww5999b2643c95fa75
      client-secret: 86jN7TtWMxjiFoWPgMQYBCu46bOoEkpfscvuyvsS31Y
      redirect-uri: http://houjie.xalxzn.com:8866/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
      agent-id: 1000002
    DINGTALK:
      client-id: ??
      client-secret: ??
@@ -271,19 +271,19 @@
    timeout: 1h
#第三方APP对接
third-app:
  enabled: false
  enabled: true
  type:
    #企业微信
    WECHAT_ENTERPRISE:
      enabled: false
      enabled: true
      #CORP_ID
      client-id: ??
      client-id: ww5999b2643c95fa75
      #SECRET
      client-secret: ??
      client-secret: 86jN7TtWMxjiFoWPgMQYBCu46bOoEkpfscvuyvsS31Y
      #自建应用id
      agent-id: ??
      agent-id: 1000002
      #自建应用秘钥（新版企微需要配置）
      # agent-app-secret: ??
      agent-app-secret: 86jN7TtWMxjiFoWPgMQYBCu46bOoEkpfscvuyvsS31Y
    #钉钉
    DINGTALK:
      enabled: false
@@ -335,3 +335,6 @@
ncSend:
  addOrDelete: false  #//是否删除seed 中的之前文件
#staticAccessPath: /api/ffile/** # 当前项目的静态资源访问配置在nginx中
# 企业微信模板卡片消息点击后跳转的 url
wechatEnterprise:
  cardActionUrl: https://houjie.xalxzn.com:8866/h5