From 269daa8c7bba1547ffa4c9fa7700b920bb5a6b13 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 09 Jan 2024 13:49:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/resource/builder/oss/OssBuilder.java | 9 +++++++++
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 18 ++++++++++++++++++
pom.xml | 6 ++++++
src/main/resources/application.yml | 2 +-
4 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/pom.xml b/pom.xml
index ee72a93..dc1b87c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,6 +191,12 @@
<artifactId>jts</artifactId>
<version>1.13</version>
</dependency>
+ <!-- 微信支付 SDK-->
+ <dependency>
+ <groupId>com.github.binarywang</groupId>
+ <artifactId>weixin-java-pay</artifactId>
+ <version>4.4.9.B</version>
+ </dependency>
</dependencies>
<build>
diff --git a/src/main/java/org/springblade/modules/resource/builder/oss/OssBuilder.java b/src/main/java/org/springblade/modules/resource/builder/oss/OssBuilder.java
index d78391b..27cf85a 100644
--- a/src/main/java/org/springblade/modules/resource/builder/oss/OssBuilder.java
+++ b/src/main/java/org/springblade/modules/resource/builder/oss/OssBuilder.java
@@ -70,6 +70,15 @@
/**
* 获取template
*
+ * @return OssProperties
+ */
+ public OssProperties ossProperties() {
+ return ossProperties;
+ }
+
+ /**
+ * 获取template
+ *
* @return OssTemplate
*/
public OssTemplate template() {
diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
index f1b57b4..473107a 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -146,7 +146,22 @@
@PostMapping("/put-file")
public R<BladeFile> putFile(@RequestParam MultipartFile file) {
BladeFile bladeFile = ossBuilder.template().putFile(file.getOriginalFilename(), file.getInputStream());
+ // 修改link
+ changeLink(bladeFile);
+ // 返回
return R.data(bladeFile);
+ }
+
+ /**
+ * 修改link
+ * @param bladeFile
+ */
+ private void changeLink(BladeFile bladeFile) {
+ if (null!=bladeFile){
+ // 替换url link 前缀
+ String newLink = ossBuilder.ossProperties().getEndpoint() + bladeFile.getName();
+ bladeFile.setLink(newLink);
+ }
}
/**
@@ -176,6 +191,9 @@
BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
Long attachId = buildAttach(fileName, file.getSize(), bladeFile);
bladeFile.setAttachId(attachId);
+ // 修改link
+ changeLink(bladeFile);
+ // 返回
return R.data(bladeFile);
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9b956da..4d20f7c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -138,7 +138,7 @@
enabled: true
name: qiniu
tenant-mode: true
- endpoint: http://prt1thnw3.bkt.clouddn.com
+ endpoint: https://srgdjczzxtpt.com:2080/gminio/jczz/
access-key: N_Loh1ngBqcJovwiAJqR91Ifj2vgOWHOf8AwBA_h
secret-key: AuzuA1KHAbkIndCU0dB3Zfii2O3crHNODDmpxHRS
bucket-name: bladex
--
Gitblit v1.9.3