Merge remote-tracking branch 'origin/master'

rk

2 天以前 c313a253b1fcdc75b6be5db575fc2b29fb407021

 server/pom.xml

@@ -35,6 +35,8 @@
    <poi.version>5.0.0</poi.version>
    <jjwt.version>0.9.1</jjwt.version>
    <weixin-java-pay.version>4.1.0</weixin-java-pay.version>
    <!-- 阿里云OSS存储 -->
    <aliyun-oss.version>3.8.0</aliyun-oss.version>
  </properties>
  <dependencies>
    <!-- Spring Boot -->
@@ -238,10 +240,11 @@
      <version>0.2.15</version>
    </dependency>

    <!--  阿里云OSS-->
    <dependency>
      <groupId>com.aliyun</groupId>
      <artifactId>aliyun-java-sdk-core</artifactId>
      <version>3.5.0</version>
      <groupId>com.aliyun.oss</groupId>
      <artifactId>aliyun-sdk-oss</artifactId>
      <version>${aliyun-oss.version}</version>
    </dependency>

    <dependency>
@@ -249,7 +252,18 @@
      <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
      <version>1.1.0</version>
    </dependency>

    <!-- aliyun sms SDK -->
    <dependency>
      <groupId>com.aliyun</groupId>
      <artifactId>aliyun-java-sdk-core</artifactId>
      <version>4.5.3</version>
    </dependency>
  <!-- 拼音转换 -->
    <dependency>
      <groupId>com.belerweb</groupId>
      <artifactId>pinyin4j</artifactId>
      <version>2.5.1</version>
    </dependency>
 <!--   <dependency>
      <groupId>com.azure.spring</groupId>
      <artifactId>spring-cloud-azure-starter-storage-blob</artifactId>