diff --git a/zlt-business/code-generator/pom.xml b/zlt-business/code-generator/pom.xml index a589e49f3..d7f26bc20 100644 --- a/zlt-business/code-generator/pom.xml +++ b/zlt-business/code-generator/pom.xml @@ -13,6 +13,10 @@ com.zlt zlt-config + + com.zlt + zlt-log-spring-boot-starter + com.zlt zlt-common-spring-boot-starter 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 index 30f32889a..5c48b0a4c 100644 --- 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 index 76854291b..1aa61ef87 100644 --- a/zlt-business/file-center/pom.xml +++ b/zlt-business/file-center/pom.xml @@ -14,6 +14,10 @@ com.zlt zlt-config + + com.zlt + zlt-log-spring-boot-starter + com.zlt zlt-common-spring-boot-starter diff --git a/zlt-business/search-center/search-server/pom.xml b/zlt-business/search-center/search-server/pom.xml index 79fd5d7ca..caac10f44 100644 --- a/zlt-business/search-center/search-server/pom.xml +++ b/zlt-business/search-center/search-server/pom.xml @@ -15,6 +15,10 @@ zlt-config + + com.zlt + zlt-log-spring-boot-starter + com.zlt zlt-common-spring-boot-starter diff --git a/zlt-business/user-center/pom.xml b/zlt-business/user-center/pom.xml index b9ea20d4a..28f97a693 100644 --- a/zlt-business/user-center/pom.xml +++ b/zlt-business/user-center/pom.xml @@ -14,6 +14,10 @@ com.zlt zlt-config + + com.zlt + zlt-log-spring-boot-starter + com.zlt zlt-common-spring-boot-starter 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 index 0a621f5c4..eb8ffede7 100644 --- 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 index b013382f3..1f7166685 100644 --- a/zlt-commons/zlt-common-core/pom.xml +++ b/zlt-commons/zlt-common-core/pom.xml @@ -10,10 +10,6 @@ 公共通用组件 jar - - com.zlt - zlt-log-spring-boot-starter - com.baomidou mybatis-plus-extension @@ -97,5 +93,10 @@ com.fasterxml.jackson.core jackson-core + + + com.alibaba + transmittable-thread-local + \ No newline at end of file diff --git a/zlt-doc/sql/user-center.sql b/zlt-doc/sql/user-center.sql index e40c7d037..7ac8da478 100644 --- 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 index 8fb732332..b91540838 100644 --- a/zlt-gateway/sc-gateway/pom.xml +++ b/zlt-gateway/sc-gateway/pom.xml @@ -14,6 +14,10 @@ com.zlt zlt-config + + com.zlt + zlt-log-spring-boot-starter + com.zlt zlt-loadbalancer-spring-boot-starter diff --git a/zlt-uaa/pom.xml b/zlt-uaa/pom.xml index 7c4541e3b..59d3d2749 100644 --- a/zlt-uaa/pom.xml +++ b/zlt-uaa/pom.xml @@ -13,6 +13,10 @@ com.zlt zlt-config + + com.zlt + zlt-log-spring-boot-starter + com.zlt zlt-common-spring-boot-starter 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 new file mode 100644 index 000000000..9b62f01a2 --- /dev/null +++ b/zlt-web/layui-web/src/main/resources/static/pages/log/traceLog.html @@ -0,0 +1,45 @@ + +
+ + \ No newline at end of file