ソースを参照

重构PropKit,使其支持绝对路径

龚成明 3 年 前
コミット
6022771f37

+ 2 - 8
src/main/java/common/config/WebConfig.java

@@ -2,11 +2,11 @@ package common.config;
 
 import com.jfinal.config.*;
 import com.jfinal.kit.Prop;
-import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.server.undertow.UndertowServer;
 import com.jfinal.template.Engine;
+import common.utils.config.MyPropKit;
 import modules.ethmev.EthMevController;
 import modules.hello.HelloController;
 import modules.swappath.SwapPathController;
@@ -14,8 +14,6 @@ import common.memory.SwapPathMemoryDb;
 import common.model.EthMev;
 import common.model.SwapPath;
 
-import java.io.File;
-
 public class WebConfig extends JFinalConfig {
     static Prop p;
 
@@ -25,11 +23,7 @@ public class WebConfig extends JFinalConfig {
 
     static void loadConfig() {
         if (p == null) {
-            try {
-                p = PropKit.use(new File("/webapp/backend/evi.properties"));
-            } catch (Exception e) {
-                p = PropKit.useFirstFound("evi-dev.properties");
-            }
+            p = MyPropKit.useFirstFound("/webapp/backend/evi.properties", "./evi-dev.properties");
         }
     }
 

+ 1 - 1
src/main/java/common/interceptor/AuthInterceptor.java

@@ -5,7 +5,7 @@ import com.jfinal.aop.Invocation;
 import com.jfinal.core.Controller;
 import com.jfinal.kit.HashKit;
 import com.jfinal.kit.StrKit;
-import common.utils.MyRet;
+import common.utils.http.MyRet;
 
 public class AuthInterceptor implements Interceptor {
     @Override

+ 21 - 0
src/main/java/common/utils/config/MyPropKit.java

@@ -0,0 +1,21 @@
+package common.utils.config;
+
+import com.jfinal.kit.Prop;
+import com.jfinal.kit.PropKit;
+
+import java.io.File;
+
+public class MyPropKit {
+
+    private MyPropKit() {}
+
+    public static Prop useFirstFound(String ...fileNames) {
+        for (String fileName : fileNames) {
+            try {
+                return PropKit.use(new File(fileName));
+            } catch (Exception ignored) {}
+        }
+
+        throw new IllegalArgumentException("No available file.");
+    }
+}

+ 5 - 5
src/main/java/common/utils/MyRet.java → src/main/java/common/utils/http/MyRet.java

@@ -1,14 +1,13 @@
-package common.utils;
+package common.utils.http;
 
 import com.jfinal.kit.Ret;
 
 public class MyRet extends Ret {
 
-    public static final int CODE_OK = 0;                // 正常
+    public static final int CODE_OK = 0;                // 成功状态
+    public static final int CODE_FAIL = 1;              // 失败状态
 
-    public static final int CODE_NO_LOGIN = 1;          // 未登录
-
-    public static final int CODE_NO_POWER = 2;          // 没有权限
+    private MyRet() {}
 
     public static MyRet create() {
         return new MyRet();
@@ -25,6 +24,7 @@ public class MyRet extends Ret {
     @Override
     public MyRet setFail() {
         this.set("state", false);
+        this.setCode(MyRet.CODE_FAIL);
 
         return this;
     }

+ 1 - 1
src/main/java/modules/ethmev/EthMevController.java

@@ -5,7 +5,7 @@ import com.jfinal.core.Controller;
 import com.alibaba.fastjson.JSONObject;
 import com.jfinal.kit.StrKit;
 import common.model.EthMev;
-import common.utils.MyRet;
+import common.utils.http.MyRet;
 
 import java.util.ArrayList;
 import java.util.List;

+ 1 - 1
src/main/java/modules/swappath/SwapPathController.java

@@ -5,7 +5,7 @@ import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 import com.jfinal.kit.StrKit;
 import common.model.SwapPath;
-import common.utils.MyRet;
+import common.utils.http.MyRet;
 
 @Before(common.interceptor.AuthInterceptor.class)
 public class SwapPathController extends Controller {