mxd 3 éve
szülő
commit
b0bcb4ce64

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

@@ -11,75 +11,75 @@ public interface JsonCodeConstants {
 
 	JsonCode PERMISSION_INVALID = new JsonCode(-10, "无权限操作.");
 
-	JsonCode GROUP_NOT_FOUND = new JsonCode(0, "找不到分组信息");
+	JsonCode GROUP_NOT_FOUND = new JsonCode(1001, "找不到分组信息");
 
-	JsonCode NOT_SUPPORTED_GROUP_TYPE = new JsonCode(0, "不支持该分组类型");
+	JsonCode NOT_SUPPORTED_GROUP_TYPE = new JsonCode(1002, "不支持该分组类型");
 
-	JsonCode TARGET_IS_REQUIRED = new JsonCode(0, "目标网址不能为空");
+	JsonCode TARGET_IS_REQUIRED = new JsonCode(1003, "目标网址不能为空");
 
-	JsonCode SECRET_KEY_IS_REQUIRED = new JsonCode(0, "secretKey不能为空");
+	JsonCode SECRET_KEY_IS_REQUIRED = new JsonCode(1004, "secretKey不能为空");
 
-	JsonCode MOVE_NAME_CONFLICT = new JsonCode(0, "移动后名称会重复,请修改名称后在试。");
+	JsonCode MOVE_NAME_CONFLICT = new JsonCode(1005, "移动后名称会重复,请修改名称后在试。");
 
-	JsonCode SRC_GROUP_CONFLICT = new JsonCode(0, "源对象和分组不能一致");
+	JsonCode SRC_GROUP_CONFLICT = new JsonCode(1006, "源对象和分组不能一致");
 
-	JsonCode FILE_NOT_FOUND = new JsonCode(0, "找不到对应文件或分组");
+	JsonCode FILE_NOT_FOUND = new JsonCode(1007, "找不到对应文件或分组");
 
-	JsonCode RESOURCE_LOCKED = new JsonCode(0, "当前资源已被锁定,请解锁后在操作。");
+	JsonCode RESOURCE_LOCKED = new JsonCode(1008, "当前资源已被锁定,请解锁后在操作。");
 
-	JsonCode PATH_CONFLICT = new JsonCode(0, "该路径已被使用,请换一个路径在试");
+	JsonCode PATH_CONFLICT = new JsonCode(1009, "该路径已被使用,请换一个路径在试");
 
-	JsonCode RESOURCE_PATH_CONFLICT = new JsonCode(0, "资源中[%s]有冲突,请检查");
+	JsonCode RESOURCE_PATH_CONFLICT = new JsonCode(1010, "资源中[%s]有冲突,请检查");
 
-	JsonCode MOVE_PATH_CONFLICT = new JsonCode(0, "移动后路径会冲突,请换一个路径在试");
+	JsonCode MOVE_PATH_CONFLICT = new JsonCode(1011, "移动后路径会冲突,请换一个路径在试");
 
-	JsonCode REQUEST_METHOD_REQUIRED = new JsonCode(0, "请求方法不能为空");
+	JsonCode REQUEST_METHOD_REQUIRED = new JsonCode(1012, "请求方法不能为空");
 
-	JsonCode REQUEST_PATH_REQUIRED = new JsonCode(0, "请求路径不能为空");
+	JsonCode REQUEST_PATH_REQUIRED = new JsonCode(1013, "请求路径不能为空");
 
-	JsonCode FUNCTION_PATH_REQUIRED = new JsonCode(0, "函数路径不能为空");
+	JsonCode FUNCTION_PATH_REQUIRED = new JsonCode(1014, "函数路径不能为空");
 
-	JsonCode FILE_PATH_NOT_EXISTS = new JsonCode(0, "配置的文件路径不存在,请检查");
+	JsonCode FILE_PATH_NOT_EXISTS = new JsonCode(1015, "配置的文件路径不存在,请检查");
 
-	JsonCode REQUEST_PATH_CONFLICT = new JsonCode(0, "接口[{}({})]与应用冲突,无法注册");
+	JsonCode REQUEST_PATH_CONFLICT = new JsonCode(1016, "接口[{}({})]与应用冲突,无法注册");
 
-	JsonCode SCRIPT_REQUIRED = new JsonCode(0, "脚本内容不能为空");
+	JsonCode SCRIPT_REQUIRED = new JsonCode(1017, "脚本内容不能为空");
 
-	JsonCode NAME_REQUIRED = new JsonCode(0, "名称不能为空");
+	JsonCode NAME_REQUIRED = new JsonCode(1018, "名称不能为空");
 
-	JsonCode PATH_REQUIRED = new JsonCode(0, "路径不能为空");
+	JsonCode PATH_REQUIRED = new JsonCode(1019, "路径不能为空");
 
-	JsonCode DS_URL_REQUIRED = new JsonCode(0, "jdbcURL不能为空");
+	JsonCode DS_URL_REQUIRED = new JsonCode(1020, "jdbcURL不能为空");
 
-	JsonCode DS_KEY_REQUIRED = new JsonCode(0, "key不能为空");
+	JsonCode DS_KEY_REQUIRED = new JsonCode(1021, "key不能为空");
 
-	JsonCode DS_KEY_CONFLICT = new JsonCode(0, "数据源key已被使用,请更换后在试");
+	JsonCode DS_KEY_CONFLICT = new JsonCode(1022, "数据源key已被使用,请更换后在试");
 
-	JsonCode GROUP_ID_REQUIRED = new JsonCode(0, "请选择分组");
+	JsonCode GROUP_ID_REQUIRED = new JsonCode(1023, "请选择分组");
 
-	JsonCode CRON_ID_REQUIRED = new JsonCode(0, "cron表达式不能为空");
+	JsonCode CRON_ID_REQUIRED = new JsonCode(1024, "cron表达式不能为空");
 
-	JsonCode NAME_INVALID = new JsonCode(0, "名称不能包含特殊字符,只允许中文、数字、字母以及+_-.()的组合且不能.开头");
+	JsonCode NAME_INVALID = new JsonCode(1025, "名称不能包含特殊字符,只允许中文、数字、字母以及+_-.()的组合且不能.开头");
 
-	JsonCode DATASOURCE_KEY_INVALID = new JsonCode(0, "数据源Key不能包含特殊字符,只允许中文、数字、字母以及_组合");
+	JsonCode DATASOURCE_KEY_INVALID = new JsonCode(1026, "数据源Key不能包含特殊字符,只允许中文、数字、字母以及_组合");
 
-	JsonCode FILE_SAVE_FAILURE = new JsonCode(0, "保存失败,同一组下分组名称不能重复且不能包含特殊字符。");
+	JsonCode FILE_SAVE_FAILURE = new JsonCode(1027, "保存失败,同一组下分组名称不能重复且不能包含特殊字符。");
 
-	JsonCode PARAMETER_INVALID = new JsonCode(0, "参数验证失败");
+	JsonCode PARAMETER_INVALID = new JsonCode(1028, "参数验证失败");
 
-	JsonCode HEADER_INVALID = new JsonCode(0, "header验证失败");
+	JsonCode HEADER_INVALID = new JsonCode(1029, "header验证失败");
 
-	JsonCode PATH_VARIABLE_INVALID = new JsonCode(0, "路径变量验证失败");
+	JsonCode PATH_VARIABLE_INVALID = new JsonCode(1030, "路径变量验证失败");
 
-	JsonCode BODY_INVALID = new JsonCode(0, "body验证失败");
+	JsonCode BODY_INVALID = new JsonCode(1031, "body验证失败");
 
-	JsonCode FILE_IS_REQUIRED = new JsonCode(0, "请上传文件");
+	JsonCode FILE_IS_REQUIRED = new JsonCode(1032, "请上传文件");
 
-	JsonCode SIGN_IS_INVALID = new JsonCode(0, "签名验证失败,请检查秘钥是否正确");
+	JsonCode SIGN_IS_INVALID = new JsonCode(1033, "签名验证失败,请检查秘钥是否正确");
 
-	JsonCode BACKUP_NOT_ENABLED = new JsonCode(0, "未启用备份,无法操作");
+	JsonCode BACKUP_NOT_ENABLED = new JsonCode(1034, "未启用备份,无法操作");
 
-	JsonCode API_NOT_FOUND = new JsonCode(1001, "api not found");
+	JsonCode API_NOT_FOUND = new JsonCode(1035, "找不到接口");
 
 	default void notNull(Object value, JsonCode jsonCode) {
 		if (value == null) {

+ 1 - 1
magic-api/src/main/java/org/ssssssss/magicapi/service/impl/DefaultMagicResourceService.java

@@ -261,7 +261,7 @@ public class DefaultMagicResourceService implements MagicResourceService, JsonCo
 		Group newGroup = new Group();
 		newGroup.setType(srcGroup.getType());
 		newGroup.setParentId(groupId);
-		newGroup.setName(srcGroup.getName() + "(复制)");
+		newGroup.setName(srcGroup.getName() + "(Copy)");
 		newGroup.setPath(Objects.toString(srcGroup.getPath(), "") + "_copy");
 		newGroup.setOptions(srcGroup.getOptions());
 		newGroup.setPaths(srcGroup.getPaths());