From c82acdcd2caca0e9b78bf2af798c3a27e131c2c9 Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Tue, 22 Nov 2022 15:15:24 +0800
Subject: [PATCH] 上次读取数据库连接配置
---
src/main/java/org/springblade/modules/mechanism/controller/MechanismController.java | 23 +++++++++--
src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java | 44 +++++++++++++++++++--
2 files changed, 57 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java b/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java
index a40f487..a092b03 100644
--- a/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java
+++ b/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.architecture.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.zxing.WriterException;
import io.minio.*;
import io.minio.errors.*;
@@ -33,6 +34,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.oss.model.BladeFile;
+import org.springblade.core.oss.model.OssFile;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.life.entity.Life;
@@ -40,6 +42,7 @@
import org.springblade.modules.mechanism.entity.Mechanism;
import org.springblade.modules.mechanism.service.IMechanismService;
import org.springblade.modules.resource.builder.oss.OssBuilder;
+import org.springblade.modules.resource.entity.Oss;
import org.springblade.modules.resource.service.IOssService;
import org.springframework.core.io.support.ResourceRegion;
import org.springframework.http.ResponseEntity;
@@ -71,6 +74,9 @@
@RequestMapping("blade-architecture/architecture")
@Api(value = "", tags = "接口")
public class ArchitectureController extends BladeController {
+
+
+ private final IOssService ossService;
private final IArchitectureService architectureService;
private final IMechanismService mechanismService;
@@ -441,11 +447,19 @@
}
private String upload(ByteArrayInputStream in) throws IOException, InvalidKeyException, InvalidResponseException, InsufficientDataException, NoSuchAlgorithmException, ServerException, InternalException, XmlParserException, ErrorResponseException {
+ QueryWrapper<Oss> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted",0);
+ Oss one = ossService.getOne(wrapper);
//填写你文件上传的地址以及相应信息
- String url = "http://106.225.193.35:2081";
- String access = "zhbaadmin";
- String secret = "zhbapassword";
- String bucket = "zhxy";
+// String url = "http://106.225.193.35:2081";
+// String access = "zhbaadmin";
+// String secret = "zhbapassword";
+// String bucket = "zhxy";
+ String url = one.getEndpoint();
+ String access = one.getAccessKey();
+ String secret = one.getSecretKey();
+ String bucket = one.getBucketName();
+
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -471,8 +485,28 @@
.build());
//文件推送
- String urls = "https://dev.jxpskj.com:8023/zhxy/"+newName;
+ String urls = url + "/"+ bucket +"/" + newName;
//返回
return urls;
}
+
+
+ /**
+ * 二维码重新生成 code url 转换
+ */
+ @GetMapping("/refreshCode")
+ public void refreshCode() throws IOException, ServerException, InsufficientDataException, NoSuchAlgorithmException, InternalException, InvalidResponseException, XmlParserException, InvalidKeyException, ErrorResponseException {
+ List<Architecture> list = architectureService.selectArchALL();
+ for (Architecture architecture : list) {
+ int index = architecture.getCodeurl().lastIndexOf(",") +1;
+ String substring = architecture.getCodeurl().substring(index);
+ byte[] qrCodeImage = Base64Util.decode(substring);
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(qrCodeImage);
+ String url = upload(inputStream);
+ architecture.setCodeurl(url);
+ architectureService.updateById(architecture);
+ //关闭流
+ inputStream.close();
+ }
+ }
}
diff --git a/src/main/java/org/springblade/modules/mechanism/controller/MechanismController.java b/src/main/java/org/springblade/modules/mechanism/controller/MechanismController.java
index 1a7caf9..55c058e 100644
--- a/src/main/java/org/springblade/modules/mechanism/controller/MechanismController.java
+++ b/src/main/java/org/springblade/modules/mechanism/controller/MechanismController.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.mechanism.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.zxing.WriterException;
import io.minio.*;
import io.minio.errors.*;
@@ -35,6 +36,8 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.resource.builder.oss.OssBuilder;
+import org.springblade.modules.resource.entity.Oss;
+import org.springblade.modules.resource.service.IOssService;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.mechanism.entity.Mechanism;
@@ -68,6 +71,8 @@
public class MechanismController extends BladeController {
private final IMechanismService mechanismService;
+
+ private final IOssService ossService;
/**
* 对象存储构建类
@@ -223,11 +228,18 @@
}
private String upload(ByteArrayInputStream in) throws IOException, InvalidKeyException, InvalidResponseException, InsufficientDataException, NoSuchAlgorithmException, ServerException, InternalException, XmlParserException, ErrorResponseException {
+ QueryWrapper<Oss> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted",0);
+ Oss one = ossService.getOne(wrapper);
//填写你文件上传的地址以及相应信息
- String url = "http://106.225.193.35:2081";
- String access = "zhbaadmin";
- String secret = "zhbapassword";
- String bucket = "zhxy";
+// String url = "http://106.225.193.35:2081";
+// String access = "zhbaadmin";
+// String secret = "zhbapassword";
+// String bucket = "zhxy";
+ String url = one.getEndpoint();
+ String access = one.getAccessKey();
+ String secret = one.getSecretKey();
+ String bucket = one.getBucketName();
MinioClient minioClient =
MinioClient.builder()
.endpoint(url)
@@ -253,7 +265,8 @@
.build());
//文件推送
- String urls = "https://dev.jxpskj.com:8023/zhxy/"+newName;
+// String urls = "https://dev.jxpskj.com:8023/zhxy/"+newName;
+ String urls = url + "/"+ bucket + "/" + newName;
//返回
return urls;
}
--
Gitblit v1.9.3