包重构完成

src/main/java/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: start.Start
-

src/main/java/config/WebConfig.java → src/main/java/common/config/WebConfig.java

@@ -1,15 +1,16 @@
-package config;
+package common.config;
 
 import com.jfinal.config.*;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.druid.DruidPlugin;
+import com.jfinal.server.undertow.UndertowServer;
 import com.jfinal.template.Engine;
-import controller.EthMevController;
-import controller.HelloController;
-import controller.SwapPathController;
-import memory.SwapPathMemoryDb;
-import model.EthMev;
-import model.SwapPath;
+import modules.ethmev.EthMevController;
+import modules.hello.HelloController;
+import modules.swappath.SwapPathController;
+import common.memory.SwapPathMemoryDb;
+import common.model.EthMev;
+import common.model.SwapPath;
 
 import java.io.File;
 
@@ -19,6 +20,10 @@ public class WebConfig extends JFinalConfig {
     private static String user = "root";
     private static String password = "Qwe410410.";
 
+    public static void main(String[] args) {
+        UndertowServer.start(WebConfig.class, 8088, WebConfig.IsDev);
+    }
+
     static {
         // 识别运行环境
         File file = new File(".debug");

src/main/java/interceptor/AuthInterceptor.java → src/main/java/common/interceptor/AuthInterceptor.java

@@ -1,11 +1,11 @@
-package interceptor;
+package common.interceptor;
 
 import com.jfinal.aop.Interceptor;
 import com.jfinal.aop.Invocation;
 import com.jfinal.core.Controller;
 import com.jfinal.kit.HashKit;
 import com.jfinal.kit.StrKit;
-import util.MyRet;
+import common.utils.MyRet;
 
 public class AuthInterceptor implements Interceptor {
     @Override

src/main/java/memory/SwapPathMemoryDb.java → src/main/java/common/memory/SwapPathMemoryDb.java

@@ -1,8 +1,8 @@
-package memory;
+package common.memory;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import model.SwapPath;
+import common.model.SwapPath;
 
 import java.util.List;
 

src/main/java/model/Config.java → src/main/java/common/model/Config.java

@@ -1,4 +1,4 @@
-package model;
+package common.model;
 
 import com.jfinal.plugin.activerecord.Model;
 

src/main/java/model/EthMev.java → src/main/java/common/model/EthMev.java

@@ -1,4 +1,4 @@
-package model;
+package common.model;
 
 import com.jfinal.plugin.activerecord.Model;
 

src/main/java/model/InputData.java → src/main/java/common/model/InputData.java

@@ -1,4 +1,4 @@
-package model;
+package common.model;
 
 import com.jfinal.plugin.activerecord.Model;
 

src/main/java/model/SwapPath.java → src/main/java/common/model/SwapPath.java

@@ -1,4 +1,4 @@
-package model;
+package common.model;
 
 import com.jfinal.plugin.activerecord.Model;
 

src/main/java/util/MyRet.java → src/main/java/common/utils/MyRet.java

@@ -1,4 +1,4 @@
-package util;
+package common.utils;
 
 import com.jfinal.kit.Ret;
 

src/main/java/controller/EthMevController.java → src/main/java/modules/ethmev/EthMevController.java

@@ -1,21 +1,19 @@
-package controller;
+package modules.ethmev;
 
 import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 import com.alibaba.fastjson.JSONObject;
 import com.jfinal.kit.StrKit;
-import interceptor.AuthInterceptor;
-import model.EthMev;
-import service.EthMevService;
-import util.MyRet;
+import common.model.EthMev;
+import common.utils.MyRet;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Before(common.interceptor.AuthInterceptor.class)
 public class EthMevController extends Controller {
     EthMevService service = new EthMevService();
 
-    @Before(AuthInterceptor.class)
     public void appendOrUpdate() {
         if (StrKit.isBlank(getPara("block"))
         || StrKit.isBlank(getPara("hash"))
@@ -47,7 +45,6 @@ public class EthMevController extends Controller {
         }
     }
 
-    @Before(AuthInterceptor.class)
     public void deleteByHash() {
         if (StrKit.isBlank(getPara("hash"))) {
             renderJson(MyRet.create().setFail().setMsg("请填写Hash，请检查参数。"));
@@ -71,7 +68,6 @@ public class EthMevController extends Controller {
         }
     }
 
-    @Before(AuthInterceptor.class)
     public void findByHash() {
         if (StrKit.isBlank(getPara("hash"))) {
             renderJson(MyRet.create().setFail().setMsg("hash为空。"));
@@ -84,7 +80,6 @@ public class EthMevController extends Controller {
         ));
     }
 
-    @Before(AuthInterceptor.class)
     public void findByBlock() {
         if (StrKit.isBlank(getPara("block"))) {
             renderJson(MyRet.create().setFail().setMsg("block为空。"));
@@ -95,7 +90,6 @@ public class EthMevController extends Controller {
         ));
     }
 
-    @Before(AuthInterceptor.class)
     public void findByDataVague() {
         if (StrKit.isBlank(getPara("dataVague"))) {
             renderJson(MyRet.create().setFail().setMsg("data模糊值为空。"));
@@ -108,7 +102,6 @@ public class EthMevController extends Controller {
         ));
     }
 
-    @Before(AuthInterceptor.class)
     public void findByHashOrBlockOrDataVague() {
         String block = getPara("block");
         String hash = getPara("hash");
@@ -162,7 +155,6 @@ public class EthMevController extends Controller {
         renderJson(MyRet.create().setOk().setMsg("查询成功").setData(ethMevList));
     }
 
-    @Before(AuthInterceptor.class)
     public void findByHashOrBlockOrDataVaguePending() {
         String block = getPara("block");
         String hash = getPara("hash");
@@ -216,7 +208,6 @@ public class EthMevController extends Controller {
         renderJson(MyRet.create().setOk().setMsg("查询成功").setData(ethMevList));
     }
 
-    @Before(AuthInterceptor.class)
     public void findByJsonCondition() {
         String jsonConditionStr = getPara("jsonCondition");
 

src/main/java/service/EthMevService.java → src/main/java/modules/ethmev/EthMevService.java

@@ -1,8 +1,8 @@
-package service;
+package modules.ethmev;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import model.EthMev;
+import common.model.EthMev;
 
 import java.math.BigDecimal;
 import java.util.List;

src/main/java/controller/HelloController.java → src/main/java/modules/hello/HelloController.java

@@ -1,7 +1,6 @@
-package controller;
+package modules.hello;
 
 import com.jfinal.core.Controller;
-import model.InputData;
 
 public class HelloController extends Controller {
     public void index() {

src/main/java/controller/SwapPathController.java → src/main/java/modules/swappath/SwapPathController.java

@@ -1,18 +1,16 @@
-package controller;
+package modules.swappath;
 
 import com.alibaba.fastjson.JSONArray;
 import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 import com.jfinal.kit.StrKit;
-import interceptor.AuthInterceptor;
-import model.SwapPath;
-import service.SwapPathService;
-import util.MyRet;
+import common.model.SwapPath;
+import common.utils.MyRet;
 
+@Before(common.interceptor.AuthInterceptor.class)
 public class SwapPathController extends Controller {
     SwapPathService service = new SwapPathService();
 
-    @Before(AuthInterceptor.class)
     public void appendOrUpdate() {
         if (StrKit.isBlank(getPara("sum_value"))
         || StrKit.isBlank(getPara("level"))
@@ -41,7 +39,6 @@ public class SwapPathController extends Controller {
         }
     }
 
-    @Before(AuthInterceptor.class)
     public void findBySumValueAndLevel() {
         if (StrKit.isBlank(getPara("sum_value"))
         || StrKit.isBlank(getPara("level"))) {
@@ -60,7 +57,6 @@ public class SwapPathController extends Controller {
         }
     }
 
-    @Before(AuthInterceptor.class)
     public void findLevel2PathByLpAddress() {
         if (StrKit.isBlank(getPara("lp_address"))) {
             renderJson(MyRet.create().setFail().setMsg("缺少参数，请检查参数[lp_address]。"));

src/main/java/service/SwapPathService.java → src/main/java/modules/swappath/SwapPathService.java

@@ -1,9 +1,7 @@
-package service;
+package modules.swappath;
 
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import memory.SwapPathMemoryDb;
-import model.SwapPath;
+import common.memory.SwapPathMemoryDb;
 
 public class SwapPathService {
     public JSONArray generatePathListByLpAddress(String lpAddress) {

src/main/java/start/Start.java

@@ -1,10 +0,0 @@
-package start;
-
-import com.jfinal.server.undertow.UndertowServer;
-import config.WebConfig;
-
-public class Start {
-    public static void main(String[] args) {
-        UndertowServer.start(WebConfig.class, 8088, WebConfig.IsDev);
-    }
-}

src/main/webapp/WEB-INF/web.xml

@@ -12,7 +12,7 @@
     <filter-class>com.jfinal.core.JFinalFilter</filter-class>
     <init-param>
       <param-name>configClass</param-name>
-      <param-value>config.WebConfig</param-value>
+      <param-value>common.config.WebConfig</param-value>
     </init-param>
   </filter>