!4 fix(service): can't load list when create a service entity

Merge pull request !4 from onebytes/fix/3.1.1

.workflow/branch-pipeline.yml

@@ -0,0 +1,53 @@
+version: '1.0'
+name: branch-pipeline
+displayName: BranchPipeline
+stages:
+  - stage: 
+    name: compile
+    displayName: 编译
+    steps:
+      - step: build@maven
+        name: build_maven
+        displayName: Maven 构建
+        # 支持6、7、8、9、10、11六个版本
+        jdkVersion: 8
+        # 支持2.2.1、3.2.5、3.3.9、3.5.2、3.5.3、3.5.4、3.6.1、3.6.3八个版本
+        mavenVersion: 3.3.9
+        # 构建命令
+        commands:
+          - mvn -B clean package -Dmaven.test.skip=true
+        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
+        artifacts:
+            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
+          - name: BUILD_ARTIFACT
+            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径，如通常jar包在target目录下。当前目录为代码库根目录
+            path:
+              - ./target
+      - step: publish@general_artifacts
+        name: publish_general_artifacts
+        displayName: 上传制品
+        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
+        dependArtifact: BUILD_ARTIFACT
+        # 上传到制品库时的制品命名，默认output
+        artifactName: output
+        dependsOn: build_maven
+  - stage: 
+    name: release
+    displayName: 发布
+    steps:
+      - step: publish@release_artifacts
+        name: publish_release_artifacts
+        displayName: '发布'
+        # 上游上传制品任务的产出
+        dependArtifact: output
+        # 发布制品版本号
+        version: '1.0.0.0'
+        # 是否开启版本号自增，默认开启
+        autoIncrement: true
+triggers:
+  push:
+    branches:
+      exclude:
+        - master
+      include:
+        - .*

.workflow/master-pipeline.yml

@@ -0,0 +1,51 @@
+version: '1.0'
+name: master-pipeline
+displayName: MasterPipeline
+stages:
+  - stage: 
+    name: compile
+    displayName: 编译
+    steps:
+      - step: build@maven
+        name: build_maven
+        displayName: Maven 构建
+        # 支持6、7、8、9、10、11六个版本
+        jdkVersion: 8
+        # 支持2.2.1、3.2.5、3.3.9、3.5.2、3.5.3、3.5.4、3.6.1、3.6.3八个版本
+        mavenVersion: 3.3.9
+        # 构建命令
+        commands:
+          - mvn -B clean package -Dmaven.test.skip=true
+        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
+        artifacts:
+            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
+          - name: BUILD_ARTIFACT
+            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径，如通常jar包在target目录下。当前目录为代码库根目录
+            path:
+              - ./target
+      - step: publish@general_artifacts
+        name: publish_general_artifacts
+        displayName: 上传制品
+        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
+        dependArtifact: BUILD_ARTIFACT
+        # 上传到制品库时的制品命名，默认output
+        artifactName: output
+        dependsOn: build_maven
+  - stage: 
+    name: release
+    displayName: 发布
+    steps:
+      - step: publish@release_artifacts
+        name: publish_release_artifacts
+        displayName: '发布'
+        # 上游上传制品任务的产出
+        dependArtifact: output
+        # 发布制品版本号
+        version: '1.0.0.0'
+        # 是否开启版本号自增，默认开启
+        autoIncrement: true
+triggers:
+  push:
+    branches:
+      include:
+        - master

.workflow/pr-pipeline.yml

@@ -0,0 +1,40 @@
+version: '1.0'
+name: pr-pipeline
+displayName: PRPipeline
+stages:
+  - stage: 
+    name: compile
+    displayName: 编译
+    steps:
+      - step: build@maven
+        name: build_maven
+        displayName: Maven 构建
+        # 支持6、7、8、9、10、11六个版本
+        jdkVersion: 8
+        # 支持2.2.1、3.2.5、3.3.9、3.5.2、3.5.3、3.5.4、3.6.1、3.6.3八个版本
+        mavenVersion: 3.3.9
+        # 构建命令
+        commands:
+          - mvn -B clean package -Dmaven.test.skip=true
+        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
+        artifacts:
+            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
+          - name: BUILD_ARTIFACT
+            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径，如通常jar包在target目录下。当前目录为代码库根目录
+            path:
+              - ./target
+      - step: publish@general_artifacts
+        name: publish_general_artifacts
+        displayName: 上传制品
+        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
+        dependArtifact: BUILD_ARTIFACT
+        # 构建产物制品库，默认default，系统默认创建
+        artifactRepository: default
+        # 上传到制品库时的制品命名，默认output
+        artifactName: output
+        dependsOn: build_maven
+triggers:
+  pr:
+    branches:
+      include:
+        - master

README.md

@@ -1,7 +1,7 @@
 # kongx
 
 
-kongx(最新版本2.2.0)是网关kong的可视化界面管理平台(参考konga的部分界面布局方式)，能够集中化管理应用不同环境的网关配置，提供同步各环境的网关配置功能，并且具备规范的权限管理、参数配置、环境管理及日志审计等特性。
+kongx(最新版本3.1.0)是网关kong的可视化界面管理平台(参考konga的部分界面布局方式)，能够集中化管理应用不同环境的网关配置，提供同步各环境的网关配置功能，并且具备规范的权限管理、参数配置、环境管理及日志审计等特性。
 
 基于Spring Boot和Spring Cloud开发，打包后可以直接运行，不需要额外安装Tomcat等应用容器，支持在线Shell。
 
@@ -11,11 +11,11 @@ kongxe的前端页面[kongx-web](https://gitee.com/raoxy/kongx-web)
 
 平台快速部署请参见[Quick Start](https://www.kancloud.cn/raoxiaoyan/kongx/1984323)
 
-Docker部署(2.0.0+支持)请参见[Docker Quick Start](./docker-quick-start/readme.md)
+Docker部署(3.0.0+支持)请参见[Docker Quick Start](./docker-quick-start/readme.md)
 
 可视化设计网关pipeline使用文档请参考[网关流水线](https://www.kancloud.cn/raoxiaoyan/kongx/2055265)
 
-演示地址：http://49.232.174.106/ (用户名: guest/123456)
+演示地址：http://159.75.135.225/ (用户名: guest/123456)
 
 系统环境默认用户：admin/123456(部署登录后，请前往'个人设置'页面，及时修改密码)
 ## Screenshots
@@ -60,7 +60,7 @@ Docker部署(2.0.0+支持)请参见[Docker Quick Start](./docker-quick-start/rea
 
 
 ## RoadMap
-1、初步计划kongx自适应kong后续所有版本;(2.0.0版本，已完成自动适配至2.1.x版本)
+1、初步计划kongx自适应kong后续所有版本;(3.1.0版本，已完成自动适配至3.1.x版本)
 
 2、增加shell界面和可视化管理界面(2.0.1版本支持, 2020/11/18 已完成)；
 

docker-quick-start/conf/my.cnf

@@ -7,3 +7,4 @@ default-character-set=utf8mb4
 [mysqld]
 character-set-server=utf8mb4
 collation-server=utf8mb4_general_ci
+sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES

docker-quick-start/readme.md

@@ -1,4 +1,4 @@
-#Docker quick start
+# Docker quick start
 ## 1. docker环境准备
 docker及docker-compose的安装，请参考：
 

docker-quick-start/sql/kongx.sql

@@ -155,11 +155,11 @@ CREATE TABLE `kongx_system_function` (
 -- ----------------------------
 INSERT INTO `kongx_system_function` VALUES ('1', '-1', '', '首页', 'icon-shouye', 'page/wel', '/home', 'y', 'menu', 'kongx', '1');
 INSERT INTO `kongx_system_function` VALUES ('4', '5', '', 'Kong Shell', 'icon-shell', 'views/gateway/shell/index', 'shell', 'y', 'menu', 'kongx', '9');
-INSERT INTO `kongx_system_function` VALUES ('5', '-1', null, 'Gateway', 'icon-gateway', '', '/gateway', 'y', 'menu', 'kongx', '4');
-INSERT INTO `kongx_system_function` VALUES ('6', '5', '', 'Upstreams', 'icon-gateway', 'views/gateway/upstream/index', 'upstream', 'y', 'menu', 'kongx', '2');
-INSERT INTO `kongx_system_function` VALUES ('7', '5', null, 'Services', 'icon-services', 'views/gateway/service/index', 'service', 'y', 'menu', 'kongx', '3');
-INSERT INTO `kongx_system_function` VALUES ('8', '5', '', 'Routes', 'icon-route', 'views/gateway/routing/index', 'routing', 'y', 'menu', 'kongx', '4');
-INSERT INTO `kongx_system_function` VALUES ('9', '5', '', 'Plugins', 'icon-plugin', 'views/gateway/plugin/index', 'plugin', 'y', 'menu', 'kongx', '5');
+INSERT INTO `kongx_system_function` VALUES ('5', '-1', null, '网关管理', 'icon-gateway', '', '/gateway', 'y', 'menu', 'kongx', '4');
+INSERT INTO `kongx_system_function` VALUES ('6', '5', '', '上游管理', 'icon-gateway', 'views/gateway/upstream/index', 'upstream', 'y', 'menu', 'kongx', '2');
+INSERT INTO `kongx_system_function` VALUES ('7', '5', null, '服务管理', 'icon-services', 'views/gateway/service/index', 'service', 'y', 'menu', 'kongx', '3');
+INSERT INTO `kongx_system_function` VALUES ('8', '5', '', '路由管理', 'icon-route', 'views/gateway/routing/index', 'routing', 'y', 'menu', 'kongx', '4');
+INSERT INTO `kongx_system_function` VALUES ('9', '5', '', '插件管理', 'icon-plugin', 'views/gateway/plugin/index', 'plugin', 'y', 'menu', 'kongx', '5');
 INSERT INTO `kongx_system_function` VALUES ('10', '-1', '', '系统管理', 'icon-system', '', '/system', 'y', 'menu', 'kongx', '6');
 INSERT INTO `kongx_system_function` VALUES ('11', '10', null, '用户管理', 'icon-yonghuguanli', 'views/admin/user/index', 'user', 'y', 'menu', 'kongx', '1');
 INSERT INTO `kongx_system_function` VALUES ('12', '10', null, '角色管理', 'icon-quanxianguanli', 'views/admin/role/index', 'role', 'y', 'menu', 'kongx', '2');
@@ -218,7 +218,7 @@ INSERT INTO `kongx_system_function` VALUES ('65', '60', 'certificate_add', '新
 INSERT INTO `kongx_system_function` VALUES ('66', '60', 'certificate_update', '修改certificate', '', '', '', 'y', 'point', 'kongx', '999');
 INSERT INTO `kongx_system_function` VALUES ('67', '60', 'certificate_delete', '删除certificate', '', '', '', 'y', 'point', 'kongx', '999');
 INSERT INTO `kongx_system_function` VALUES ('68', '-1', 'gateway-pipeline', '网关流水线', 'icon-pipeline', '', '', 'y', 'menu', 'kongx', '2');
-INSERT INTO `kongx_system_function` VALUES ('69', '68', 'pipeline', 'Pipeline', 'icon-pipeline', 'views/gateway/flow/index', 'pipeline', 'y', 'menu', 'kongx', '1');
+INSERT INTO `kongx_system_function` VALUES ('69', '68', 'pipeline', '流水线管理', 'icon-pipeline', 'views/gateway/flow/index', 'pipeline', 'y', 'menu', 'kongx', '1');
 INSERT INTO `kongx_system_function` VALUES ('70', '69', 'add_pipeline', '新增流水线', '', '', '', 'y', 'point', 'kongx', '999');
 INSERT INTO `kongx_system_function` VALUES ('71', '69', 'update_pipeline', '更新流水线', '', '', '', 'y', 'point', 'kongx', '999');
 INSERT INTO `kongx_system_function` VALUES ('72', '69', 'remove_pipeline', '删除流水线', '', '', '', 'y', 'point', 'kongx', '999');

hs_err_pid17152.log

@@ -1,273 +0,0 @@
-#
-# There is insufficient memory for the Java Runtime Environment to continue.
-# Native memory allocation (malloc) failed to allocate 65552 bytes for Chunk::new
-# Possible reasons:
-#   The system is out of physical RAM or swap space
-#   In 32 bit mode, the process size limit was hit
-# Possible solutions:
-#   Reduce memory load on the system
-#   Increase physical memory or swap space
-#   Check if swap backing store is full
-#   Use 64 bit Java on a 64 bit OS
-#   Decrease Java heap size (-Xmx/-Xms)
-#   Decrease number of Java threads
-#   Decrease Java thread stack sizes (-Xss)
-#   Set larger code cache with -XX:ReservedCodeCacheSize=
-# This output file may be truncated or incomplete.
-#
-#  Out of Memory Error (allocation.cpp:390), pid=17152, tid=0x0000000000003a9c
-#
-# JRE version: Java(TM) SE Runtime Environment (8.0_191-b12) (build 1.8.0_191-b12)
-# Java VM: Java HotSpot(TM) 64-Bit Server VM (25.191-b12 mixed mode windows-amd64 compressed oops)
-# Failed to write core dump. Minidumps are not enabled by default on client versions of Windows
-#
-
----------------  T H R E A D  ---------------
-
-Current thread (0x000000001e8ed800):  JavaThread "C2 CompilerThread0" daemon [_thread_in_native, id=15004, stack(0x000000001f060000,0x000000001f160000)]
-
-Stack: [0x000000001f060000,0x000000001f160000]
-[error occurred during error reporting (printing stack bounds), id 0xc0000005]
-
-Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
-
-
-Current CompileTask:
-C2:   9193 3257   !   4       java.net.URLClassLoader$1::run (63 bytes)
-
-
----------------  P R O C E S S  ---------------
-
-Java Threads: ( => current thread )
-  0x000000001e943000 JavaThread "Service Thread" daemon [_thread_blocked, id=4672, stack(0x000000001f460000,0x000000001f560000)]
-  0x000000001e906000 JavaThread "C1 CompilerThread3" daemon [_thread_blocked, id=8236, stack(0x000000001f360000,0x000000001f460000)]
-  0x000000001e8f6000 JavaThread "C2 CompilerThread2" daemon [_thread_in_native, id=6476, stack(0x000000001f260000,0x000000001f360000)]
-  0x000000001e8f1000 JavaThread "C2 CompilerThread1" daemon [_thread_in_native, id=17396, stack(0x000000001f160000,0x000000001f260000)]
-=>0x000000001e8ed800 JavaThread "C2 CompilerThread0" daemon [_thread_in_native, id=15004, stack(0x000000001f060000,0x000000001f160000)]
-  0x000000001e89b000 JavaThread "Attach Listener" daemon [_thread_blocked, id=22728, stack(0x000000001ef60000,0x000000001f060000)]
-  0x000000001e899800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=19236, stack(0x000000001ee60000,0x000000001ef60000)]
-  0x0000000003068000 JavaThread "Finalizer" daemon [_thread_blocked, id=5808, stack(0x000000001ed60000,0x000000001ee60000)]
-  0x000000001e880800 JavaThread "Reference Handler" daemon [_thread_blocked, id=18508, stack(0x000000001ec60000,0x000000001ed60000)]
-  0x0000000002f72800 JavaThread "main" [_thread_in_vm, id=19116, stack(0x0000000002da0000,0x0000000002ea0000)]
-
-Other Threads:
-  0x000000001ca89800 VMThread [stack: 0x000000001e760000,0x000000001e860000] [id=18356]
-  0x000000001e948000 WatcherThread [stack: 0x000000001f560000,0x000000001f660000] [id=5984]
-
-VM state:not at safepoint (normal execution)
-
-VM Mutex/Monitor currently owned by a thread: None
-
-Heap:
- PSYoungGen      total 76288K, used 55600K [0x000000076b400000, 0x0000000770900000, 0x00000007c0000000)
-  eden space 65536K, 68% used [0x000000076b400000,0x000000076dfd4010,0x000000076f400000)
-  from space 10752K, 99% used [0x000000076f400000,0x000000076fe78030,0x000000076fe80000)
-  to   space 10752K, 0% used [0x000000076fe80000,0x000000076fe80000,0x0000000770900000)
- ParOldGen       total 175104K, used 5874K [0x00000006c1c00000, 0x00000006cc700000, 0x000000076b400000)
-  object space 175104K, 3% used [0x00000006c1c00000,0x00000006c21bc9a8,0x00000006cc700000)
- Metaspace       used 18373K, capacity 18780K, committed 18944K, reserved 1067008K
-  class space    used 2157K, capacity 2277K, committed 2304K, reserved 1048576K
-
-Card table byte_map: [0x0000000012430000,0x0000000012c30000] byte_map_base: 0x000000000ee22000
-
-Marking Bits: (ParMarkBitMap*) 0x0000000052c13e30
- Begin Bits: [0x0000000013980000, 0x0000000017910000)
- End Bits:   [0x0000000017910000, 0x000000001b8a0000)
-
-Polling page: 0x0000000000c80000
-
-CodeCache: size=245760Kb used=12010Kb max_used=12010Kb free=233749Kb
- bounds [0x0000000003070000, 0x0000000003c40000, 0x0000000012070000]
- total_blobs=3708 nmethods=3339 adapters=281
- compilation: enabled
-
-Compilation events (10 events):
-Event: 9.177 Thread 0x000000001e906000 3353       1       com.ctc.wstx.util.TextBuffer::getCurrentSegmentSize (5 bytes)
-Event: 9.178 Thread 0x000000001e906000 nmethod 3353 0x0000000003c2e910 code [0x0000000003c2ea60, 0x0000000003c2eb70]
-Event: 9.180 Thread 0x000000001e906000 3356       3       java.util.regex.Pattern::compile (406 bytes)
-Event: 9.183 Thread 0x000000001e906000 nmethod 3356 0x0000000003c311d0 code [0x0000000003c31580, 0x0000000003c33868]
-Event: 9.183 Thread 0x000000001e906000 3357       3       java.util.regex.Pattern::RemoveQEQuoting (346 bytes)
-Event: 9.185 Thread 0x000000001e906000 nmethod 3357 0x0000000003c34650 code [0x0000000003c348a0, 0x0000000003c359b8]
-Event: 9.185 Thread 0x000000001e906000 3358       3       org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader::hasMark (16 bytes)
-Event: 9.185 Thread 0x000000001e906000 nmethod 3358 0x0000000003c2e4d0 code [0x0000000003c2e640, 0x0000000003c2e810]
-Event: 9.185 Thread 0x000000001e906000 3361       1       org.apache.maven.artifact.versioning.ComparableVersion$IntItem::getType (2 bytes)
-Event: 9.185 Thread 0x000000001e906000 nmethod 3361 0x0000000003c2e210 code [0x0000000003c2e360, 0x0000000003c2e470]
-
-GC Heap History (6 events):
-Event: 3.368 GC heap before
-{Heap before GC invocations=1 (full 0):
- PSYoungGen      total 76288K, used 65536K [0x000000076b400000, 0x0000000770900000, 0x00000007c0000000)
-  eden space 65536K, 100% used [0x000000076b400000,0x000000076f400000,0x000000076f400000)
-  from space 10752K, 0% used [0x000000076fe80000,0x000000076fe80000,0x0000000770900000)
-  to   space 10752K, 0% used [0x000000076f400000,0x000000076f400000,0x000000076fe80000)
- ParOldGen       total 175104K, used 0K [0x00000006c1c00000, 0x00000006cc700000, 0x000000076b400000)
-  object space 175104K, 0% used [0x00000006c1c00000,0x00000006c1c00000,0x00000006cc700000)
- Metaspace       used 11481K, capacity 11692K, committed 11776K, reserved 1058816K
-  class space    used 1422K, capacity 1512K, committed 1536K, reserved 1048576K
-Event: 3.377 GC heap after
-Heap after GC invocations=1 (full 0):
- PSYoungGen      total 76288K, used 10374K [0x000000076b400000, 0x0000000770900000, 0x00000007c0000000)
-  eden space 65536K, 0% used [0x000000076b400000,0x000000076b400000,0x000000076f400000)
-  from space 10752K, 96% used [0x000000076f400000,0x000000076fe21908,0x000000076fe80000)
-  to   space 10752K, 0% used [0x000000076fe80000,0x000000076fe80000,0x0000000770900000)
- ParOldGen       total 175104K, used 16K [0x00000006c1c00000, 0x00000006cc700000, 0x000000076b400000)
-  object space 175104K, 0% used [0x00000006c1c00000,0x00000006c1c04000,0x00000006cc700000)
- Metaspace       used 11481K, capacity 11692K, committed 11776K, reserved 1058816K
-  class space    used 1422K, capacity 1512K, committed 1536K, reserved 1048576K
-}
-Event: 4.493 GC heap before
-{Heap before GC invocations=2 (full 0):
- PSYoungGen      total 76288K, used 75910K [0x000000076b400000, 0x0000000770900000, 0x00000007c0000000)
-  eden space 65536K, 100% used [0x000000076b400000,0x000000076f400000,0x000000076f400000)
-  from space 10752K, 96% used [0x000000076f400000,0x000000076fe21908,0x000000076fe80000)
-  to   space 10752K, 0% used [0x000000076fe80000,0x000000076fe80000,0x0000000770900000)
- ParOldGen       total 175104K, used 16K [0x00000006c1c00000, 0x00000006cc700000, 0x000000076b400000)
-  object space 175104K, 0% used [0x00000006c1c00000,0x00000006c1c04000,0x00000006cc700000)
- Metaspace       used 14823K, capacity 15116K, committed 15232K, reserved 1062912K
-  class space    used 1816K, capacity 1912K, committed 1920K, reserved 1048576K
-Event: 4.506 GC heap after
-Heap after GC invocations=2 (full 0):
- PSYoungGen      total 76288K, used 10736K [0x000000076b400000, 0x0000000770900000, 0x00000007c0000000)
-  eden space 65536K, 0% used [0x000000076b400000,0x000000076b400000,0x000000076f400000)
-  from space 10752K, 99% used [0x000000076fe80000,0x00000007708fc070,0x0000000770900000)
-  to   space 10752K, 0% used [0x000000076f400000,0x000000076f400000,0x000000076fe80000)
- ParOldGen       total 175104K, used 2101K [0x00000006c1c00000, 0x00000006cc700000, 0x000000076b400000)
-  object space 175104K, 1% used [0x00000006c1c00000,0x00000006c1e0d668,0x00000006cc700000)
- Metaspace       used 14823K, capacity 15116K, committed 15232K, reserved 1062912K
-  class space    used 1816K, capacity 1912K, committed 1920K, reserved 1048576K
-}
-Event: 6.701 GC heap before
-{Heap before GC invocations=3 (full 0):
- PSYoungGen      total 76288K, used 76272K [0x000000076b400000, 0x0000000770900000, 0x00000007c0000000)
-  eden space 65536K, 100% used [0x000000076b400000,0x000000076f400000,0x000000076f400000)
-  from space 10752K, 99% used [0x000000076fe80000,0x00000007708fc070,0x0000000770900000)
-  to   space 10752K, 0% used [0x000000076f400000,0x000000076f400000,0x000000076fe80000)
- ParOldGen       total 175104K, used 2101K [0x00000006c1c00000, 0x00000006cc700000, 0x000000076b400000)
-  object space 175104K, 1% used [0x00000006c1c00000,0x00000006c1e0d668,0x00000006cc700000)
- Metaspace       used 15625K, capacity 15934K, committed 16128K, reserved 1062912K
-  class space    used 1855K, capacity 1947K, committed 2048K, reserved 1048576K
-Event: 6.712 GC heap after
-Heap after GC invocations=3 (full 0):
- PSYoungGen      total 76288K, used 10720K [0x000000076b400000, 0x0000000770900000, 0x00000007c0000000)
-  eden space 65536K, 0% used [0x000000076b400000,0x000000076b400000,0x000000076f400000)
-  from space 10752K, 99% used [0x000000076f400000,0x000000076fe78030,0x000000076fe80000)
-  to   space 10752K, 0% used [0x000000076fe80000,0x000000076fe80000,0x0000000770900000)
- ParOldGen       total 175104K, used 5874K [0x00000006c1c00000, 0x00000006cc700000, 0x000000076b400000)
-  object space 175104K, 3% used [0x00000006c1c00000,0x00000006c21bc9a8,0x00000006cc700000)
- Metaspace       used 15625K, capacity 15934K, committed 16128K, reserved 1062912K
-  class space    used 1855K, capacity 1947K, committed 2048K, reserved 1048576K
-}
-
-Deoptimization events (10 events):
-Event: 8.969 Thread 0x0000000002f72800 Uncommon trap: reason=null_check action=make_not_entrant pc=0x000000000376d934 method=com.google.inject.internal.InjectorImpl.enterContext()Lcom/google/inject/internal/InternalContext; @ 7
-Event: 8.971 Thread 0x0000000002f72800 Uncommon trap: reason=null_check action=make_not_entrant pc=0x000000000398f858 method=org.eclipse.sisu.plexus.ClassRealmManager.visibleRealmNames(Lorg/codehaus/plexus/classworlds/realm/ClassRealm;)Ljava/util/Set; @ 19
-Event: 8.971 Thread 0x0000000002f72800 Uncommon trap: reason=class_check action=maybe_recompile pc=0x000000000377f4f0 method=org.eclipse.sisu.inject.LazyBeanEntry.getValue()Ljava/lang/Object; @ 4
-Event: 8.977 Thread 0x0000000002f72800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x00000000034fe598 method=java.lang.reflect.Modifier.isSynthetic(I)Z @ 5
-Event: 8.978 Thread 0x0000000002f72800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x00000000036b3a50 method=org.eclipse.sisu.plexus.RealmFilteredBeans$FilteredItr.hasNext()Z @ 44
-Event: 8.978 Thread 0x0000000002f72800 Uncommon trap: reason=class_check action=maybe_recompile pc=0x000000000377f4f0 method=org.eclipse.sisu.inject.LazyBeanEntry.getValue()Ljava/lang/Object; @ 4
-Event: 8.984 Thread 0x0000000002f72800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000003b5c5c8 method=java.nio.charset.CharsetDecoder.decode(Ljava/nio/ByteBuffer;Ljava/nio/CharBuffer;Z)Ljava/nio/charset/CoderResult; @ 1
-Event: 9.026 Thread 0x0000000002f72800 Uncommon trap: reason=unstable_if action=reinterpret pc=0x0000000003755278 method=java.util.regex.Pattern$LastNode.match(Ljava/util/regex/Matcher;ILjava/lang/CharSequence;)Z @ 13
-Event: 9.113 Thread 0x0000000002f72800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x000000000398bbc8 method=java.util.LinkedHashMap.afterNodeInsertion(Z)V @ 15
-Event: 9.113 Thread 0x0000000002f72800 Uncommon trap: reason=bimorphic action=maybe_recompile pc=0x000000000398bbc8 method=java.util.LinkedHashMap.afterNodeInsertion(Z)V @ 15
-
-Classes redefined (0 events):
-No events
-
-Internal exceptions (10 events):
-Event: 3.711 Thread 0x0000000002f72800 Implicit null exception at 0x000000000326d414 to 0x000000000326d7e1
-Event: 4.038 Thread 0x0000000002f72800 Implicit null exception at 0x00000000036c17f1 to 0x00000000036c2ae9
-Event: 4.747 Thread 0x0000000002f72800 Implicit null exception at 0x00000000037cda03 to 0x00000000037cdc4d
-Event: 5.218 Thread 0x0000000002f72800 Implicit null exception at 0x0000000003432195 to 0x0000000003432395
-Event: 5.219 Thread 0x0000000002f72800 Implicit null exception at 0x00000000036a3bed to 0x00000000036a3e75
-Event: 5.219 Thread 0x0000000002f72800 Implicit null exception at 0x00000000036bc2b7 to 0x00000000036bcad1
-Event: 5.219 Thread 0x0000000002f72800 Implicit null exception at 0x00000000035334db to 0x0000000003533965
-Event: 5.716 Thread 0x0000000002f72800 Implicit null exception at 0x00000000038f5fd5 to 0x00000000038f8fa5
-Event: 8.969 Thread 0x0000000002f72800 Implicit null exception at 0x000000000376d4cf to 0x000000000376d925
-Event: 8.971 Thread 0x0000000002f72800 Implicit null exception at 0x000000000398f061 to 0x000000000398f83d
-
-Events (10 events):
-Event: 9.132 Executing VM operation: Deoptimize
-Event: 9.133 Executing VM operation: Deoptimize done
-Event: 9.184 loading class org/codehaus/plexus/util/FileUtils
-Event: 9.184 loading class org/codehaus/plexus/util/FileUtils done
-Event: 9.184 loading class org/codehaus/plexus/util/FileUtils
-Event: 9.184 loading class org/codehaus/plexus/util/FileUtils done
-Event: 9.187 loading class org/codehaus/plexus/util/io/InputStreamFacade
-Event: 9.187 loading class org/codehaus/plexus/util/io/InputStreamFacade done
-Event: 9.187 loading class org/codehaus/plexus/util/io/InputStreamFacade
-Event: 9.187 loading class org/codehaus/plexus/util/io/InputStreamFacade done
-
-
-Dynamic libraries:
-0x00007ff7d1f90000 - 0x00007ff7d1fc7000 	C:\Program Files\Java\jdk1.8.0_191\bin\java.exe
-0x00007fff862c0000 - 0x00007fff864b0000 	C:\WINDOWS\SYSTEM32\ntdll.dll
-0x00007fff844d0000 - 0x00007fff84582000 	C:\WINDOWS\System32\KERNEL32.DLL
-0x00007fff83700000 - 0x00007fff839a5000 	C:\WINDOWS\System32\KERNELBASE.dll
-0x00007fff85870000 - 0x00007fff85913000 	C:\WINDOWS\System32\ADVAPI32.dll
-0x00007fff85560000 - 0x00007fff855fe000 	C:\WINDOWS\System32\msvcrt.dll
-0x00007fff85750000 - 0x00007fff857e7000 	C:\WINDOWS\System32\sechost.dll
-0x00007fff85290000 - 0x00007fff853b0000 	C:\WINDOWS\System32\RPCRT4.dll
-0x00007fff86010000 - 0x00007fff861a5000 	C:\WINDOWS\System32\USER32.dll
-0x00007fff83b00000 - 0x00007fff83b21000 	C:\WINDOWS\System32\win32u.dll
-0x00007fff84ce0000 - 0x00007fff84d06000 	C:\WINDOWS\System32\GDI32.dll
-0x00007fff832b0000 - 0x00007fff83446000 	C:\WINDOWS\System32\gdi32full.dll
-0x00007fff83b30000 - 0x00007fff83bce000 	C:\WINDOWS\System32\msvcp_win.dll
-0x00007fff83580000 - 0x00007fff8367a000 	C:\WINDOWS\System32\ucrtbase.dll
-0x00007fff72580000 - 0x00007fff72804000 	C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.18362.1082_none_9e8193e1e45b25c1\COMCTL32.dll
-0x00007fff84dc0000 - 0x00007fff850f5000 	C:\WINDOWS\System32\combase.dll
-0x00007fff83450000 - 0x00007fff834d0000 	C:\WINDOWS\System32\bcryptPrimitives.dll
-0x00007fff85260000 - 0x00007fff8528e000 	C:\WINDOWS\System32\IMM32.DLL
-0x0000000053510000 - 0x00000000535e2000 	C:\Program Files\Java\jdk1.8.0_191\jre\bin\msvcr100.dll
-0x00000000523f0000 - 0x0000000052c94000 	C:\Program Files\Java\jdk1.8.0_191\jre\bin\server\jvm.dll
-0x00007fff85620000 - 0x00007fff85628000 	C:\WINDOWS\System32\PSAPI.DLL
-0x00007fff6af90000 - 0x00007fff6af99000 	C:\WINDOWS\SYSTEM32\WSOCK32.dll
-0x00007fff7f530000 - 0x00007fff7f554000 	C:\WINDOWS\SYSTEM32\WINMM.dll
-0x00007fff78f50000 - 0x00007fff78f5a000 	C:\WINDOWS\SYSTEM32\VERSION.dll
-0x00007fff85630000 - 0x00007fff8569f000 	C:\WINDOWS\System32\WS2_32.dll
-0x00007fff7f500000 - 0x00007fff7f52d000 	C:\WINDOWS\SYSTEM32\winmmbase.dll
-0x00007fff836b0000 - 0x00007fff836fa000 	C:\WINDOWS\System32\cfgmgr32.dll
-0x0000000053b70000 - 0x0000000053b7f000 	C:\Program Files\Java\jdk1.8.0_191\jre\bin\verify.dll
-0x0000000053b40000 - 0x0000000053b69000 	C:\Program Files\Java\jdk1.8.0_191\jre\bin\java.dll
-0x00000000534b0000 - 0x00000000534c6000 	C:\Program Files\Java\jdk1.8.0_191\jre\bin\zip.dll
-0x00007fff845f0000 - 0x00007fff84cd7000 	C:\WINDOWS\System32\SHELL32.dll
-0x00007fff856a0000 - 0x00007fff85749000 	C:\WINDOWS\System32\shcore.dll
-0x00007fff83bd0000 - 0x00007fff84350000 	C:\WINDOWS\System32\windows.storage.dll
-0x00007fff831b0000 - 0x00007fff831d3000 	C:\WINDOWS\System32\profapi.dll
-0x00007fff83200000 - 0x00007fff8324a000 	C:\WINDOWS\System32\powrprof.dll
-0x00007fff83180000 - 0x00007fff83190000 	C:\WINDOWS\System32\UMPDC.dll
-0x00007fff84590000 - 0x00007fff845e2000 	C:\WINDOWS\System32\shlwapi.dll
-0x00007fff83190000 - 0x00007fff831a1000 	C:\WINDOWS\System32\kernel.appcore.dll
-0x00007fff84350000 - 0x00007fff84367000 	C:\WINDOWS\System32\cryptsp.dll
-0x00007fff7fb80000 - 0x00007fff7fb8a000 	D:\01.Server\maven\lib\jansi-native\windows64\jansi.dll
-0x0000000053440000 - 0x000000005345a000 	C:\Program Files\Java\jdk1.8.0_191\jre\bin\net.dll
-0x00007fff829d0000 - 0x00007fff82a37000 	C:\WINDOWS\system32\mswsock.dll
-0x0000000053410000 - 0x0000000053421000 	C:\Program Files\Java\jdk1.8.0_191\jre\bin\nio.dll
-
-VM Arguments:
-jvm_args: -Dclassworlds.conf=D:\01.Server\maven\bin\..\bin\m2.conf -Dmaven.home=D:\01.Server\maven\bin\.. -Dlibrary.jansi.path=D:\01.Server\maven\bin\..\lib\jansi-native -Dmaven.multiModuleProjectDirectory=D:\99.python\kongx 
-java_command: org.codehaus.plexus.classworlds.launcher.Launcher versions:set -DnewVersion=1.3.0
-java_class_path (initial): D:\01.Server\maven\bin\..\boot\plexus-classworlds-2.6.0.jar
-Launcher Type: SUN_STANDARD
-
-Environment Variables:
-JAVA_HOME=C:\Program Files\Java\jdk1.8.0_191
-PATH=D:\01.Server\luarocks-3.3.1-windows-64;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\nodejs\;C:\Program Files\Java\jdk1.8.0_191bin;D:\01.Server\maven\bin;C:\Program Files\MySQL\MySQL Server 5.5\bin;D:\01.Server\mysql-5.7.25\bin;C:\HashiCorp\Vagrant\bin;C:\Program Files\Redis\;D:\01.Server\Ruby\bin;C:\Program Files\Git\cmd;C:\Users\Administrator\AppData\Roaming\npm;C:\Program Files\Microsoft VS Code\bin;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\;D:\01.Server\Lua\5.1;D:\01.Server\Lua\5.1\clibs;C:\Users\Administrator\AppData\Local\Programs\Python\Python36\Scripts\;C:\Users\Administrator\AppData\Local\Programs\Python\Python36\;C:\Users\Administrator\AppData\Local\Programs\Python\Python37\Scripts\;C:\Users\Administrator\AppData\Local\Programs\Python\Python37\;C:\Users\Administrator\AppData\Local\Microsoft\WindowsApps;;C:\Program Files\Microsoft VS Code\bin;C:\Users\Administrator\AppData\Local\Programs\Fiddler;C:\Users\Administrator\AppData\Local\Microsoft\WindowsApps
-USERNAME=Administrator
-OS=Windows_NT
-PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 142 Stepping 10, GenuineIntel
-
-
-
----------------  S Y S T E M  ---------------
-
-OS: Windows 10.0 , 64 bit Build 18362 (10.0.18362.1082)
-
-CPU:total 8 (initial active 8) (4 cores per cpu, 2 threads per core) family 6 model 142 stepping 10, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, avx, avx2, aes, clmul, erms, 3dnowpref, lzcnt, ht, tsc, tscinvbit, bmi1, bmi2, adx
-
-Memory: 4k page, physical 16658532k(2158172k free), swap 29691392k(3132k free)
-
-vm_info: Java HotSpot(TM) 64-Bit Server VM (25.191-b12) for windows-amd64 JRE (1.8.0_191-b12), built on Oct  6 2018 09:29:03 by "java_re" with MS VC++ 10.0 (VS2010)
-
-time: Mon Nov 02 11:43:05 2020
-elapsed time: 9 seconds (0d 0h 0m 9s)
-

kongx-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>kongx</artifactId>
         <groupId>com.kongx</groupId>
-        <version>2.2.0</version>
+        <version>3.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kongx-serve/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>kongx</artifactId>
         <groupId>com.kongx</groupId>
-        <version>2.2.0</version>
+        <version>3.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>com.kongx</groupId>
             <artifactId>kongx-common</artifactId>
-            <version>2.2.0</version>
+            <version>3.1.0</version>
         </dependency>
 
         <dependency>

kongx-serve/src/main/java/com/kongx/serve/mapper/UserInfoMapper.java

@@ -15,7 +15,7 @@ public interface UserInfoMapper {
     @Results({
             @Result(property = "userId", column = "user_id"),
     })
-    List<UserInfo> findAllUser();
+    List<UserInfoVO> findAllUser();
 
     @Select({"<script>", "select t.user_id,t.name,t.mobile,t.status,t.email,t.creator,t.create_at,t.user_id uid from kongx_user_info t where 1=1 ",
             "<when test='job.name!=null'>",
@@ -65,7 +65,8 @@ public interface UserInfoMapper {
 
     @Select({"<script>", "SELECT DISTINCT",
             "b.id,b.parent_id parentId,",
-            "  b.NAME label,",
+            "b.NAME label,",
+            "b.sort_order,",
             "b.menu_icon icon,",
             "b.visit_view component,",
             "b.code code,",

kongx-serve/src/main/java/com/kongx/serve/service/system/UserInfoService.java

@@ -25,8 +25,9 @@ public class UserInfoService implements IBaseService<UserInfoVO, String> {
     @Autowired
     private UserInfoMapper userInfoMapper;
 
-    public List<UserInfo> findAll() {
-        List<UserInfo> allUser = userInfoMapper.findAllUser();
+    @Override
+    public List<UserInfoVO> findAll(UserInfoVO userInfo) {
+        List<UserInfoVO> allUser = userInfoMapper.findAllUser();
         return allUser;
     }
 

kongx-serve/src/main/resources/static/index.html

@@ -51,4 +51,4 @@
         .avue-home__sub-title {
             color: #ABABAB;
             font-size: 12px;
-        }</style><link href=css/chunk-05d1190a.889d7b72.css rel=prefetch><link href=css/chunk-705d6594.b5e0786b.css rel=prefetch><link href=css/page.e7e8c934.css rel=prefetch><link href=js/chunk-05d1190a.b42234c2.js rel=prefetch><link href=js/chunk-2d0e4caf.fea686c4.js rel=prefetch><link href=js/chunk-705d6594.7e1c30f3.js rel=prefetch><link href=js/page.114cf767.js rel=prefetch><link href=js/views.4d62ea9b.js rel=prefetch><link href=css/app.4a2f05ed.css rel=preload as=style><link href=css/chunk-vendors.425c1559.css rel=preload as=style><link href=js/app.4c7131b2.js rel=preload as=script><link href=js/chunk-vendors.a94c5304.js rel=preload as=script><link href=css/chunk-vendors.425c1559.css rel=stylesheet><link href=css/app.4a2f05ed.css rel=stylesheet></head><body><noscript><strong>很抱歉，如果没有 JavaScript 支持，Avue-cli 将不能正常工作。请启用浏览器的 JavaScript 然后继续。</strong></noscript><div id=app><div class=avue-home><div class=avue-home__main><img class=avue-home__loading src=./svg/loading-spin.svg alt=loading><div class=avue-home__title>正在加载资源</div><div class=avue-home__sub-title>初次加载资源可能需要较多时间 请耐心等待</div></div><div class=avue-home__footer><a href=https://gitee.com/raoxy/kongx target=_blank>https://gitee.com/raoxy/kongx</a></div></div></div><script src=util/aes.js charset=utf-8></script><script src=cdn/vue/2.6.10/vue.min.js charset=utf-8></script><script src=cdn/vuex/3.0.1/vuex.min.js charset=utf-8></script><script src=cdn/vue-router/3.0.1/vue-router.min.js charset=utf-8></script><script src=cdn/axios/1.0.0/axios.min.js charset=utf-8></script><script src=cdn/element-ui/2.13.0/index.js charset=utf-8></script><script src=cdn/xlsx/0.14.1/xlsx.full.min.js charset=utf-8></script><script src=cdn/fileSaver/1.3.8/FileSaver.min.js charset=utf-8></script><script src=cdn/lodash/4.13.1/lodash.min.js charset=utf-8></script><script src=js/chunk-vendors.a94c5304.js></script><script src=js/app.4c7131b2.js></script></body></html>
+        }</style><link href=css/chunk-05d1190a.b408897f.css rel=prefetch><link href=css/chunk-9f41b982.9f0e9512.css rel=prefetch><link href=css/page.87c16261.css rel=prefetch><link href=js/chunk-05d1190a.191e8a4f.js rel=prefetch><link href=js/chunk-2d0e4caf.9583d2b4.js rel=prefetch><link href=js/chunk-9f41b982.e37a47c2.js rel=prefetch><link href=js/page.b44fcb74.js rel=prefetch><link href=js/views.2d373629.js rel=prefetch><link href=css/app.69c5c49e.css rel=preload as=style><link href=css/chunk-vendors.501c96bc.css rel=preload as=style><link href=js/app.cd42d598.js rel=preload as=script><link href=js/chunk-vendors.cf824341.js rel=preload as=script><link href=css/chunk-vendors.501c96bc.css rel=stylesheet><link href=css/app.69c5c49e.css rel=stylesheet></head><body><noscript><strong>很抱歉，如果没有 JavaScript 支持，Avue-cli 将不能正常工作。请启用浏览器的 JavaScript 然后继续。</strong></noscript><div id=app><div class=avue-home><div class=avue-home__main><img class=avue-home__loading src=./svg/loading-spin.svg alt=loading><div class=avue-home__title>正在加载资源</div><div class=avue-home__sub-title>初次加载资源可能需要较多时间 请耐心等待</div></div><div class=avue-home__footer><a href=https://gitee.com/raoxy/kongx target=_blank>https://gitee.com/raoxy/kongx</a></div></div></div><script src=util/aes.js charset=utf-8></script><script src=cdn/vue/2.6.10/vue.min.js charset=utf-8></script><script src=cdn/vuex/3.0.1/vuex.min.js charset=utf-8></script><script src=cdn/vue-router/3.0.1/vue-router.min.js charset=utf-8></script><script src=cdn/axios/1.0.0/axios.min.js charset=utf-8></script><script src=cdn/element-ui/2.13.0/index.js charset=utf-8></script><script src=cdn/xlsx/0.14.1/xlsx.full.min.js charset=utf-8></script><script src=cdn/fileSaver/1.3.8/FileSaver.min.js charset=utf-8></script><script src=cdn/lodash/4.13.1/lodash.min.js charset=utf-8></script><script src=js/chunk-vendors.cf824341.js></script><script src=js/app.cd42d598.js></script></body></html>

pom.xml

@@ -13,7 +13,7 @@
     <groupId>com.kongx</groupId>
     <artifactId>kongx</artifactId>
     <packaging>pom</packaging>
-    <version>2.2.0</version>
+    <version>3.1.0</version>
     <modules>
         <module>kongx-serve</module>
         <module>kongx-common</module>

scripts/build.bat

@@ -1,9 +1,9 @@
 @echo off
 
 rem kongx serve db info
-set kongx_serve_db_url="jdbc:mysql://kongx_db:3306/kongx_serve?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true"
+set kongx_serve_db_url="jdbc:mysql://localhost:3306/kongx_serve?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true"
 set kongx_serve_db_username="root"
-set kongx_serve_db_password=""
+set kongx_serve_db_password="123456"
 
 rem =============== Please do not modify the following content ===============
 rem go to script directory