diff --git a/framework-core/pom.xml b/framework-core/pom.xml index 8fd6f29..2ad3cb9 100644 --- a/framework-core/pom.xml +++ b/framework-core/pom.xml @@ -5,7 +5,7 @@ com.unionmed unionmed-framework - 0.0.18 + 0.0.19 4.0.0 diff --git a/framework-core/src/main/java/com/unionmed/framework/spring/mvc/BaseReturnUtils.java b/framework-core/src/main/java/com/unionmed/framework/spring/mvc/BaseReturnUtils.java index b0d8a6c..fa3d154 100644 --- a/framework-core/src/main/java/com/unionmed/framework/spring/mvc/BaseReturnUtils.java +++ b/framework-core/src/main/java/com/unionmed/framework/spring/mvc/BaseReturnUtils.java @@ -1,5 +1,7 @@ package com.unionmed.framework.spring.mvc; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.unionmed.framework.util.ObjectUtils; @@ -11,11 +13,18 @@ import java.util.Map; */ public final class BaseReturnUtils { + public static void main(String[] args) { + JSONObject object = new JSONObject(); + object.put("code", "200"); + object.put("errCode", "200"); + object.put("message", "成功"); + object.put("data", new JSONArray()); + + System.err.println(JSON.toJSONString(parse(object))); + } + public static BaseReturn parse(JSONObject jsn) { - if (ObjectUtils.isEmpty(jsn)) { - return BaseReturn.suc(BaseReturn.suc()); - } - if (isBaseReturnFormat(jsn)) { + if (ObjectUtils.notEmpty(jsn) && isBaseReturnFormat(jsn)) { Object data = jsn.get("data"); if (data instanceof JSONObject) { return parse(jsn, (JSONObject) data); diff --git a/framework-core/src/main/java/com/unionmed/framework/util/ObjectUtils.java b/framework-core/src/main/java/com/unionmed/framework/util/ObjectUtils.java index 33e82c1..51c7b61 100644 --- a/framework-core/src/main/java/com/unionmed/framework/util/ObjectUtils.java +++ b/framework-core/src/main/java/com/unionmed/framework/util/ObjectUtils.java @@ -200,6 +200,31 @@ public class ObjectUtils { return false; } + public static String substring(String s, int start) { + return substring(s, start, 0); + } + + public static String substring(String s, int start, int end) { + if (ObjectUtils.isEmpty(s)) return s; + + if (start < 0) { + start = s.length() + start; + } + + if (end == 0) { + end = s.length(); + } else if (end < 0) { + end = s.length() + end; + } else { + end = start + end; + } + + if (end > s.length()) + end = s.length(); + + return end == s.length() ? s.substring(start) : s.substring(start, end); + } + /** * 打马赛克 * diff --git a/framework-orm/pom.xml b/framework-orm/pom.xml index b131dd6..843c178 100644 --- a/framework-orm/pom.xml +++ b/framework-orm/pom.xml @@ -5,7 +5,7 @@ unionmed-framework com.unionmed - 0.0.18 + 0.0.19 4.0.0 diff --git a/framework-test/pom.xml b/framework-test/pom.xml index bf9ee20..8d9c114 100644 --- a/framework-test/pom.xml +++ b/framework-test/pom.xml @@ -5,7 +5,7 @@ com.unionmed unionmed-framework - 0.0.18 + 0.0.19 4.0.0 diff --git a/pom.xml b/pom.xml index 3bffa40..7e259bd 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 com.unionmed unionmed-framework - 0.0.18 + 0.0.19 pom unionmed-framework