diff --git a/dsRes.iml b/dsRes.iml
new file mode 100644
index 00000000..0c5c4d56
--- /dev/null
+++ b/dsRes.iml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dsRes/src/main/java/com/dsideal/resource/Const/RetBean.java b/dsRes/src/main/java/com/dsideal/resource/Const/RetBean.java
new file mode 100644
index 00000000..acd5e0aa
--- /dev/null
+++ b/dsRes/src/main/java/com/dsideal/resource/Const/RetBean.java
@@ -0,0 +1,32 @@
+package com.dsideal.resource.Const;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class RetBean {
+ /**
+ * {
+ * "code": 200,
+ * "data": { },
+ * "msg": "成功"
+ * }
+ */
+ private int code;
+ private String msg;
+ private JSONObject data;
+
+ public static final Integer SUCCESS = 200;
+ public static final Integer ERROR = 500;
+ public static final Integer OVERDUE = 401;
+ public static final Integer TIMEOUT = 30000;
+
+ public RetBean(int code, String msg, JSONObject data) {
+ this.code = code;
+ this.msg = msg;
+ this.data = data;
+ }
+
+}
diff --git a/dsRes/src/main/java/com/dsideal/resource/Controller/IndexController.java b/dsRes/src/main/java/com/dsideal/resource/Index/IndexController.java
similarity index 77%
rename from dsRes/src/main/java/com/dsideal/resource/Controller/IndexController.java
rename to dsRes/src/main/java/com/dsideal/resource/Index/IndexController.java
index 4cb493c5..c7e668fe 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Controller/IndexController.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Index/IndexController.java
@@ -1,4 +1,4 @@
-package com.dsideal.resource.Controller;
+package com.dsideal.resource.Index;
import com.jfinal.core.Controller;
diff --git a/dsRes/src/main/java/com/dsideal/resource/Menu/Controller/MenuController.java b/dsRes/src/main/java/com/dsideal/resource/Menu/Controller/MenuController.java
new file mode 100644
index 00000000..0c6025f8
--- /dev/null
+++ b/dsRes/src/main/java/com/dsideal/resource/Menu/Controller/MenuController.java
@@ -0,0 +1,36 @@
+package com.dsideal.resource.Menu.Controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.dsideal.resource.Const.RetBean;
+import com.dsideal.resource.Menu.Model.MenuModel;
+import com.dsideal.resource.Util.JwtUtil;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.jfinal.aop.Before;
+import com.jfinal.core.Controller;
+import com.jfinal.ext.interceptor.GET;
+import io.jsonwebtoken.Claims;
+
+public class MenuController extends Controller {
+ MenuModel mm = new MenuModel();
+
+ /**
+ * 功能：获取人员可以看到的菜单
+ */
+ @Before({GET.class})
+ public void getPersonMenu() throws JsonProcessingException {
+ //当前登录的人员是谁？
+ String token = getRequest().getHeader("Authorization");
+ if (token == null) {
+ renderJson(new RetBean(RetBean.ERROR, "JWT token 为空，无法解析人员信息，请重新登录!", null));
+ return;
+ }
+ Claims claims = JwtUtil.getClaims(token);
+ int identity_id = Integer.parseInt(claims.get("identity_id").toString());
+ String person_id = claims.get("person_id").toString();
+
+ //所有菜单
+ String result = mm.getMenuJson();
+ renderJson(new RetBean(RetBean.SUCCESS, "获取菜单成功！", JSONObject.parseObject(result)));
+ //后续需要根据人员角色菜单关系，去掉不可见菜单
+ }
+}
diff --git a/dsRes/src/main/java/com/dsideal/resource/Menu/GetVueMenu.java b/dsRes/src/main/java/com/dsideal/resource/Menu/Model/MenuModel.java
similarity index 79%
rename from dsRes/src/main/java/com/dsideal/resource/Menu/GetVueMenu.java
rename to dsRes/src/main/java/com/dsideal/resource/Menu/Model/MenuModel.java
index d067cd35..33bde6f4 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Menu/GetVueMenu.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Menu/Model/MenuModel.java
@@ -1,4 +1,4 @@
-package com.dsideal.resource.Menu;
+package com.dsideal.resource.Menu.Model;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
@@ -17,7 +17,7 @@ import lombok.Setter;
import java.util.ArrayList;
import java.util.List;
-public class GetVueMenu {
+public class MenuModel {
//子类1：菜单
@Getter
@Setter
@@ -40,18 +40,9 @@ public class GetVueMenu {
private boolean isAffix;
private boolean isKeepAlive;
}
- public static GetVueMenu gm=new GetVueMenu();
- public static void main(String[] args) throws JsonProcessingException {
- String configFile = "application_dev.yaml";
- Prop PropKit = new YamlProp(configFile);
- HikariCpPlugin hp = new HikariCpPlugin(PropKit.get("mysql.jdbcUrl"), PropKit.get("mysql.user"),
- PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName"));
- hp.start();
- // 配置ActiveRecord插件
- ActiveRecordPlugin arp = new ActiveRecordPlugin(hp);
- arp.start();
- List