Merge remote-tracking branch 'origin/master'

doum

2026-04-17 f45bcaf01cd2c96e66b08d3f9b7287aa5b4cdab2

 server/pom.xml

@@ -109,6 +109,12 @@
      <groupId>com.huaweicloud</groupId>
      <artifactId>esdk-obs-java</artifactId>
      <version>3.19.7</version>
      <exclusions>
        <exclusion>
          <artifactId>okhttp</artifactId>
          <groupId>com.squareup.okhttp3</groupId>
        </exclusion>
      </exclusions>
    </dependency>

    <!-- 连接池 -->
@@ -238,6 +244,12 @@
      <groupId>com.github.wechatpay-apiv3</groupId>
      <artifactId>wechatpay-java</artifactId>
      <version>0.2.15</version>
      <exclusions>
        <exclusion>
          <artifactId>okhttp</artifactId>
          <groupId>com.squareup.okhttp3</groupId>
        </exclusion>
      </exclusions>
    </dependency>

    <!--  阿里云OSS-->