From f4c181608411d60293c836621dc90b9120e3a451 Mon Sep 17 00:00:00 2001
From: JaneYork <janeyork1314@163.com>
Date: 星期五, 22 七月 2022 15:27:00 +0800
Subject: [PATCH] 主动设置文件公共读，适配天翼云OSS 主动设置文件公共读，适配天翼云OSS。 天翼云，即便bucket设置公共读，文件默认也是private，除非手动设置，详见天翼云：https://console.xstore.ctyun.cn/doc/store/sdk/java/objectOperation/putObject.html 已测试： 所有兼容S3协议的OSS，已测试：阿里云、腾讯云、百度、京东、天翼、自建Minio、七牛
---
pom.xml | 81 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 35 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0b9cfd5..e53c27d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,46 +6,46 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-vue-plus</artifactId>
- <version>4.2.0-beta1</version>
+ <version>4.2.0</version>
<name>RuoYi-Vue-Plus</name>
<url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
<description>RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</description>
<properties>
- <ruoyi-vue-plus.version>4.2.0-beta1</ruoyi-vue-plus.version>
- <spring-boot.version>2.6.8</spring-boot.version>
+ <ruoyi-vue-plus.version>4.2.0</ruoyi-vue-plus.version>
+ <spring-boot.version>2.7.2</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
<spring-boot.mybatis>2.2.2</spring-boot.mybatis>
- <druid.version>1.2.9</druid.version>
- <knife4j.version>3.0.3</knife4j.version>
- <swagger-annotations.version>1.5.22</swagger-annotations.version>
+ <druid.version>1.2.11</druid.version>
+ <springdoc.version>1.6.9</springdoc.version>
<poi.version>5.2.2</poi.version>
- <easyexcel.version>3.1.0</easyexcel.version>
+ <easyexcel.version>3.1.1</easyexcel.version>
<velocity.version>2.3</velocity.version>
<satoken.version>1.30.0</satoken.version>
<mybatis-plus.version>3.5.2</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
- <hutool.version>5.8.2</hutool.version>
- <okhttp.version>4.9.3</okhttp.version>
- <spring-boot-admin.version>2.6.7</spring-boot-admin.version>
- <redisson.version>3.17.2</redisson.version>
- <lock4j.version>2.2.1</lock4j.version>
+ <hutool.version>5.8.4</hutool.version>
+ <okhttp.version>4.10.0</okhttp.version>
+ <spring-boot-admin.version>2.7.2</spring-boot-admin.version>
+ <redisson.version>3.17.4</redisson.version>
+ <lock4j.version>2.2.2</lock4j.version>
<dynamic-ds.version>3.5.1</dynamic-ds.version>
- <tlog.version>1.4.0</tlog.version>
+ <tlog.version>1.4.3</tlog.version>
<xxl-job.version>2.3.1</xxl-job.version>
+ <lombok.version>1.18.24</lombok.version>
<!-- 缁熶竴 guava 鐗堟湰 瑙ｅ喅闅愬紡婕忔礊闂 -->
- <guava.version>30.0-jre</guava.version>
+ <guava.version>31.1-jre</guava.version>
<!-- OSS 閰嶇疆 -->
- <aws-java-sdk-s3.version>1.12.215</aws-java-sdk-s3.version>
+ <aws-java-sdk-s3.version>1.12.264</aws-java-sdk-s3.version>
<!-- SMS 閰嶇疆 -->
- <aliyun.sms.version>2.0.9</aliyun.sms.version>
- <tencent.sms.version>3.1.500</tencent.sms.version>
+ <aliyun.sms.version>2.0.16</aliyun.sms.version>
+ <tencent.sms.version>3.1.555</tencent.sms.version>
<!-- docker 閰嶇疆 -->
<docker.registry.url>localhost</docker.registry.url>
@@ -85,21 +85,21 @@
</dependency>
<dependency>
- <groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-spring-boot-starter</artifactId>
- <version>${knife4j.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>swagger-annotations</artifactId>
- <groupId>io.swagger</groupId>
- </exclusion>
- </exclusions>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-webmvc-core</artifactId>
+ <version>${springdoc.version}</version>
</dependency>
<dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>${swagger-annotations.version}</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-javadoc</artifactId>
+ <version>${springdoc.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
</dependency>
<dependency>
@@ -338,6 +338,23 @@
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>com.github.therapi</groupId>
+ <artifactId>therapi-runtime-javadoc-scribe</artifactId>
+ <version>0.13.0</version>
+ </path>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
+ <path>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <version>${spring-boot.version}</version>
+ </path>
+ </annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
@@ -393,8 +410,6 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>local</profiles.active>
<logging.level>debug</logging.level>
- <knife4j.production>false</knife4j.production>
- <endpoints.include>'*'</endpoints.include>
</properties>
</profile>
<profile>
@@ -403,8 +418,6 @@
<!-- 鐜鏍囪瘑锛岄渶瑕佷笌閰嶇疆鏂囦欢鐨勫悕绉扮浉瀵瑰簲 -->
<profiles.active>dev</profiles.active>
<logging.level>debug</logging.level>
- <knife4j.production>false</knife4j.production>
- <endpoints.include>'*'</endpoints.include>
</properties>
<activation>
<!-- 榛樿鐜 -->
@@ -416,8 +429,6 @@
<properties>
<profiles.active>prod</profiles.active>
<logging.level>warn</logging.level>
- <knife4j.production>true</knife4j.production>
- <endpoints.include>health, info, logfile</endpoints.include>
</properties>
</profile>
</profiles>
--
Gitblit v1.9.3