浏览代码

接口&函数&分组名字放宽限制,新增支持-.()组合

mxd 3 年之前
父节点
当前提交
45214baf40

+ 1 - 3
magic-api/src/main/java/org/ssssssss/magicapi/model/JsonCodeConstants.java

@@ -39,7 +39,7 @@ public interface JsonCodeConstants {
 
 	JsonCode FUNCTION_NAME_REQUIRED = new JsonCode(0, "函数名称不能为空");
 
-	JsonCode NAME_INVALID = new JsonCode(0, "名称不能包含特殊字符,只允许中文、数字、字母以及_组合");
+	JsonCode NAME_INVALID = new JsonCode(0, "名称不能包含特殊字符,只允许中文、数字、字母以及+_-.()的组合且不能.开头");
 
 	JsonCode DATASOURCE_KEY_INVALID = new JsonCode(0, "数据源Key不能包含特殊字符,只允许中文、数字、字母以及_组合");
 
@@ -69,8 +69,6 @@ public interface JsonCodeConstants {
 
 	JsonCode UPLOAD_PATH_CONFLICT = new JsonCode(0, "上传后%s路径会有冲突,请检查");
 
-	JsonCode DEBUG_SESSION_NOT_FOUND = new JsonCode(0, "debug session not found!");
-
 	JsonCode API_NOT_FOUND = new JsonCode(1001, "api not found");
 
 	JsonCode FUNCTION_NOT_FOUND = new JsonCode(1002, "function not found");

+ 1 - 2
magic-api/src/main/java/org/ssssssss/magicapi/utils/IoUtils.java

@@ -15,7 +15,7 @@ public class IoUtils {
 
 	private static final Logger logger = LoggerFactory.getLogger(IoUtils.class);
 
-	private static final Pattern FILE_NAME_PATTERN = Pattern.compile("^[\\u4e00-\\u9fa5_a-zA-Z0-9]+$");
+	private static final Pattern FILE_NAME_PATTERN = Pattern.compile("^(?!\\.)[\\u4e00-\\u9fa5_a-zA-Z0-9.\\-()]+$");
 
 	public static boolean validateFileName(String name) {
 		return FILE_NAME_PATTERN.matcher(name).matches();
@@ -152,6 +152,5 @@ public class IoUtils {
 				logger.warn("DataSource can not close");
 			}
 		}
-
 	}
 }