From 83c49918bb3709fce818fcdeb8c1db147eadcede Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 16 七月 2026 16:44:15 +0800
Subject: [PATCH] Merge branch 'master' into master-任务组
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 96 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index 8ad8488..8704753 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -3,6 +3,7 @@
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.PhotoEnum;
import com.ruoyi.common.enums.RadioEnum;
import com.ruoyi.common.enums.VadioEnum;
@@ -10,6 +11,8 @@
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.framework.config.ServerConfig;
+import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.system.mapper.SysConfigMapper;
import com.smartor.domain.HtmlContentVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -36,9 +39,7 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import java.io.*;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.List;
+import java.util.*;
/**
* 閫氱敤璇锋眰澶勭悊
@@ -54,10 +55,25 @@
@Autowired
private ServerConfig serverConfig;
+ @Autowired
+ private SysConfigMapper sysConfigMapper;
+
+ @Autowired
+ private RedisCache redisCache;
+
private static final String FILE_DELIMETER = ",";
@Value("${uploadSwitch}")
private Integer uploadSwitch;
+
+ @Value("${fileUpload}")
+ private String fileUpload;
+
+ @Value("${profile}")
+ private String profile;
+
+ @Value("${spring.profiles.active}")
+ private String active;
/**
* 閫氱敤涓嬭浇璇锋眰
@@ -107,8 +123,8 @@
// 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
String fileName = FileUploadUtils.uploadSort(filePath, file);
String url = null;
- //鏂板崕鍖婚櫌鐗规畩锛岃繖涓棰戠殑璁块棶寰楄浆
- String xhPath = "http://218.108.11.22:8093/profile-api";
+ String xhPath = fileUpload + profile;
+
if (uploadSwitch == 1) {
String fn = fileName.replaceAll("/profile", "");
url = xhPath + fn;
@@ -143,7 +159,10 @@
convertDocToHtml(filePath + "\\" + file.getOriginalFilename(), filePath + "\\" + file.getOriginalFilename().split("\\.", 2)[0] + ".html");
String url = null;
- String xhPath = "http://218.108.11.22:8093/profile-api";
+ SysConfig config = new SysConfig();
+ config.setConfigKey("sys.qdip");
+ SysConfig sysConfig = sysConfigMapper.selectConfig(config);
+ String xhPath = sysConfig.getConfigValue() + "/profile-api";
if (uploadSwitch == 1) {
String fn = fileName.replaceAll("\\.[^.]*$", ".html").replaceAll("/profile", "");
url = xhPath + fn;
@@ -247,7 +266,7 @@
@ApiOperation("瀵屾枃鏈浆html")
@PostMapping("/htmlContent")
public AjaxResult htmlContent(@RequestBody HtmlContentVO htmlContentVO) {
- log.error("htmlContentVO鍏ュ弬涓猴細{}", htmlContentVO);
+ log.info("htmlContentVO鍏ュ弬涓猴細{}", htmlContentVO);
// 鑾峰彇鏂囦欢鐨勫師濮嬪悕绉�
String fileName = htmlContentVO.getFileName();
if (!fileName.endsWith(".html")) {
@@ -263,13 +282,12 @@
// 灏嗘枃浠朵繚瀛樺埌鎸囧畾鐩綍
File outputFile = new File(RuoYiConfig.getUploadPath() + "/show/" + fileName.split("\\.", 2)[0] + "/" + fileName);
try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputFile), "UTF-8"))) {
- if (StringUtils.isNotEmpty(htmlContentVO.getContent()))
- writer.write(htmlContentVO.getContent());
+ if (StringUtils.isNotEmpty(htmlContentVO.getContent())) writer.write(htmlContentVO.getContent());
} catch (IOException e) {
e.printStackTrace();
}
String url = null;
- String xhPath = "http://218.108.11.22:8093/profile-api";
+ String xhPath = fileUpload + profile;
if (uploadSwitch == 1) {
url = xhPath + "/upload/show/" + fileName.split("\\.", 2)[0] + "/" + fileName;
} else {
@@ -315,4 +333,72 @@
}
+ /**
+ * 鑾峰彇鏂囦欢鎵╁睍鍚�
+ */
+ private static String getFileExtension(String fileName) {
+ int lastDotIndex = fileName.lastIndexOf('.');
+ if (lastDotIndex > 0) {
+ return fileName.substring(lastDotIndex);
+ }
+ return "";
+ }
+
+ /**
+ * 妫�鏌ユ枃浠舵槸鍚︿负鏀寔鐨刉ord鏍煎紡
+ */
+ public static boolean isSupportedWordFormat(String filePath) {
+ if (filePath == null) return false;
+ String fileName = filePath.toLowerCase();
+ return fileName.endsWith(".doc") || fileName.endsWith(".docx");
+ }
+
+ /**
+ * @param
+ * @return
+ */
+ @ApiOperation("鑾峰彇RedisCache")
+ @PostMapping("/getRedisCache")
+ public String getRedisCache(@RequestBody String key) {
+ String object = redisCache.getCacheObject(key);
+ return object;
+ }
+
+ /**
+ * @param
+ * @return
+ */
+ @ApiOperation("鏌ヨRedisCache")
+ @PostMapping("/findRedisCacheList")
+ public Set<String> findRedisCacheList(@RequestBody String key) {
+ Set<String> allKeys = redisCache.getAllKeys();
+ Set<String> matchKeys = new HashSet<>();
+ for (String redisKey : allKeys) {
+ if(redisKey.contains(key)) {
+ matchKeys.add(redisKey);
+ }
+ }
+ return matchKeys;
+ }
+
+ /**
+ * @param
+ * @return
+ */
+ @ApiOperation("鍒犻櫎RedisCache")
+ @PostMapping("/deleteRedisCache")
+ public Set<String> deleteRedisCache(@RequestBody String key) {
+ Set<String> allKeys = redisCache.getAllKeys();
+ Set<String> matchKeys = new HashSet<>();
+ for (String redisKey : allKeys) {
+ if(redisKey.contains(key)) {
+ redisCache.deleteObject(redisKey);
+ matchKeys.add(redisKey);
+ }
+ }
+ return matchKeys;
+ }
}
+
+
+
--
Gitblit v1.9.3