'commit'

dsRes.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$/dsRes" dumb="true">
+      <sourceFolder url="file://$MODULE_DIR$/dsRes/src/main/resource" type="java-resource" />
+    </content>
+  </component>
+</module>

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;
+    }
+
+}

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;
 

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)));
+        //后续需要根据人员角色菜单关系，去掉不可见菜单
+    }
+}

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<Menu> rootMenu = gm.fetchMenu(-1);  // 从父ID为-1开始递归
+    public String getMenuJson() throws JsonProcessingException {
+        List<Menu> rootMenu = fetchMenu(-1);  // 从父ID为-1开始递归
         //输出JSON格式
         ObjectMapper mapper = new ObjectMapper();
         String json = mapper.writeValueAsString(rootMenu.getFirst());
@@ -59,8 +50,7 @@ public class GetVueMenu {
         //去掉children为空的节点
         JsonNode root = mapper.readTree(json);
         removeEmptyChildren(root);
-        String cleanedJson = mapper.writeValueAsString(root);
+        return mapper.writeValueAsString(root);
-        System.out.println(cleanedJson);
     }
 
     /**

dsRes/src/main/java/com/dsideal/resource/ResApplication.java

@@ -1,7 +1,8 @@
 package com.dsideal.resource;
 
-import com.dsideal.resource.Controller.IndexController;
+import com.dsideal.resource.Index.IndexController;
 import com.dsideal.resource.Interceptor.*;
+import com.dsideal.resource.Menu.Controller.MenuController;
 import com.dsideal.resource.Plugin.YamlProp;
 import com.dsideal.resource.Util.FileUtil;
 import com.dsideal.resource.Util.LogBackLogFactory;
@@ -57,6 +58,8 @@ public class ResApplication extends JFinalConfig {
     public void configRoute(Routes me) {
         //默认页面
         me.add("/", IndexController.class);
+        //菜单
+        me.add("/menu", MenuController.class);
     }
 
     @Override

操作文档/5、k8s集群.md

@@ -838,5 +838,12 @@ kubectl delete rs <name>
 
 
 
+```
+$kubectl create secret docker-registry \
+registry-secret-smokelee.com \
+--docker-server=registry.i.smokelee.com:5000 \
+--docker-username=opuser --docker-password=123
+```
+