Merge remote-tracking branch 'origin/master'

yxh

2025-06-03 bbf8efb4cf186a753128a88822cfd28af46a0f38

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-admin/src/main/resources/application-druid.yml

 ruoyi-admin/pom.xml

@@ -10,7 +10,7 @@
    <modelVersion>4.0.0</modelVersion>
<!--    <packaging>war</packaging>-->
    <packaging>jar</packaging>
    <artifactId>ruoyi-admin</artifactId>
    <artifactId>opo-admin</artifactId>

    <description>
        web服务入口

 ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,20 +6,15 @@
        druid:
            # 主库数据源
            master:
#                # 医院环境
                # 医院环境
#                url: jdbc:mysql://129.88.242.37:3308/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#                username: JQ
#                password: Jqserver88

                # 开发环境-阿里云
#                url: jdbc:mysql://116.62.18.175:6002/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
#                username: opo
#                password: opo@2022

                # 开发环境-内网
                url: jdbc:mysql://192.168.1.16:3308/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
#                # 开发环境
                url: jdbc:mysql://116.62.18.175:6002/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
                username: opo
                password: Smartor.2023
                password: opo@2022

            # 从库数据源
            slave:

 ruoyi-admin/src/main/resources/application.yml

@@ -149,12 +149,12 @@
  urlPatterns: /system/*,/monitor/*,/tool/*


##钉钉的密钥（公司）
agentId: 1779052814
dingAppid: dingn8iip5ubj7clrrsv
dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD
###钉钉的密钥（公司）
#agentId: 1779052814
#dingAppid: dingn8iip5ubj7clrrsv
#dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD

#钉钉的密钥（省人民）
#agentId: 2975938892
#dingAppid: dingbxgfddodocmtqqsu
#dingAppSecret: sw1NDcgErqWqkaWVo4DPck9EagJ-2yihYNxmhOjXo_F9E6X_-6Cl3LAybqAPt9gi
agentId: 2975938892
dingAppid: dingbxgfddodocmtqqsu
dingAppSecret: sw1NDcgErqWqkaWVo4DPck9EagJ-2yihYNxmhOjXo_F9E6X_-6Cl3LAybqAPt9gi