From ef1e28d6179be02e69d460fb3f59edda7a7e4b1d Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 04 十一月 2026 10:00:01 +0800
Subject: [PATCH] 修改了收费器官查询
---
ruoyi-project/src/main/java/com/ruoyi/project/common/AttachmentNameValidator.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/common/AttachmentNameValidator.java b/ruoyi-project/src/main/java/com/ruoyi/project/common/AttachmentNameValidator.java
index 9b7aea9..d3508f3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/common/AttachmentNameValidator.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/common/AttachmentNameValidator.java
@@ -8,14 +8,15 @@
import com.fasterxml.jackson.databind.ObjectMapper;
/**
- * 鎶ラ攢鍗曢檮浠舵枃浠跺悕瑙勮寖鏍￠獙锛�2026-10-15锛夈��
+ * 鎶ラ攢鍗曢檮浠舵枃浠跺悕瑙勮寖鏍￠獙锛�2026-11-03 璋冩暣锛夈��
*
- * <p>涓氬姟鍙ｅ緞锛堜笟鍔℃柟纭锛夛細
+ * <p>涓氬姟鍙ｅ緞锛�
* <ol>
- * <li>蹇呴』鍖呭惈涓枃锛堣嚦灏� 1 涓眽瀛楋級鈥斺��"涓烘柟渚挎煡楠岄檮浠讹紝璇风敤涓枃瑙勮寖鍛藉悕闄勪欢锛�"</li>
- * <li>鍘绘帀鎵╁睍鍚嶅悗鐨勪富骞诧紝鎸夊瓧绗︽暟璁＄畻涓嶈兘瓒呰繃 20 涓瓧鈥斺��"涓烘柟渚挎煡楠岄檮浠讹紝闄勪欢鍚嶅瓧闀垮害涓嶈兘瓒呰繃20涓瓧锛�"</li>
+ * <li>鍏佽鏂囦欢鍚嶄笉鍚腑鏂囷紱鍚腑鏂�/绾嫳鏂�/鏁板瓧鍧囧彲</li>
+ * <li>鍘绘帀鎵╁睍鍚嶅悗鐨勪富骞诧紝鎸夊瓧绗︽暟璁＄畻涓嶈兘瓒呰繃 20 涓瓧</li>
* <li>涓嶈兘鍖呭惈绌烘牸鍙� {@code / \ : * ? " < > | # %} 绛夌壒娈婂瓧绗�</li>
* <li>鍚屼竴鏄庣粏琛屽唴涓嶈兘閲嶅悕锛堟瘮杈冩椂蹇界暐鎵╁睍鍚嶅ぇ灏忓啓涓庨灏剧┖鏍硷級</li>
+ * <li>鍙牎楠屾柊涓婁紶/鏂颁繚瀛樼殑闄勪欢锛涘巻鍙查檮浠剁敱 existingNames 鏀捐</li>
* </ol>
*
* <p>涓庡墠绔� {@code opo-web/src/utils/fileNameCheck.js} <b>鍚屽彛寰�</b>锛�
@@ -34,15 +35,12 @@
/** 涓诲共锛堝幓鎵╁睍鍚嶏級鏈�澶у瓧绗︽暟 */
public static final int MAX_MAIN_LENGTH = 20;
- public static final String MSG_NO_CHINESE = "涓烘柟渚挎煡楠岄檮浠讹紝璇风敤涓枃瑙勮寖鍛藉悕闄勪欢锛�";
+ public static final String MSG_EMPTY_NAME = "涓烘柟渚挎煡楠岄檮浠讹紝闄勪欢鍚嶄笉鑳戒负绌猴紒";
public static final String MSG_TOO_LONG = "涓烘柟渚挎煡楠岄檮浠讹紝闄勪欢鍚嶅瓧闀垮害涓嶈兘瓒呰繃20涓瓧锛�";
public static final String MSG_ILLEGAL = "涓烘柟渚挎煡楠岄檮浠讹紝闄勪欢鍚嶄笉鑳藉寘鍚┖鏍煎強 / \\ : * ? \" < > | # % 绛夌壒娈婂瓧绗︼紒";
public static final String MSG_DUPLICATE = "涓烘柟渚挎煡楠岄檮浠讹紝鍚屼竴琛屽唴涓嶈兘鏈夐噸鍚嶇殑闄勪欢锛�";
/** 闄勪欢椤归噷鍙栦笉鍒颁换浣曟枃浠跺悕锛堟棦娌℃湁 name 涔熸病鏈� fileName锛夋椂鐨勬彁绀� */
public static final String MSG_NO_NAME = "涓烘柟渚挎煡楠岄檮浠讹紝闄勪欢蹇呴』甯︽枃浠跺悕锛岃閲嶆柊涓婁紶锛�";
-
- /** 姹夊瓧 */
- private static final Pattern CHINESE = Pattern.compile("[\\u4e00-\\u9fa5]");
/** 闈炴硶瀛楃锛氱┖鏍硷紙鍚悇绫荤┖鐧斤級+ / \ : * ? " < > | # % */
private static final Pattern ILLEGAL = Pattern.compile("[\\s/\\\\:*?\"<>|#%]");
@@ -70,15 +68,13 @@
public static String checkName(String fileName) {
String name = fileName == null ? "" : fileName.trim();
if (name.isEmpty()) {
- return MSG_NO_CHINESE;
+ return MSG_EMPTY_NAME;
}
if (ILLEGAL.matcher(name).find()) {
return MSG_ILLEGAL;
}
String main = mainName(name);
- if (!CHINESE.matcher(main).find()) {
- return MSG_NO_CHINESE;
- }
+ // 涓嶅啀寮哄埗瑕佹眰涓枃锛涘惈涓枃銆佺函鑻辨枃銆佹暟瀛楀潎鍙�
// 鎸夊瓧绗︽暟璁★紙鐮佺偣璁℃暟锛氫腑鏂�/瀛楁瘝/鏁板瓧/鍏ㄨ鍚勮 1锛�
if (main.codePointCount(0, main.length()) > MAX_MAIN_LENGTH) {
return MSG_TOO_LONG;
--
Gitblit v1.9.3