🎨 refactor(1.1.1): improve code style

1) StringUtils#isInclude 2) module cprouter
ruan4261 · Mar 8, 2021 · f2b3b7c · f2b3b7c
1 parent 7116cd7
commit f2b3b7c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/src/main/java/weaver/micro/devkit/util/StringUtils.java b/src/main/java/weaver/micro/devkit/util/StringUtils.java
@@ -24,13 +24,16 @@ public static String makeStackTraceInfo(Throwable t) {
      * The minus sign cannot be used as separators.
      */
     public static boolean isInclude(String s1, int val) {
-        Assert.notEmpty(s1);
-        int offset = 0;
+        Assert.notNull(s1);
         int len = s1.length();
+        if (len == 0)
+            return false;
+
         String s2 = Integer.toString(val);
         int wid = s2.length();
         int lastPossible = len - wid;
 
+        int offset = 0;
         while (offset <= lastPossible) {
             offset = s1.indexOf(s2, offset);
             if (offset == -1)

diff --git a/web/WEB-INF/micro/devkit/cprouter/router.jsp b/web/WEB-INF/micro/devkit/cprouter/router.jsp
@@ -49,21 +49,12 @@
 
     while (rs.next()) {
         // 是否生效
-        boolean active = false;
-
         int model = rs.getInt("model");
+        String nodeGroup = rs.getString("nodeid");
 
-        if (model == 0) {
-            active = true;
-        } else {
-            String nodeGroup = rs.getString("nodeid");
-            boolean modelMatch = StringUtils.isInclude(nodeGroup, nodeid);
-
-            if ((model == 1 && modelMatch) || (model == 2 && !modelMatch))
-                active = true;
-        }
-
-        if (active) {
+        if (model == 0
+                || (model == 1 && StringUtils.isInclude(nodeGroup, nodeid))
+                || (model == 2 && !StringUtils.isInclude(nodeGroup, nodeid))) {
             String path = rs.getString("custompage");
             int fileType = rs.getInt("file_type");
             switch (fileType) {