1. 代码优化

master
陈峰 1 year ago
parent aeb3256b07
commit f7f4a43821
  1. 2
      framework-core/pom.xml
  2. 17
      framework-core/src/main/java/com/unionmed/framework/spring/mvc/BaseReturnUtils.java
  3. 25
      framework-core/src/main/java/com/unionmed/framework/util/ObjectUtils.java
  4. 2
      framework-orm/pom.xml
  5. 2
      framework-test/pom.xml
  6. 2
      pom.xml

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.unionmed</groupId> <groupId>com.unionmed</groupId>
<artifactId>unionmed-framework</artifactId> <artifactId>unionmed-framework</artifactId>
<version>0.0.18</version> <version>0.0.19</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

@ -1,5 +1,7 @@
package com.unionmed.framework.spring.mvc; package com.unionmed.framework.spring.mvc;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.unionmed.framework.util.ObjectUtils; import com.unionmed.framework.util.ObjectUtils;
@ -11,11 +13,18 @@ import java.util.Map;
*/ */
public final class BaseReturnUtils { 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) { public static BaseReturn parse(JSONObject jsn) {
if (ObjectUtils.isEmpty(jsn)) { if (ObjectUtils.notEmpty(jsn) && isBaseReturnFormat(jsn)) {
return BaseReturn.suc(BaseReturn.suc());
}
if (isBaseReturnFormat(jsn)) {
Object data = jsn.get("data"); Object data = jsn.get("data");
if (data instanceof JSONObject) { if (data instanceof JSONObject) {
return parse(jsn, (JSONObject) data); return parse(jsn, (JSONObject) data);

@ -200,6 +200,31 @@ public class ObjectUtils {
return false; 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);
}
/** /**
* 打马赛克 * 打马赛克
* *

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>unionmed-framework</artifactId> <artifactId>unionmed-framework</artifactId>
<groupId>com.unionmed</groupId> <groupId>com.unionmed</groupId>
<version>0.0.18</version> <version>0.0.19</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.unionmed</groupId> <groupId>com.unionmed</groupId>
<artifactId>unionmed-framework</artifactId> <artifactId>unionmed-framework</artifactId>
<version>0.0.18</version> <version>0.0.19</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.unionmed</groupId> <groupId>com.unionmed</groupId>
<artifactId>unionmed-framework</artifactId> <artifactId>unionmed-framework</artifactId>
<version>0.0.18</version> <version>0.0.19</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>unionmed-framework</name> <name>unionmed-framework</name>

Loading…
Cancel
Save