Merge pull request #64 from zlt2000/dev

Dev
zlt2000 · Apr 9, 2023 · 13e901a · 13e901a
2 parents cf3811f + d1e7e9f
commit 13e901a
Show file tree

Hide file tree

Showing 11 changed files with 77 additions and 6 deletions.
diff --git a/zlt-business/code-generator/pom.xml b/zlt-business/code-generator/pom.xml
@@ -13,6 +13,10 @@
             <groupId>com.zlt</groupId>
             <artifactId>zlt-config</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.zlt</groupId>
+            <artifactId>zlt-log-spring-boot-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.zlt</groupId>
             <artifactId>zlt-common-spring-boot-starter</artifactId>

diff --git a/zlt-business/code-generator/src/main/java/com/central/generator/CodeGeneratorApp.java b/zlt-business/code-generator/src/main/java/com/central/generator/CodeGeneratorApp.java
@@ -3,11 +3,13 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * @author zlt
  */
 @EnableDiscoveryClient
+@EnableFeignClients(basePackages = "com.central")
 @SpringBootApplication
 public class CodeGeneratorApp {
     public static void main(String[] args) {

diff --git a/zlt-business/file-center/pom.xml b/zlt-business/file-center/pom.xml
@@ -14,6 +14,10 @@
             <groupId>com.zlt</groupId>
             <artifactId>zlt-config</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.zlt</groupId>
+            <artifactId>zlt-log-spring-boot-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.zlt</groupId>
             <artifactId>zlt-common-spring-boot-starter</artifactId>

diff --git a/zlt-business/search-center/search-server/pom.xml b/zlt-business/search-center/search-server/pom.xml
@@ -15,6 +15,10 @@
             <artifactId>zlt-config</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.zlt</groupId>
+            <artifactId>zlt-log-spring-boot-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.zlt</groupId>
             <artifactId>zlt-common-spring-boot-starter</artifactId>

diff --git a/zlt-business/user-center/pom.xml b/zlt-business/user-center/pom.xml
@@ -14,6 +14,10 @@
             <groupId>com.zlt</groupId>
             <artifactId>zlt-config</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.zlt</groupId>
+            <artifactId>zlt-log-spring-boot-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.zlt</groupId>
             <artifactId>zlt-common-spring-boot-starter</artifactId>

diff --git a/zlt-business/user-center/src/main/java/com/central/user/controller/SysUserController.java b/zlt-business/user-center/src/main/java/com/central/user/controller/SysUserController.java
@@ -12,7 +12,6 @@
 import com.central.common.constant.CommonConstant;
 import com.central.common.model.*;
 import com.central.common.utils.ExcelUtil;
-//import com.central.log.annotation.AuditLog;
 import com.central.log.annotation.AuditLog;
 import com.central.search.client.service.IQueryService;
 import com.central.search.model.LogicDelDto;

diff --git a/zlt-commons/zlt-common-core/pom.xml b/zlt-commons/zlt-common-core/pom.xml
@@ -10,10 +10,6 @@
     <description>公共通用组件</description>
     <packaging>jar</packaging>
     <dependencies>
-        <dependency>
-            <groupId>com.zlt</groupId>
-            <artifactId>zlt-log-spring-boot-starter</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-extension</artifactId>
@@ -97,5 +93,10 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>transmittable-thread-local</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/zlt-doc/sql/user-center.sql b/zlt-doc/sql/user-center.sql
@@ -146,7 +146,7 @@ INSERT INTO `sys_menu` VALUES (72, 71, '索引管理', '#!index', 'search/index_
 INSERT INTO `sys_menu` VALUES (73, 71, '用户搜索', '#!userSearch', 'search/user_search.html', NULL, 'layui-icon-user', 2, '2019-01-10 18:35:55', '2019-01-12 00:27:20', 1, 0, 'webApp', 1);
 INSERT INTO `sys_menu` VALUES (74, 12, 'Token管理', '#!tokens', 'system/tokens.html', NULL, 'layui-icon-unlink', 6, '2019-07-11 16:56:59', '2019-07-11 16:56:59', 1, 0, 'webApp', 1);
 INSERT INTO `sys_menu` VALUES (75, 2, '用户列表', '/api-user/users', 'user-list', 'GET', null, 1, '2019-07-29 16:56:59', '2019-07-29 16:56:59', 2, 0, 'webApp', 1);
-INSERT INTO `sys_menu` VALUES (76, 2, '查询用户角色', '/api-user/roles', 'user-roles', 'GET', null, 2, '2019-07-29 16:56:59', '2019-07-29 16:56:59', 2, 0, 'webApp');
+INSERT INTO `sys_menu` VALUES (76, 2, '查询用户角色', '/api-user/roles', 'user-roles', 'GET', null, 2, '2019-07-29 16:56:59', '2019-07-29 16:56:59', 2, 0, 'webApp', 1);
 INSERT INTO `sys_menu` VALUES (77, 2, '用户添加', '/api-user/users/saveOrUpdate', 'user-btn-add', 'POST', null, 3, '2019-07-29 16:56:59', '2019-07-29 16:56:59', 2, 0, 'webApp', 1);
 INSERT INTO `sys_menu` VALUES (78, 2, '用户导出', '/api-user/users/export', 'user-btn-export', 'POST', null, 4, '2019-07-29 16:56:59', '2019-07-29 16:56:59', 2, 0, 'webApp', 1);
 INSERT INTO `sys_menu` VALUES (79, 2, '用户导入', '/api-user/users/import', 'user-btn-import', 'POST', null, 5, '2019-07-29 16:56:59', '2019-07-29 16:56:59', 2, 0, 'webApp', 1);

diff --git a/zlt-gateway/sc-gateway/pom.xml b/zlt-gateway/sc-gateway/pom.xml
@@ -14,6 +14,10 @@
             <groupId>com.zlt</groupId>
             <artifactId>zlt-config</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.zlt</groupId>
+            <artifactId>zlt-log-spring-boot-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.zlt</groupId>
             <artifactId>zlt-loadbalancer-spring-boot-starter</artifactId>

diff --git a/zlt-uaa/pom.xml b/zlt-uaa/pom.xml
@@ -13,6 +13,10 @@
 			<groupId>com.zlt</groupId>
 			<artifactId>zlt-config</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.zlt</groupId>
+			<artifactId>zlt-log-spring-boot-starter</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.zlt</groupId>
 			<artifactId>zlt-common-spring-boot-starter</artifactId>

diff --git a/zlt-web/layui-web/src/main/resources/static/pages/log/traceLog.html b/zlt-web/layui-web/src/main/resources/static/pages/log/traceLog.html
@@ -0,0 +1,45 @@
+<!-- 数据表格 -->
+<table class="layui-table" id="trace-table" lay-filter="trace-table"></table>
+
+<script>
+    layui.use(['config', 'admin', 'table', 'treetable'],function () {
+        let layer = layui.layer;
+        let treetable = layui.treetable;
+        let config = layui.config;
+        let admin = layui.admin;
+
+        let traceId = admin.getTempData('traceId');
+        // 渲染表格
+        let renderTable = function () {
+            layer.load(2);
+            treetable.render({
+                treeColIndex: 1,
+                treeSpid: '-1',
+                treeIdName: 'spanId',
+                treePidName: 'parentId',
+                elem: '#trace-table',
+                url: config.base_server + 'api-log/traceLog',
+                where: {
+                    access_token: config.getToken().access_token,
+                    queryStr: 'traceId:'+traceId,
+                    sortCol: 'timestamp',
+                    sortOrder: 'ASC'
+                },
+                page: false,
+                cols: [[
+                    {type: 'numbers'},
+                    {field: 'appName', sort: true, title: '应用名', width: 220},
+                    {field: 'spanId', sort: false, title: 'spanId', width: 130},
+                    {field: 'serverIp', sort: true, title: '服务ip', width: 150},
+                    {field: 'serverPort', sort: true, title: '服务端口', width: 120}
+                ]],
+                done: function() {
+                    layer.closeAll('loading');
+                }
+            });
+        };
+        if (traceId) {
+            renderTable();
+        }
+    });
+</script>