Merge remote-tracking branch 'origin/master'

jiangping

2024-07-29 14fbe95ee5c7f601da703614f7e1e4a8ec29c8ce

 server/pom.xml

@@ -29,7 +29,7 @@
    <java.version>1.8</java.version>
    <swagger.version>2.9.2</swagger.version>
    <swagger.bootstrap-ui.version>1.9.6</swagger.bootstrap-ui.version>
    <fastjson.version>1.2.70</fastjson.version>
    <fastjson.version>2.0.52</fastjson.version>
    <druid.version>1.2.0</druid.version>
    <mybatis.plus.version>3.5.7</mybatis.plus.version>
    <apache.shiro.version>1.7.0</apache.shiro.version>
@@ -201,12 +201,12 @@
      <artifactId>pinyin4j</artifactId>
      <version>2.5.1</version>
    </dependency>
<!--    &lt;!&ndash; WeChat 小程序 &ndash;&gt;-->
<!--    <dependency>-->
<!--      <groupId>com.github.binarywang</groupId>-->
<!--      <artifactId>weixin-java-miniapp</artifactId>-->
<!--      <version>${weixin-java-miniapp.version}</version>-->
<!--    </dependency>-->
    <!-- WeChat 小程序 -->
    <dependency>
      <groupId>com.github.binarywang</groupId>
      <artifactId>weixin-java-miniapp</artifactId>
      <version>${weixin-java-miniapp.version}</version>
    </dependency>
<!--    &lt;!&ndash; WeChat 支付 &ndash;&gt;-->
<!--    <dependency>-->
<!--      <groupId>com.github.binarywang</groupId>-->
@@ -220,7 +220,11 @@
      <artifactId>aliyun-sdk-oss</artifactId>
      <version>${aliyun-oss.version}</version>
    </dependency>

    <dependency>
      <groupId>org.jsoup</groupId>
      <artifactId>jsoup</artifactId>
      <version>1.13.1</version>
    </dependency>
    <!-- aliyun sms SDK -->
    <dependency>
      <groupId>com.aliyun</groupId>