From 61136265a19abbdd1eaaa9ee46c6da8d05eb25be Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期一, 04 十二月 2023 09:44:16 +0800
Subject: [PATCH] 对接边界
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java | 2
ruoyi-admin/src/main/resources/application-prod.yml | 8 +++
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java | 13 ++++--
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/properties/Boundary.java | 26 +++++++++++++
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java | 25 ------------
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java | 9 ++++
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java | 2
7 files changed, 52 insertions(+), 33 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
index c5aaea3..e0ef425 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
@@ -78,7 +78,7 @@
SysUserVo sysUserVo = userMapper.selectUserByUserName(username);
SysUserRole userRole = new SysUserRole();
userRole.setUserId(sysUserVo.getUserId());
- userRole.setRoleId(Long.valueOf(RoleType.INTERNET.getType()));
+ userRole.setRoleId(Long.valueOf(RoleType.VIDEO.getType()));
userRoleMapper.insert(userRole);
recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success"));
}
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 8b91cb9..c5238d5 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -46,7 +46,7 @@
url: jdbc:mysql://123.207.71.245:13306/qysp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
username: root
password: 234#Wersdf!
-# url: jdbc:mysql://80.36.32.175:3306/qysp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
+# url: jdbc:mysql://80.36.32.176:3306/qysp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
# username: root
# password: 234#Wersdf!
# url: jdbc:mysql://51.9.57.211:3306/qysp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
@@ -259,3 +259,9 @@
client-id: 10**********6
client-secret: 1f7d08**********5b7**********29e
redirect-uri: ${justauth.address}/social-callback?source=gitlab
+
+--- #杈圭晫
+police:
+ localhost: http://192.168.3.43:8080 #娴嬭瘯
+ chief: http://10.248.255.130:18080 #鏀垮姟浜�
+ video: http://51.9.1.41:18080 #瑙嗛缃�
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
index faa6697..690abf2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
@@ -91,7 +91,7 @@
//娣诲姞闃熷垪鏁版嵁
- QueueUtils.addDelayedQueueObject("OSS", oss.getOssId().toString(), 1, TimeUnit.HOURS);
+ QueueUtils.addDelayedQueueObject("OSS", oss.getOssId().toString(), 300, TimeUnit.SECONDS);
log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}", "OSS", oss.getOssId());
SysOssUploadVo uploadVo = new SysOssUploadVo();
uploadVo.setUrl(oss.getUrl());
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/properties/Boundary.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/properties/Boundary.java
new file mode 100644
index 0000000..e4c4471
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/properties/Boundary.java
@@ -0,0 +1,26 @@
+package org.dromara.system.domain.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "police")
+public class Boundary {
+
+ /**
+ * 娴嬭瘯
+ */
+ private String localhost;
+
+ /**
+ * 鏀垮姟浜�
+ */
+ private String chief;
+
+ /**
+ * 瑙嗛缃�
+ */
+ private String video;
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java
index 04c2ea9..74f8248 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java
@@ -8,6 +8,7 @@
import org.dromara.common.redis.utils.QueueUtils;
import org.dromara.system.convert.SysOssConfigClassConvert;
import org.dromara.system.domain.SysOssConfig;
+import org.dromara.system.domain.properties.Boundary;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.mapper.SysOssConfigMapper;
import org.dromara.system.mapper.SysOssMapper;
@@ -15,10 +16,12 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.system.service.ISysOssService;
+import org.dromara.system.uitil.HttpUtils;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
+import java.io.IOException;
import java.util.List;
import java.util.stream.Collectors;
@@ -32,6 +35,7 @@
@Component
public class SystemApplicationRunner implements ApplicationRunner {
+ private final Boundary boundary;
private final ISysOssConfigService ossConfigService;
private final SysOssMapper ossMapper;
private final SysOssConfigMapper sysOssConfigMapper;
@@ -54,6 +58,11 @@
SysOssVo vo = ossMapper.selectVoById(ossId);
client.delete( vo.getUrl());
ossMapper.deleteById(Long.valueOf(ossId));
+ try {
+ HttpUtils.sendDeleteRequest(boundary.getLocalhost() + "/resource/synchronization/delete",ossId);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
});
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
index c698890..5d7e03f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
@@ -29,6 +29,7 @@
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.system.domain.SysOss;
import org.dromara.system.domain.bo.SysOssBo;
+import org.dromara.system.domain.properties.Boundary;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.mapper.SysOssMapper;
import org.dromara.system.service.ISysOssService;
@@ -56,6 +57,7 @@
@Service
public class SysOssServiceImpl implements ISysOssService, OssService {
+ private final Boundary boundary;
private final SysOssMapper baseMapper;
@Override
@@ -198,11 +200,12 @@
//鎷兼帴鍚屾淇℃伅
SynchronousRequest request = new SynchronousRequest();
request.setFile(file);
- request.setPath(uploadResult.getFilename() + "123");
+ request.setPath(uploadResult.getFilename() + "1");
// request.setCreateTime(new Date());
request.setPassword(oss.getPassword());
request.setCreateBy(String.valueOf(oss.getCreateBy()));
- request.setOssId(String.valueOf(oss.getOssId()));
+// request.setOssId(String.valueOf(oss.getOssId()));
+ request.setOssId("12312312");
post(request);
SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
@@ -226,7 +229,7 @@
UploadResult uploadResult, String ossId, String password,
String createBy) {
SysOss oss = new SysOss();
- oss.setOssId(Long.valueOf(ossId.substring(0,ossId.length()-3) + "000"));
+ oss.setOssId(Long.valueOf(ossId));
oss.setUrl(uploadResult.getUrl());
oss.setFileSuffix(suffix);
oss.setFileName(uploadResult.getFilename());
@@ -251,7 +254,7 @@
storage.delete(sysOss.getUrl());
if(sysOss.getPassword().equals(password) || password.equals("000000")){
baseMapper.deleteById(sysOss.getOssId());
- HttpUtils.sendDeleteRequest("http://192.168.3.43/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
+ HttpUtils.sendDeleteRequest(boundary.getLocalhost() + "/resource/synchronization/delete",String.valueOf(sysOss.getOssId()));
return true;
}
return false;
@@ -289,7 +292,7 @@
private String post(SynchronousRequest request) throws IOException {
HashMap<String, String> headers = new HashMap<>(3);
- String requestUrl = "http://192.168.3.43:8080/resource/synchronization/upload";
+ String requestUrl = boundary.getLocalhost() + "/resource/synchronization/upload";
ObjectMapper objectMapper = new ObjectMapper();
String jsonString = "";
try {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java
index 78e5ad3..cb464c1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java
@@ -151,31 +151,6 @@
// * @param parameter
* @throws Exception
*/
-// public static void sendDeleteRequest(String url, String parameter) throws Exception {
-// // 鎷兼帴URL鍜屽弬鏁�
-// String deleteUrl = url + "/" + parameter;
-//
-// // 鍒涘缓URL瀵硅薄鍜孒ttpURLConnection瀵硅薄
-// URL obj = new URL(deleteUrl);
-// HttpURLConnection con = (HttpURLConnection) obj.openConnection();
-//
-// // 璁剧疆璇锋眰鏂规硶涓篋ELETE
-// con.setRequestMethod("DELETE");
-//
-// // 鍙戦�佽姹傚苟鑾峰彇鍝嶅簲
-// int responseCode = con.getResponseCode();
-// BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
-// String inputLine;
-// StringBuffer response = new StringBuffer();
-// while ((inputLine = in.readLine()) != null) {
-// response.append(inputLine);
-// }
-// in.close();
-//
-// // 鎵撳嵃鍝嶅簲缁撴灉
-// System.out.println("Response Code : " + responseCode);
-// System.out.println("Response : " + response.toString());
-// }
public static String sendDeleteRequest(String url, String ossId) throws IOException {
org.apache.http.client.HttpClient httpClient = HttpClientBuilder.create().build();
HttpPost httpPost = new HttpPost(url);
--
Gitblit v1.8.0