Browse Source

no message

BF-202308171519\Administrator 2 years ago
parent
commit
7dabb01806
100 changed files with 5319 additions and 750 deletions
  1. 1 1
      LICENSE
  2. 4238 0
      db/kxs.sql
  3. 423 0
      db/kxs_codegen.sql
  4. 301 0
      db/kxs_job.sql
  5. 1 1
      kxs-admin-ui/package.json
  6. 1 1
      kxs-admin-ui/public/assets/fonts/fontawesome-webfont.svg
  7. 1 1
      kxs-admin-ui/src/components/SvgIcon/index.vue
  8. 2 2
      kxs-admin-ui/src/components/Upload/Image.vue
  9. 1 1
      kxs-admin-ui/src/i18n/lang/en.ts
  10. 1 1
      kxs-admin-ui/src/i18n/lang/zh-cn.ts
  11. 1 1
      kxs-admin-ui/src/router/backEnd.ts
  12. 1 1
      kxs-admin-ui/src/utils/toolsValidate.ts
  13. 1 1
      kxs-admin-ui/src/views/admin/menu/form.vue
  14. 2 2
      kxs-admin-ui/tsconfig.json
  15. 0 47
      kxs-admin/pom.xml
  16. 0 25
      kxs-admin/src/main/java/com/kxs/admin/api/AdminApplication.java
  17. 0 38
      kxs-admin/src/main/java/com/kxs/admin/api/config/AdminConfiguration.java
  18. 0 35
      kxs-admin/src/main/java/com/kxs/admin/api/config/RouterFunctionConfiguration.java
  19. 0 31
      kxs-admin/src/main/java/com/kxs/admin/api/filter/RequestDecoderFilter.java
  20. 0 99
      kxs-admin/src/main/java/com/kxs/admin/api/filter/ValidateCodeFilter.java
  21. 0 64
      kxs-admin/src/main/java/com/kxs/admin/api/handler/ImageCodeHandler.java
  22. 0 81
      kxs-admin/src/main/resources/application.yml
  23. 0 31
      kxs-app/pom.xml
  24. 1 0
      kxs-codegen/pom.xml
  25. 2 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/KxsCodeGenApplication.java
  26. 2 2
      kxs-codegen/src/main/java/com/kxs/codegen/biz/controller/GenDsConfController.java
  27. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/controller/GenFieldTypeController.java
  28. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/controller/GenGroupController.java
  29. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/controller/GenTableController.java
  30. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/controller/GenTemplateController.java
  31. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/controller/GenTemplateGroupController.java
  32. 5 5
      kxs-codegen/src/main/java/com/kxs/codegen/biz/controller/GeneratorController.java
  33. 5 5
      kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/ColumnEntity.java
  34. 5 5
      kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/GenConfig.java
  35. 5 5
      kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/GenDatasourceConf.java
  36. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/GenFieldType.java
  37. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/GenGroupEntity.java
  38. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/GenTable.java
  39. 4 4
      kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/GenTableColumnEntity.java
  40. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/GenTemplateEntity.java
  41. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/GenTemplateGroupEntity.java
  42. 5 5
      kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/TableEntity.java
  43. 5 5
      kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GenDatasourceConfMapper.java
  44. 4 4
      kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GenDynamicMapper.java
  45. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GenFieldTypeMapper.java
  46. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GenGroupMapper.java
  47. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GenTableColumnMapper.java
  48. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GenTableMapper.java
  49. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GenTemplateGroupMapper.java
  50. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GenTemplateMapper.java
  51. 5 5
      kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GeneratorMapper.java
  52. 5 5
      kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GeneratorMysqlMapper.java
  53. 5 5
      kxs-codegen/src/main/java/com/kxs/codegen/biz/service/GenDatasourceConfService.java
  54. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/service/GenFieldTypeService.java
  55. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/service/GenGroupService.java
  56. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/service/GenTableColumnService.java
  57. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/service/GenTableService.java
  58. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/service/GenTemplateGroupService.java
  59. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/service/GenTemplateService.java
  60. 5 5
      kxs-codegen/src/main/java/com/kxs/codegen/biz/service/GeneratorService.java
  61. 5 5
      kxs-codegen/src/main/java/com/kxs/codegen/biz/service/impl/GenDatasourceConfServiceImpl.java
  62. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/service/impl/GenFieldTypeServiceImpl.java
  63. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/service/impl/GenGroupServiceImpl.java
  64. 2 2
      kxs-codegen/src/main/java/com/kxs/codegen/biz/service/impl/GenTableColumnServiceImpl.java
  65. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/service/impl/GenTableServiceImpl.java
  66. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/service/impl/GenTemplateGroupServiceImpl.java
  67. 3 3
      kxs-codegen/src/main/java/com/kxs/codegen/biz/service/impl/GenTemplateServiceImpl.java
  68. 5 5
      kxs-codegen/src/main/java/com/kxs/codegen/biz/service/impl/GeneratorServiceImpl.java
  69. 1 1
      kxs-codegen/src/main/java/com/kxs/codegen/biz/util/CommonColumnFiledEnum.java
  70. 1 1
      kxs-codegen/src/main/java/com/kxs/codegen/biz/util/DictTool.java
  71. 1 1
      kxs-codegen/src/main/java/com/kxs/codegen/biz/util/GenKit.java
  72. 1 1
      kxs-codegen/src/main/java/com/kxs/codegen/biz/util/NamingCaseTool.java
  73. 1 1
      kxs-codegen/src/main/java/com/kxs/codegen/biz/util/VelocityKit.java
  74. 1 1
      kxs-codegen/src/main/java/com/kxs/codegen/biz/util/vo/SqlDto.java
  75. 5 5
      kxs-codegen/src/main/resources/logback-spring.xml
  76. 3 3
      kxs-codegen/src/main/resources/mapper/GenFieldTypeMapper.xml
  77. 3 3
      kxs-codegen/src/main/resources/mapper/GenTableMapper.xml
  78. 5 0
      kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/config/JacksonConfiguration.java
  79. 1 1
      kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/CacheConstants.java
  80. 1 1
      kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/CommonConstants.java
  81. 1 1
      kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/SecurityConstants.java
  82. 19 0
      kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/ServiceNameConstants.java
  83. 22 0
      kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/exception/AccessDeniedBizException.java
  84. 2 2
      kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/exception/GlobalBizExceptionHandler.java
  85. 8 11
      kxs-common/kxs-common-core/src/main/resources/banner.txt
  86. 1 1
      kxs-common/kxs-common-core/src/main/resources/logback-spring.xml
  87. 2 2
      kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/DynamicDataSourceAutoConfiguration.java
  88. 1 1
      kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/annotation/EnableDynamicDataSource.java
  89. 2 2
      kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/config/ClearTtlDataSourceFilter.java
  90. 2 2
      kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/config/DataSourceProperties.java
  91. 3 3
      kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/config/JdbcDynamicDataSourceProvider.java
  92. 3 3
      kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/config/LastParamDsProcessor.java
  93. 2 2
      kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/enums/DsConfTypeEnum.java
  94. 2 2
      kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/enums/DsJdbcUrlEnum.java
  95. 3 3
      kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/support/DataSourceConstants.java
  96. 8 0
      kxs-common/kxs-common-log/src/main/java/com/kxs/common/log/LogAutoConfiguration.java
  97. 2 0
      kxs-common/kxs-common-log/src/main/java/com/kxs/common/log/event/SysLogEventSource.java
  98. 78 75
      kxs-common/kxs-common-log/src/main/java/com/kxs/common/log/event/SysLogListener.java
  99. 1 0
      kxs-common/kxs-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
  100. 2 1
      kxs-common/kxs-common-security/src/main/java/com/kxs/common/security/component/SkySecurityInnerAspect.java

+ 1 - 1
LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) 2020 pig4cloud Authors. All Rights Reserved.
+   Copyright (c) 2021 pig4cloud Authors. All Rights Reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

File diff suppressed because it is too large
+ 4238 - 0
db/kxs.sql


File diff suppressed because it is too large
+ 423 - 0
db/kxs_codegen.sql


+ 301 - 0
db/kxs_job.sql

@@ -0,0 +1,301 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : local
+ Source Server Type    : MySQL
+ Source Server Version : 80032
+ Source Host           : localhost:3306
+ Source Schema         : kxs_job
+
+ Target Server Type    : MySQL
+ Target Server Version : 80032
+ File Encoding         : 65001
+
+ Date: 14/11/2023 22:34:11
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for QRTZ_BLOB_TRIGGERS
+-- ----------------------------
+DROP TABLE IF EXISTS `QRTZ_BLOB_TRIGGERS`;
+CREATE TABLE `QRTZ_BLOB_TRIGGERS`  (
+  `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `TRIGGER_NAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `TRIGGER_GROUP` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `BLOB_DATA` blob NULL,
+  PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE,
+  CONSTRAINT `qrtz_blob_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `QRTZ_TRIGGERS` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) ON DELETE RESTRICT ON UPDATE RESTRICT
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of QRTZ_BLOB_TRIGGERS
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for QRTZ_CALENDARS
+-- ----------------------------
+DROP TABLE IF EXISTS `QRTZ_CALENDARS`;
+CREATE TABLE `QRTZ_CALENDARS`  (
+  `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `CALENDAR_NAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `CALENDAR` blob NOT NULL,
+  PRIMARY KEY (`SCHED_NAME`, `CALENDAR_NAME`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of QRTZ_CALENDARS
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for QRTZ_CRON_TRIGGERS
+-- ----------------------------
+DROP TABLE IF EXISTS `QRTZ_CRON_TRIGGERS`;
+CREATE TABLE `QRTZ_CRON_TRIGGERS`  (
+  `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `TRIGGER_NAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `TRIGGER_GROUP` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `CRON_EXPRESSION` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `TIME_ZONE_ID` varchar(80) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE,
+  CONSTRAINT `qrtz_cron_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `QRTZ_TRIGGERS` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) ON DELETE RESTRICT ON UPDATE RESTRICT
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of QRTZ_CRON_TRIGGERS
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for QRTZ_FIRED_TRIGGERS
+-- ----------------------------
+DROP TABLE IF EXISTS `QRTZ_FIRED_TRIGGERS`;
+CREATE TABLE `QRTZ_FIRED_TRIGGERS`  (
+  `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `ENTRY_ID` varchar(95) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `TRIGGER_NAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `TRIGGER_GROUP` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `INSTANCE_NAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `FIRED_TIME` bigint(0) NOT NULL,
+  `SCHED_TIME` bigint(0) NOT NULL,
+  `PRIORITY` int(0) NOT NULL,
+  `STATE` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `JOB_NAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  `JOB_GROUP` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  `IS_NONCONCURRENT` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  `REQUESTS_RECOVERY` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`SCHED_NAME`, `ENTRY_ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of QRTZ_FIRED_TRIGGERS
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for QRTZ_JOB_DETAILS
+-- ----------------------------
+DROP TABLE IF EXISTS `QRTZ_JOB_DETAILS`;
+CREATE TABLE `QRTZ_JOB_DETAILS`  (
+  `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `JOB_NAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `JOB_GROUP` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `DESCRIPTION` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  `JOB_CLASS_NAME` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `IS_DURABLE` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `IS_NONCONCURRENT` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `IS_UPDATE_DATA` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `REQUESTS_RECOVERY` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `JOB_DATA` blob NULL,
+  PRIMARY KEY (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of QRTZ_JOB_DETAILS
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for QRTZ_LOCKS
+-- ----------------------------
+DROP TABLE IF EXISTS `QRTZ_LOCKS`;
+CREATE TABLE `QRTZ_LOCKS`  (
+  `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `LOCK_NAME` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  PRIMARY KEY (`SCHED_NAME`, `LOCK_NAME`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of QRTZ_LOCKS
+-- ----------------------------
+INSERT INTO `QRTZ_LOCKS` VALUES ('clusteredScheduler', 'STATE_ACCESS');
+
+-- ----------------------------
+-- Table structure for QRTZ_PAUSED_TRIGGER_GRPS
+-- ----------------------------
+DROP TABLE IF EXISTS `QRTZ_PAUSED_TRIGGER_GRPS`;
+CREATE TABLE `QRTZ_PAUSED_TRIGGER_GRPS`  (
+  `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `TRIGGER_GROUP` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  PRIMARY KEY (`SCHED_NAME`, `TRIGGER_GROUP`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of QRTZ_PAUSED_TRIGGER_GRPS
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for QRTZ_SCHEDULER_STATE
+-- ----------------------------
+DROP TABLE IF EXISTS `QRTZ_SCHEDULER_STATE`;
+CREATE TABLE `QRTZ_SCHEDULER_STATE`  (
+  `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `INSTANCE_NAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `LAST_CHECKIN_TIME` bigint(0) NOT NULL,
+  `CHECKIN_INTERVAL` bigint(0) NOT NULL,
+  PRIMARY KEY (`SCHED_NAME`, `INSTANCE_NAME`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of QRTZ_SCHEDULER_STATE
+-- ----------------------------
+INSERT INTO `QRTZ_SCHEDULER_STATE` VALUES ('clusteredScheduler', 'BF-2023081715191699970687710', 1699972370383, 10000);
+
+-- ----------------------------
+-- Table structure for QRTZ_SIMPLE_TRIGGERS
+-- ----------------------------
+DROP TABLE IF EXISTS `QRTZ_SIMPLE_TRIGGERS`;
+CREATE TABLE `QRTZ_SIMPLE_TRIGGERS`  (
+  `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `TRIGGER_NAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `TRIGGER_GROUP` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `REPEAT_COUNT` bigint(0) NOT NULL,
+  `REPEAT_INTERVAL` bigint(0) NOT NULL,
+  `TIMES_TRIGGERED` bigint(0) NOT NULL,
+  PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE,
+  CONSTRAINT `qrtz_simple_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `QRTZ_TRIGGERS` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) ON DELETE RESTRICT ON UPDATE RESTRICT
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of QRTZ_SIMPLE_TRIGGERS
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for QRTZ_SIMPROP_TRIGGERS
+-- ----------------------------
+DROP TABLE IF EXISTS `QRTZ_SIMPROP_TRIGGERS`;
+CREATE TABLE `QRTZ_SIMPROP_TRIGGERS`  (
+  `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `TRIGGER_NAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `TRIGGER_GROUP` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `STR_PROP_1` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  `STR_PROP_2` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  `STR_PROP_3` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  `INT_PROP_1` int(0) NULL DEFAULT NULL,
+  `INT_PROP_2` int(0) NULL DEFAULT NULL,
+  `LONG_PROP_1` bigint(0) NULL DEFAULT NULL,
+  `LONG_PROP_2` bigint(0) NULL DEFAULT NULL,
+  `DEC_PROP_1` decimal(13, 4) NULL DEFAULT NULL,
+  `DEC_PROP_2` decimal(13, 4) NULL DEFAULT NULL,
+  `BOOL_PROP_1` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  `BOOL_PROP_2` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE,
+  CONSTRAINT `qrtz_simprop_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `QRTZ_TRIGGERS` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) ON DELETE RESTRICT ON UPDATE RESTRICT
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of QRTZ_SIMPROP_TRIGGERS
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for QRTZ_TRIGGERS
+-- ----------------------------
+DROP TABLE IF EXISTS `QRTZ_TRIGGERS`;
+CREATE TABLE `QRTZ_TRIGGERS`  (
+  `SCHED_NAME` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `TRIGGER_NAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `TRIGGER_GROUP` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `JOB_NAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `JOB_GROUP` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `DESCRIPTION` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  `NEXT_FIRE_TIME` bigint(0) NULL DEFAULT NULL,
+  `PREV_FIRE_TIME` bigint(0) NULL DEFAULT NULL,
+  `PRIORITY` int(0) NULL DEFAULT NULL,
+  `TRIGGER_STATE` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `TRIGGER_TYPE` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `START_TIME` bigint(0) NOT NULL,
+  `END_TIME` bigint(0) NULL DEFAULT NULL,
+  `CALENDAR_NAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  `MISFIRE_INSTR` smallint(0) NULL DEFAULT NULL,
+  `JOB_DATA` blob NULL,
+  PRIMARY KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) USING BTREE,
+  INDEX `SCHED_NAME`(`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) USING BTREE,
+  CONSTRAINT `qrtz_triggers_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) REFERENCES `QRTZ_JOB_DETAILS` (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) ON DELETE RESTRICT ON UPDATE RESTRICT
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of QRTZ_TRIGGERS
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for sys_job
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_job`;
+CREATE TABLE `sys_job`  (
+  `job_id` bigint(0) NOT NULL COMMENT '任务id',
+  `job_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '任务名称',
+  `job_group` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '任务组名',
+  `job_order` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '1' COMMENT '组内执行顺利,值越大执行优先级越高,最大值9,最小值1',
+  `job_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '1' COMMENT '1、java类;2、spring bean名称;3、rest调用;4、jar调用;9其他',
+  `execute_path` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'job_type=3时,rest调用地址,仅支持rest get协议,需要增加String返回值,0成功,1失败;job_type=4时,jar路径;其它值为空',
+  `class_name` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'job_type=1时,类完整路径;job_type=2时,spring bean名称;其它值为空',
+  `method_name` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '任务方法',
+  `method_params_value` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '参数值',
+  `cron_expression` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'cron执行表达式',
+  `misfire_policy` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '3' COMMENT '错失执行策略(1错失周期立即执行 2错失周期执行一次 3下周期执行)',
+  `job_tenant_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '1' COMMENT '1、多租户任务;2、非多租户任务',
+  `job_status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '0' COMMENT '状态(1、未发布;2、运行中;3、暂停;4、删除;)',
+  `job_execute_status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '0' COMMENT '状态(0正常 1异常)',
+  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建者',
+  `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+  `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '更新者',
+  `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '更新时间',
+  `start_time` timestamp(0) NULL DEFAULT NULL COMMENT '初次执行时间',
+  `previous_time` timestamp(0) NULL DEFAULT NULL COMMENT '上次执行时间',
+  `next_time` timestamp(0) NULL DEFAULT NULL COMMENT '下次执行时间',
+  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '备注信息',
+  PRIMARY KEY (`job_id`, `job_name`, `job_group`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '定时任务调度表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_job
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for sys_job_log
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_job_log`;
+CREATE TABLE `sys_job_log`  (
+  `job_log_id` bigint(0) NOT NULL COMMENT '任务日志ID',
+  `job_id` bigint(0) NOT NULL COMMENT '任务id',
+  `job_name` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '任务名称',
+  `job_group` varchar(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '任务组名',
+  `job_order` char(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '组内执行顺利,值越大执行优先级越高,最大值9,最小值1',
+  `job_type` char(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '1' COMMENT '1、java类;2、spring bean名称;3、rest调用;4、jar调用;9其他',
+  `execute_path` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT 'job_type=3时,rest调用地址,仅支持post协议;job_type=4时,jar路径;其它值为空',
+  `class_name` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT 'job_type=1时,类完整路径;job_type=2时,spring bean名称;其它值为空',
+  `method_name` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '任务方法',
+  `method_params_value` varchar(2000) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '参数值',
+  `cron_expression` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT 'cron执行表达式',
+  `job_message` varchar(500) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '日志信息',
+  `job_log_status` char(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '0' COMMENT '执行状态(0正常 1失败)',
+  `execute_time` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '执行时间',
+  `exception_info` varchar(2000) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '异常信息',
+  `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+  PRIMARY KEY (`job_log_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '定时任务执行日志表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of sys_job_log
+-- ----------------------------
+
+SET FOREIGN_KEY_CHECKS = 1;

+ 1 - 1
kxs-admin-ui/package.json

@@ -71,7 +71,7 @@
 		"not dead"
 	],
 	"bugs": {
-		"url": "https://sky4cloud.com"
+		"url": "https://com"
 	},
 	"engines": {
 		"node": ">=16.0.0",

+ 1 - 1
kxs-admin-ui/public/assets/fonts/fontawesome-webfont.svg

@@ -2209,7 +2209,7 @@ q0 -14 9 -23t23 -9t23 9t9 23q0 119 84.5 203.5t203.5 84.5z" />
 d="M1745 1239q10 -10 10 -23t-10 -23l-141 -141q-28 -28 -68 -28h-1344q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h576v64q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-64h512q40 0 68 -28zM768 320h256v-512q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v512zM1600 768
 q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-1344q-40 0 -68 28l-141 141q-10 10 -10 23t10 23l141 141q28 28 68 28h512v192h256v-192h576z" />
     <glyph glyph-name="_593" unicode="&#xf278;" horiz-adv-x="2048" 
-d="M2020 1525q28 -20 28 -53v-1408q0 -20 -11 -36t-29 -23l-640 -256q-24 -11 -48 0l-616 246l-616 -246q-10 -5 -24 -5q-19 0 -36 11q-28 20 -28 53v1408q0 20 11 36t29 23l640 256q24 11 48 0l616 -246l616 246q32 13 60 -6zM736 1390v-1270l576 -230v1270zM128 1173
+d="M2021 1525q28 -20 28 -53v-1408q0 -20 -11 -36t-29 -23l-640 -256q-24 -11 -48 0l-616 246l-616 -246q-10 -5 -24 -5q-19 0 -36 11q-28 20 -28 53v1408q0 20 11 36t29 23l640 256q24 11 48 0l616 -246l616 246q32 13 60 -6zM736 1390v-1270l576 -230v1270zM128 1173
 v-1270l544 217v1270zM1920 107v1270l-544 -217v-1270z" />
     <glyph glyph-name="_594" unicode="&#xf279;" horiz-adv-x="1792" 
 d="M512 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472q0 20 17 28l480 256q7 4 15 4zM1760 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472

+ 1 - 1
kxs-admin-ui/src/components/SvgIcon/index.vue

@@ -32,7 +32,7 @@ const props = defineProps({
 });
 
 // 在线链接、本地引入地址前缀
-const linesString = ['https', 'http', '/src', '/assets', 'data:image', import.meta.env.VITE_PUBLIC_PATH];
+const linesString = ['https', 'feign', '/src', '/assets', 'data:image', import.meta.env.VITE_PUBLIC_PATH];
 
 // 获取 icon 图标名称
 const getIconName = computed(() => {

+ 2 - 2
kxs-admin-ui/src/components/Upload/Image.vue

@@ -16,7 +16,7 @@
 		>
 			<template v-if="imageUrl">
 				<!-- 如果返回的是OSS 地址则不需要增加 baseURL -->
-				<img :src="imageUrl.includes('http') ? imageUrl : baseURL + imageUrl" class="upload-image" />
+				<img :src="imageUrl.includes('feign') ? imageUrl : baseURL + imageUrl" class="upload-image" />
 				<div class="upload-handle" @click.stop>
 					<div class="handle-icon" @click="editImg" v-if="!self_disabled">
 						<el-icon :size="props.iconSize"><Edit /></el-icon>
@@ -48,7 +48,7 @@
 			:teleported="true"
 			v-if="imgViewVisible"
 			@close="imgViewVisible = false"
-			:url-list="[imageUrl.includes('http') ? imageUrl : baseURL + imageUrl]"
+			:url-list="[imageUrl.includes('feign') ? imageUrl : baseURL + imageUrl]"
 		/>
 	</div>
 </template>

+ 1 - 1
kxs-admin-ui/src/i18n/lang/en.ts

@@ -122,7 +122,7 @@ export default {
 	},
 	noAccess: {
 		accessTitle: 'You Are Not Authorized to Operate~',
-		accessMsg: 'Contact Information: Add QQ Group Discussion 665452019',
+		accessMsg: 'Contact Information: Add QQ Group Discussion 665452021',
 		accessBtn: 'Reauthorization',
 	},
 	layout: {

+ 1 - 1
kxs-admin-ui/src/i18n/lang/zh-cn.ts

@@ -115,7 +115,7 @@ export default {
 	},
 	noAccess: {
 		accessTitle: '您未被授权,没有操作权限~',
-		accessMsg: '联系方式:加QQ群探讨 665452019',
+		accessMsg: '联系方式:加QQ群探讨 665452021',
 		accessBtn: '重新授权',
 	},
 	layout: {

+ 1 - 1
kxs-admin-ui/src/router/backEnd.ts

@@ -125,7 +125,7 @@ export async function setBackEndControlRefreshRoutes() {
 export function backEndComponent(routes: any) {
 	if (!routes) return;
 	return routes.map((item: any) => {
-		if (item.path && item.path.startsWith('http')) {
+		if (item.path && item.path.startsWith('feign')) {
 			if (item.meta.isIframe) {
 				item.component = () => import('/@/layout/routerView/iframes.vue');
 			} else {

+ 1 - 1
kxs-admin-ui/src/utils/toolsValidate.ts

@@ -1,5 +1,5 @@
 /**
- * 2020.11.29 lyt 整理
+ * 2021.11.29 lyt 整理
  * 工具类集合,适用于平时开发
  * 新增多行注释信息,鼠标放到方法名即可查看
  */

+ 1 - 1
kxs-admin-ui/src/views/admin/menu/form.vue

@@ -40,7 +40,7 @@
         <IconSelector :placeholder="$t('sysmenu.inputIconTip')" v-model="state.ruleForm.icon"/>
       </el-form-item>
       <el-form-item :label="$t('sysmenu.embedded')" prop="embedded"
-                    v-if="state.ruleForm.menuType === '0' && state.ruleForm.path?.startsWith('http')">
+                    v-if="state.ruleForm.menuType === '0' && state.ruleForm.path?.startsWith('feign')">
         <el-radio-group v-model="state.ruleForm.embedded">
           <el-radio border label="0">否</el-radio>
           <el-radio border label="1">是</el-radio>

+ 2 - 2
kxs-admin-ui/tsconfig.json

@@ -4,8 +4,8 @@
 
 		/* Basic Options */
 		// "incremental": true,                   /* Enable incremental compilation */
-		"target": "esnext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
-		"module": "esnext" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
+		"target": "esnext" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2021', 'ES2021', 'ES2021', or 'ESNEXT'. */,
+		"module": "esnext" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2021', or 'ESNext'. */,
 		"lib": ["esnext", "dom", "dom.iterable", "scripthost"] /* Specify library files to be included in the compilation. */,
 		// "allowJs": true,                       /* Allow javascript files to be compiled. */
 		// "checkJs": true,                       /* Report errors in .js files. */

+ 0 - 47
kxs-admin/pom.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.kxs</groupId>
-        <artifactId>kxs</artifactId>
-        <version>1.1.0</version>
-    </parent>
-
-    <artifactId>kxs-admin</artifactId>
-    <packaging>jar</packaging>
-
-    <description>用户权限管理系统业务处理模块</description>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-    <dependencies>
-        <!--undertow容器-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-undertow</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.kxs</groupId>
-            <artifactId>kxs-system-biz</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-captcha</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-</project>

+ 0 - 25
kxs-admin/src/main/java/com/kxs/admin/api/AdminApplication.java

@@ -1,25 +0,0 @@
-package com.kxs.admin.api;
-
-import com.kxs.common.security.annotation.EnableAuthResourceServer;
-import com.kxs.common.security.annotation.EnableLoginResourceServer;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * @author 没秃顶的码农
- * @date 2018年06月21日
- * <p>
- * 用户统一管理系统
- */
-@SpringBootApplication(scanBasePackages = {"com.kxs.system.**", "com.kxs.admin.**","com.kxs.common.**"})
-@EnableLoginResourceServer
-@EnableAuthResourceServer
-@MapperScan("com.kxs.**.mapper")
-public class AdminApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(AdminApplication.class, args);
-	}
-
-}

+ 0 - 38
kxs-admin/src/main/java/com/kxs/admin/api/config/AdminConfiguration.java

@@ -1,38 +0,0 @@
-package com.kxs.admin.api.config;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.kxs.admin.api.filter.ValidateCodeFilter;
-import com.kxs.admin.api.handler.ImageCodeHandler;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.core.RedisTemplate;
-
-
-/**
- * 全局配置
- *
- * @author 没秃顶的码农
- * @date 2023/11/04
- */
-@Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties()
-public class AdminConfiguration {
-
-	@Bean
-	public ImageCodeHandler imageCodeHandler(RedisTemplate<String, Object> redisTemplate) {
-		return new ImageCodeHandler(redisTemplate);
-	}
-
-
-	/**
-	 * 验证码过滤器
-	 *
-	 * @return 验证代码筛选器
-	 */
-	@Bean
-	public ValidateCodeFilter validateCodeGatewayFilter() {
-		return new ValidateCodeFilter();
-	}
-
-}

+ 0 - 35
kxs-admin/src/main/java/com/kxs/admin/api/config/RouterFunctionConfiguration.java

@@ -1,35 +0,0 @@
-package com.kxs.admin.api.config;
-
-import com.kxs.admin.api.handler.ImageCodeHandler;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.servlet.function.RequestPredicates;
-import org.springframework.web.servlet.function.RouterFunction;
-import org.springframework.web.servlet.function.RouterFunctions;
-import org.springframework.web.servlet.function.ServerResponse;
-
-
-/**
- * 路由配置信息
- *
- * @author 没秃顶的码农
- * @date 2023/11/04
- */
-@Slf4j
-@Configuration(proxyBeanMethods = false)
-@RequiredArgsConstructor
-public class RouterFunctionConfiguration {
-
-	private final ImageCodeHandler imageCodeHandler;
-
-	@Bean
-	public RouterFunction<ServerResponse> routerFunction() {
-		return RouterFunctions.route(
-				RequestPredicates.path("/code").and(RequestPredicates.accept(MediaType.TEXT_PLAIN)), imageCodeHandler);
-	}
-}

+ 0 - 31
kxs-admin/src/main/java/com/kxs/admin/api/filter/RequestDecoderFilter.java

@@ -1,31 +0,0 @@
-package com.kxs.admin.api.filter;
-
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import java.io.IOException;
-
-
-/**
- * 请求解密滤波器
- *
- * @author 没秃顶的码农
- * @date 2023/11/04
- */
-@Slf4j
-@RequiredArgsConstructor
-public class RequestDecoderFilter extends OncePerRequestFilter {
-
-	@Override
-	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
-			throws ServletException, IOException {
-
-
-		filterChain.doFilter(request, response);
-    }
-}

+ 0 - 99
kxs-admin/src/main/java/com/kxs/admin/api/filter/ValidateCodeFilter.java

@@ -1,99 +0,0 @@
-package com.kxs.admin.api.filter;
-
-import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.kxs.common.core.constant.CacheConstants;
-import com.kxs.common.core.constant.SecurityConstants;
-import com.kxs.common.core.constant.enums.ErrorTypeEnum;
-import com.kxs.common.core.exception.ValidateCodeException;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.core.annotation.Order;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.filter.OncePerRequestFilter;
-import org.springframework.web.servlet.HandlerExceptionResolver;
-
-
-/**
- * 验证码过滤器
- *
- * @author 没秃顶的码农
- * @date 2023/11/04
- */
-@Slf4j
-@Order(Integer.MIN_VALUE)
-public class ValidateCodeFilter extends OncePerRequestFilter {
-
-	@Autowired
-	private RedisTemplate<String, Object> redisTemplate;
-
-	@Autowired
-	@Qualifier(value = "handlerExceptionResolver")
-	private HandlerExceptionResolver resolver;
-
-	@Override
-	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain){
-
-		try {
-
-			checkCode(request);
-
-			filterChain.doFilter(request, response);
-		}catch (Exception e) {
-			resolver.resolveException(request, response, null,
-					new ValidateCodeException(e.getMessage()));
-		}
-
-	}
-
-	/**
-	 * 不走过滤器的请求
-	 *
-	 * @param request 要求
-	 * @return boolean true 不走拦截器
-	 */
-	@Override
-	protected boolean shouldNotFilter(HttpServletRequest request) {
-
-		//是否登录请求
-		boolean isAuthToken = CharSequenceUtil.containsAnyIgnoreCase(request.getRequestURI(),
-				SecurityConstants.OAUTH_TOKEN_URL);
-
-		return !isAuthToken;
-	}
-
-	/**
-	 * 检查验证码
-	 *
-	 * @param request  HTTP请求
-	 * @throws ValidateCodeException 验证码异常
-	 */
-	@SneakyThrows
-	private void checkCode(HttpServletRequest request) {
-		String code = request.getParameter("code");
-
-		if (CharSequenceUtil.isBlank(code)) {
-			throw new ValidateCodeException(ErrorTypeEnum.VERIFICATION_CODE_IS_EMPTY.getDescription());
-		}
-
-		String randomStr = StrUtil.blankToDefault(request.getParameter("randomStr"),
-				request.getParameter(SecurityConstants.SMS_PARAMETER_NAME));
-
-		String key = CacheConstants.DEFAULT_CODE_KEY + randomStr;
-
-		Object codeObj = redisTemplate.opsForValue().get(key);
-
-		if (ObjectUtil.isEmpty(codeObj) || !code.equals(codeObj)) {
-			throw new ValidateCodeException(ErrorTypeEnum.VERIFICATION_CODE_IS_ILLEGAL.getDescription());
-		}
-
-		redisTemplate.delete(key);
-	}
-
-}

+ 0 - 64
kxs-admin/src/main/java/com/kxs/admin/api/handler/ImageCodeHandler.java

@@ -1,64 +0,0 @@
-package com.kxs.admin.api.handler;
-
-import cn.hutool.captcha.CaptchaUtil;
-import cn.hutool.captcha.LineCaptcha;
-import cn.hutool.captcha.generator.RandomGenerator;
-import com.kxs.common.core.constant.CacheConstants;
-import com.kxs.common.core.constant.SecurityConstants;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.util.FastByteArrayOutputStream;
-import org.springframework.web.servlet.function.HandlerFunction;
-import org.springframework.web.servlet.function.ServerRequest;
-import org.springframework.web.servlet.function.ServerResponse;
-
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
-
-/**
- * 验证码生成逻辑处理类
- *
- * @author 没秃顶的码农
- * @date 2023/11/03
- */
-@Slf4j
-@RequiredArgsConstructor
-public class ImageCodeHandler implements HandlerFunction<ServerResponse> {
-
-	private static final Integer DEFAULT_IMAGE_WIDTH = 100;
-
-	private static final Integer DEFAULT_IMAGE_HEIGHT = 40;
-
-	private final RedisTemplate<String, Object> redisTemplate;
-
-	@Override
-	public ServerResponse handle(ServerRequest serverRequest) {
-
-		// 保存验证码信息
-		Optional<String> randomStr = serverRequest.param("randomStr");
-
-		//生成验证码
-		RandomGenerator randomGenerator = new RandomGenerator("0123456789", 4);
-		LineCaptcha lineCaptcha = CaptchaUtil.createLineCaptcha(DEFAULT_IMAGE_WIDTH, DEFAULT_IMAGE_HEIGHT);
-		lineCaptcha.setGenerator(randomGenerator);
-
-		redisTemplate.setKeySerializer(new StringRedisSerializer());
-		randomStr.ifPresent(s -> redisTemplate.opsForValue()
-				.set(CacheConstants.DEFAULT_CODE_KEY + s, lineCaptcha.getCode(), SecurityConstants.CODE_TIME, TimeUnit.SECONDS));
-
-		// 转换流信息写出
-		FastByteArrayOutputStream os = new FastByteArrayOutputStream();
-		lineCaptcha.write(os);
-		return ServerResponse.status(HttpStatus.OK)
-				.contentType(MediaType.IMAGE_JPEG)
-				.body(new ByteArrayResource(os.toByteArray()));
-
-	}
-
-}

+ 0 - 81
kxs-admin/src/main/resources/application.yml

@@ -1,81 +0,0 @@
-server:
-  port: 8080
-  servlet:
-    context-path: /v1/kxs/admin
-
-spring:
-  profiles:
-    active: dev
-  application:
-    name: kxs-admin
-  cache:
-    type: REDIS
-    redis:
-      time-to-live: 1h # 设置过期时间为 1 小时
-  data:
-    redis:
-      host: localhost
-      repositories:
-        enabled: false # 项目未使用到 Spring Data Redis 的 Repository,所以直接禁用,保证启动速度\
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: root
-    url: jdbc:mysql://localhost:3306/kxs?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-
-  # Servlet 配置
-  servlet:
-    # 文件上传相关配置项
-    multipart:
-      max-file-size: 16MB # 单个文件大小
-      max-request-size: 32MB # 设置总上传的文件大小
-
---- #################### 接口文档配置 ####################
-
-springdoc:
-  api-docs:
-    enabled: true
-    path: /v3/api-docs
-  swagger-ui:
-    enabled: true
-    path: /swagger-ui
-  default-flat-param-object: true # 参见 https://doc.xiaominfo.com/docs/faq/v4/knife4j-parameterobject-flat-param 文档
-
-knife4j:
-  enable: true
-  setting:
-    language: zh_cn
-
-# mybaits-plus配置
-mybatis-plus:
-  mapper-locations: classpath*:/mapper/*.xml
-  global-config:
-    banner: false # 关闭控制台的 Banner 打印
-    db-config:
-      id-type: auto
-      table-underline: true
-      logic-delete-value: 1  # 逻辑已删除值(默认为 1)
-      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
-  type-handlers-package: com.kxs.common.mybatis.handler
-  configuration:
-    map-underscore-to-camel-case: true
-    shrink-whitespaces-in-sql: true
-
-spring:
-  freemarker:
-    allow-request-override: false
-    allow-session-override: false
-    cache: true
-    charset: UTF-8
-    check-template-location: true
-    content-type: text/html
-    enabled: true
-    expose-request-attributes: false
-    expose-session-attributes: false
-    expose-spring-macro-helpers: true
-    prefer-file-system-access: true
-    suffix: .ftl
-    template-loader-path: classpath:/templates/
-
-

+ 0 - 31
kxs-app/pom.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.kxs</groupId>
-        <artifactId>kxs</artifactId>
-        <version>1.1.0</version>
-    </parent>
-
-    <artifactId>kxs-app</artifactId>
-    <packaging>jar</packaging>
-
-    <description>kxs 客户端API模块</description>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-core</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

+ 1 - 0
kxs-codegen/pom.xml

@@ -85,6 +85,7 @@
 			<artifactId>jasypt-spring-boot-starter</artifactId>
 			<version>${jasypt.version}</version>
 		</dependency>
+
 	</dependencies>
 
 </project>

+ 2 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/KxsCodeGenApplication.java

@@ -4,13 +4,12 @@ package com.kxs.codegen.biz;
 
 import com.kxs.common.datasource.annotation.EnableDynamicDataSource;
 import com.kxs.common.security.annotation.EnableAuthResourceServer;
-import com.kxs.common.security.annotation.EnableLoginResourceServer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
- * @author lengleng
- * @date 2018/07/29 代码生成模块
+ * @author LXQ
+ * @date 2021/07/29 代码生成模块
  */
 @EnableDynamicDataSource
 @EnableAuthResourceServer

+ 2 - 2
kxs-codegen/src/main/java/com/kxs/codegen/biz/controller/GenDsConfController.java

@@ -24,8 +24,8 @@ import javax.sql.DataSource;
 /**
  * 数据源管理
  *
- * @author lengleng
- * @date 2019-03-31 16:00:20
+ * @author LXQ
+ * @date 2021-03-31 16:00:20
  */
 @RestController
 @RequiredArgsConstructor

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/controller/GenFieldTypeController.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.controller;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/controller/GenGroupController.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.controller;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/controller/GenTableController.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.controller;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/controller/GenTemplateController.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.controller;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/controller/GenTemplateGroupController.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.controller;

+ 5 - 5
kxs-codegen/src/main/java/com/kxs/codegen/biz/controller/GeneratorController.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.controller;
@@ -38,8 +38,8 @@ import java.util.zip.ZipOutputStream;
 /**
  * 代码生成器
  *
- * @author lengleng
- * @date 2018-07-30
+ * @author LXQ
+ * @date 2021-07-30
  */
 @RestController
 @RequiredArgsConstructor

+ 5 - 5
kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/ColumnEntity.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.entity;
@@ -20,8 +20,8 @@ package com.kxs.codegen.biz.entity;
 import lombok.Data;
 
 /**
- * @author lengleng
- * @date 2018/07/29 列属性: https://blog.csdn.net/lkforce/article/details/79557482
+ * @author LXQ
+ * @date 2021/07/29 列属性: https://blog.csdn.net/lkforce/article/details/79557482
  */
 @Data
 public class ColumnEntity {

+ 5 - 5
kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/GenConfig.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.entity;
@@ -20,8 +20,8 @@ package com.kxs.codegen.biz.entity;
 import lombok.Data;
 
 /**
- * @author lengleng
- * @date 2018/8/2 生成配置
+ * @author LXQ
+ * @date 2021/8/2 生成配置
  */
 @Data
 public class GenConfig {

+ 5 - 5
kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/GenDatasourceConf.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 package com.kxs.codegen.biz.entity;
 
@@ -26,8 +26,8 @@ import java.time.LocalDateTime;
 /**
  * 数据源表
  *
- * @author lengleng
- * @date 2019-03-31 16:00:20
+ * @author LXQ
+ * @date 2021-03-31 16:00:20
  */
 @Data
 @TableName("gen_datasource_conf")

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/GenFieldType.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.entity;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/GenGroupEntity.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.entity;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/GenTable.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.entity;

+ 4 - 4
kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/GenTableColumnEntity.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.entity;
@@ -23,7 +23,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * @author lengleng
+ * @author LXQ
  * @date 2023-02-06
  *
  * 记录表字段的配置信息

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/GenTemplateEntity.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.entity;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/GenTemplateGroupEntity.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.entity;

+ 5 - 5
kxs-codegen/src/main/java/com/kxs/codegen/biz/entity/TableEntity.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.entity;
@@ -22,8 +22,8 @@ import lombok.Data;
 import java.util.List;
 
 /**
- * @author lengleng
- * @date 2018/07/29 表属性: https://blog.csdn.net/lkforce/article/details/79557482
+ * @author LXQ
+ * @date 2021/07/29 表属性: https://blog.csdn.net/lkforce/article/details/79557482
  */
 @Data
 public class TableEntity {

+ 5 - 5
kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GenDatasourceConfMapper.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 package com.kxs.codegen.biz.mapper;
 
@@ -23,8 +23,8 @@ import org.apache.ibatis.annotations.Mapper;
 /**
  * 数据源表
  *
- * @author lengleng
- * @date 2019-03-31 16:00:20
+ * @author LXQ
+ * @date 2021-03-31 16:00:20
  */
 @Mapper
 public interface GenDatasourceConfMapper extends BaseMapper<GenDatasourceConf> {

+ 4 - 4
kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GenDynamicMapper.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.mapper;
@@ -27,7 +27,7 @@ import java.util.List;
 /**
  * 动态查询
  *
- * @author lengleng
+ * @author LXQ
  * @date 2022-07-09
  */
 @Mapper

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GenFieldTypeMapper.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.mapper;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GenGroupMapper.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.mapper;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GenTableColumnMapper.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.mapper;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GenTableMapper.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.mapper;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GenTemplateGroupMapper.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.mapper;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GenTemplateMapper.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.mapper;

+ 5 - 5
kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GeneratorMapper.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.mapper;
@@ -31,8 +31,8 @@ import java.util.Map;
 /**
  * 代码生成器
  *
- * @author lengleng
- * @date 2018-07-30
+ * @author LXQ
+ * @date 2021-07-30
  */
 public interface GeneratorMapper extends BaseMapper<ColumnEntity> {
 

+ 5 - 5
kxs-codegen/src/main/java/com/kxs/codegen/biz/mapper/GeneratorMysqlMapper.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.mapper;
@@ -22,8 +22,8 @@ import org.apache.ibatis.annotations.Mapper;
 /**
  * 支持 mysql 代码生成器
  *
- * @author lengleng
- * @date 2020-12-11
+ * @author LXQ
+ * @date 2021-12-11
  */
 @Mapper
 public interface GeneratorMysqlMapper extends GeneratorMapper {

+ 5 - 5
kxs-codegen/src/main/java/com/kxs/codegen/biz/service/GenDatasourceConfService.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 package com.kxs.codegen.biz.service;
 
@@ -22,8 +22,8 @@ import com.kxs.codegen.biz.entity.GenDatasourceConf;
 /**
  * 数据源表
  *
- * @author lengleng
- * @date 2019-03-31 16:00:20
+ * @author LXQ
+ * @date 2021-03-31 16:00:20
  */
 public interface GenDatasourceConfService extends IService<GenDatasourceConf> {
 

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/service/GenFieldTypeService.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.service;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/service/GenGroupService.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.service;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/service/GenTableColumnService.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.service;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/service/GenTableService.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.service;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/service/GenTemplateGroupService.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.service;

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/service/GenTemplateService.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.service;

+ 5 - 5
kxs-codegen/src/main/java/com/kxs/codegen/biz/service/GeneratorService.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.service;
@@ -22,8 +22,8 @@ import java.util.Map;
 import java.util.zip.ZipOutputStream;
 
 /**
- * @author lengleng
- * @date 2018/7/29
+ * @author LXQ
+ * @date 2021/7/29
  */
 public interface GeneratorService {
 

+ 5 - 5
kxs-codegen/src/main/java/com/kxs/codegen/biz/service/impl/GenDatasourceConfServiceImpl.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 package com.kxs.codegen.biz.service.impl;
 
@@ -42,8 +42,8 @@ import java.sql.SQLException;
 /**
  * 数据源表
  *
- * @author lengleng
- * @date 2019-03-31 16:00:20
+ * @author LXQ
+ * @date 2021-03-31 16:00:20
  */
 @Slf4j
 @Service

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/service/impl/GenFieldTypeServiceImpl.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 package com.kxs.codegen.biz.service.impl;
 

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/service/impl/GenGroupServiceImpl.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 package com.kxs.codegen.biz.service.impl;
 

+ 2 - 2
kxs-codegen/src/main/java/com/kxs/codegen/biz/service/impl/GenTableColumnServiceImpl.java

@@ -21,8 +21,8 @@ import java.util.stream.Collectors;
 /**
  * 表字段信息管理
  *
- * @author lengleng
- * @date 2020/5/18
+ * @author LXQ
+ * @date 2021/5/18
  */
 @Service
 @RequiredArgsConstructor

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/service/impl/GenTableServiceImpl.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 package com.kxs.codegen.biz.service.impl;
 

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/service/impl/GenTemplateGroupServiceImpl.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 package com.kxs.codegen.biz.service.impl;
 

+ 3 - 3
kxs-codegen/src/main/java/com/kxs/codegen/biz/service/impl/GenTemplateServiceImpl.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 package com.kxs.codegen.biz.service.impl;
 

+ 5 - 5
kxs-codegen/src/main/java/com/kxs/codegen/biz/service/impl/GeneratorServiceImpl.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *    Copyright (c) 2021-2025, LXQ All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -9,10 +9,10 @@
  * Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
- * Neither the name of the sky4cloud.com developer nor the names of its
+ * Neither the name of the com developer nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
+ * Author: LXQ (609827073@qq.com)
  */
 
 package com.kxs.codegen.biz.service.impl;
@@ -45,8 +45,8 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 /**
- * @author lengleng
- * @date 2018-07-30
+ * @author LXQ
+ * @date 2021-07-30
  * <p>
  * 代码生成器
  */

+ 1 - 1
kxs-codegen/src/main/java/com/kxs/codegen/biz/util/CommonColumnFiledEnum.java

@@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * @author lengleng
+ * @author LXQ
  * @date 2023/3/12
  * <p>
  * 通用字段的填充策略和显示策略

+ 1 - 1
kxs-codegen/src/main/java/com/kxs/codegen/biz/util/DictTool.java

@@ -7,7 +7,7 @@ import java.util.HashSet;
 import java.util.List;
 
 /**
- * @author lengleng
+ * @author LXQ
  * @date 2023/2/7
  */
 public class DictTool {

+ 1 - 1
kxs-codegen/src/main/java/com/kxs/codegen/biz/util/GenKit.java

@@ -15,7 +15,7 @@ import java.util.Map;
 /**
  * 代码生成工具类
  *
- * @author lengleng
+ * @author LXQ
  * @date 2023/2/16
  */
 @UtilityClass

+ 1 - 1
kxs-codegen/src/main/java/com/kxs/codegen/biz/util/NamingCaseTool.java

@@ -5,7 +5,7 @@ import cn.hutool.core.text.NamingCase;
 /**
  * 命名规则处理,针对驼峰,下划线等处理
  *
- * @author lengleng
+ * @author LXQ
  * @date 2023/1/31
  */
 public class NamingCaseTool {

+ 1 - 1
kxs-codegen/src/main/java/com/kxs/codegen/biz/util/VelocityKit.java

@@ -15,7 +15,7 @@ import java.util.Properties;
 /**
  * 模板引擎工具类
  *
- * @author lengleng
+ * @author LXQ
  * @date 2023/2/7
  */
 @Service

+ 1 - 1
kxs-codegen/src/main/java/com/kxs/codegen/biz/util/vo/SqlDto.java

@@ -3,7 +3,7 @@ package com.kxs.codegen.biz.util.vo;
 import lombok.Data;
 
 /**
- * @author lengleng
+ * @author LXQ
  * @date 2022/5/2
  */
 @Data

+ 5 - 5
kxs-codegen/src/main/resources/logback-spring.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~    Copyright (c) 2018-2025, lengleng All rights reserved.
+  ~    Copyright (c) 2021-2025, LXQ All rights reserved.
   ~
   ~ Redistribution and use in source and binary forms, with or without
   ~ modification, are permitted provided that the following conditions are met:
@@ -10,16 +10,16 @@
   ~ Redistributions in binary form must reproduce the above copyright
   ~ notice, this list of conditions and the following disclaimer in the
   ~ documentation and/or other materials provided with the distribution.
-  ~ Neither the name of the sky4cloud.com developer nor the names of its
+  ~ Neither the name of the com developer nor the names of its
   ~ contributors may be used to endorse or promote products derived from
   ~ this software without specific prior written permission.
-  ~ Author: lengleng (wangiegie@gmail.com)
+  ~ Author: LXQ (609827073@qq.com)
   -->
 
 <!--
     小技巧: 在根pom里面设置统一存放路径,统一管理方便维护
     <properties>
-        <log-path>/Users/lengleng</log-path>
+        <log-path>/Users/lxq</log-path>
     </properties>
     1. 其他模块加日志输出,直接copy本文件放在resources 目录即可
     2. 注意修改 <property name="${log-path}/log.path" value=""/> 的value模块
@@ -80,7 +80,7 @@
 		<appender-ref ref="error"/>
 	</logger>
 	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
-	<root level="debug">
+	<root level="INFO">
 		<appender-ref ref="console"/>
 		<appender-ref ref="debug"/>
 		<appender-ref ref="error"/>

+ 3 - 3
kxs-codegen/src/main/resources/mapper/GenFieldTypeMapper.xml

@@ -2,7 +2,7 @@
 
 <!--
   ~
-  ~      Copyright (c) 2018-2025, lengleng All rights reserved.
+  ~      Copyright (c) 2021-2025, LXQ All rights reserved.
   ~
   ~  Redistribution and use in source and binary forms, with or without
   ~  modification, are permitted provided that the following conditions are met:
@@ -12,10 +12,10 @@
   ~  Redistributions in binary form must reproduce the above copyright
   ~  notice, this list of conditions and the following disclaimer in the
   ~  documentation and/or other materials provided with the distribution.
-  ~  Neither the name of the sky4cloud.com developer nor the names of its
+  ~  Neither the name of the com developer nor the names of its
   ~  contributors may be used to endorse or promote products derived from
   ~  this software without specific prior written permission.
-  ~  Author: lengleng (wangiegie@gmail.com)
+  ~  Author: LXQ (609827073@qq.com)
   ~
   -->
 

+ 3 - 3
kxs-codegen/src/main/resources/mapper/GenTableMapper.xml

@@ -2,7 +2,7 @@
 
 <!--
   ~
-  ~      Copyright (c) 2018-2025, lengleng All rights reserved.
+  ~      Copyright (c) 2021-2025, LXQ All rights reserved.
   ~
   ~  Redistribution and use in source and binary forms, with or without
   ~  modification, are permitted provided that the following conditions are met:
@@ -12,10 +12,10 @@
   ~  Redistributions in binary form must reproduce the above copyright
   ~  notice, this list of conditions and the following disclaimer in the
   ~  documentation and/or other materials provided with the distribution.
-  ~  Neither the name of the sky4cloud.com developer nor the names of its
+  ~  Neither the name of the com developer nor the names of its
   ~  contributors may be used to endorse or promote products derived from
   ~  this software without specific prior written permission.
-  ~  Author: lengleng (wangiegie@gmail.com)
+  ~  Author: LXQ (609827073@qq.com)
   ~
   -->
 

+ 5 - 0
kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/config/JacksonConfiguration.java

@@ -3,6 +3,7 @@ package com.kxs.common.core.config;
 import cn.hutool.core.date.DatePattern;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.kxs.common.core.jackson.SkyJavaTimeModule;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -11,8 +12,11 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
 import org.springframework.context.annotation.Bean;
+import org.springframework.core.convert.converter.Converter;
 
+import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 import java.util.TimeZone;
 
@@ -30,6 +34,7 @@ import java.util.TimeZone;
 @AutoConfigureBefore(JacksonAutoConfiguration.class)
 public class JacksonConfiguration {
 
+
 	@Bean
 	@ConditionalOnMissingBean
 	public Jackson2ObjectMapperBuilderCustomizer customizer() {

+ 1 - 1
kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/CacheConstants.java

@@ -3,7 +3,7 @@ package com.kxs.common.core.constant;
 
 /**
  * @author 没秃顶的码农
- * @date 2020年01月01日
+ * @date 2021年01月01日
  * <p>
  * 缓存的key 常量
  */

+ 1 - 1
kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/CommonConstants.java

@@ -48,7 +48,7 @@ public interface CommonConstants {
 	/**
 	 * 前端工程名
 	 */
-	String FRONT_END_PROJECT = "kxs-ui";
+	String FRONT_END_PROJECT = "kxs-admin-ui";
 
 	/**
 	 * 后端工程名

+ 1 - 1
kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/SecurityConstants.java

@@ -120,5 +120,5 @@ public interface SecurityConstants {
 	/**
 	 * 项目的license
 	 */
-	String PROJECT_LICENSE = "https://sky4cloud.com";
+	String PROJECT_LICENSE = "https://com";
 }

+ 19 - 0
kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/ServiceNameConstants.java

@@ -0,0 +1,19 @@
+package com.kxs.common.core.constant;
+
+
+/**
+ * 服务名称
+ * 远程调用地址管理
+ * 如果用注册中心后,此处只用写服务名称
+ *
+ * @author 没秃顶的码农
+ * @date 2023/11/12
+ */
+public interface ServiceNameConstants {
+
+	/**
+	 * ADMIN模块
+	 */
+	String ADMIN_SERVICE = "http://localhost:8080";
+
+}

+ 22 - 0
kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/exception/AccessDeniedBizException.java

@@ -0,0 +1,22 @@
+
+package com.kxs.common.core.exception;
+
+
+import java.io.Serial;
+
+/**
+ * 权限异常
+ *
+ * @author 没秃顶的码农
+ * @date 2023/10/27
+ */
+public class AccessDeniedBizException extends RuntimeException {
+
+	@Serial
+	private static final long serialVersionUID = -7285211528095468156L;
+
+	public AccessDeniedBizException(String msg) {
+		super(msg);
+	}
+
+}

+ 2 - 2
kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/exception/GlobalBizExceptionHandler.java

@@ -77,9 +77,9 @@ public class GlobalBizExceptionHandler {
      * @param e the e
      * @return R
      */
-    @ExceptionHandler(AccessDeniedException.class)
+    @ExceptionHandler(AccessDeniedBizException.class)
     @ResponseStatus(HttpStatus.FORBIDDEN)
-    public R handleAccessDeniedException(AccessDeniedException e) {
+    public R handleAccessDeniedException(AccessDeniedBizException e) {
         log.warn("拒绝授权异常信息 ex={}", "Access is denied");
         return R.failed(e.getLocalizedMessage());
     }

+ 8 - 11
kxs-common/kxs-common-core/src/main/resources/banner.txt

@@ -1,17 +1,14 @@
 ${AnsiColor.BRIGHT_YELLOW}
 
-                :::::::::       :::::::::::       ::::::::
-               :+:    :+:          :+:          :+:    :+:
-              +:+    +:+          +:+          +:+
-             +#++:++#+           +#+          :#:
-            +#+                 +#+          +#+   +#+#
-           #+#                 #+#          #+#    #+#
-          ###             ###########       ########
+ ██   ██ ██     ██  ████████
+░██  ██ ░░██   ██  ██░░░░░░
+░██ ██   ░░██ ██  ░██
+░████     ░░███   ░█████████
+░██░██     ██░██  ░░░░░░░░██
+░██░░██   ██ ░░██        ░██
+░██ ░░██ ██   ░░██ ████████
+░░   ░░ ░░     ░░ ░░░░░░░░
 
-                       www.cdshikongyizhan.com
-
-                  sky Microservice Architecture
-${AnsiColor.DEFAULT}
 
 
 

+ 1 - 1
kxs-common/kxs-common-core/src/main/resources/logback-spring.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020 sky4cloud Authors. All Rights Reserved.
+  ~ Copyright (c) 2021 sky4cloud Authors. All Rights Reserved.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

+ 2 - 2
kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/DynamicDataSourceAutoConfiguration.java

@@ -25,8 +25,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @author lengleng
- * @date 2020-02-06
+ * @author LXQ
+ * @date 2021-02-06
  * <p>
  * 动态数据源切换配置
  */

+ 1 - 1
kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/annotation/EnableDynamicDataSource.java

@@ -7,7 +7,7 @@ import java.lang.annotation.*;
 
 /**
  * @author Lucky
- * @date 2019-05-18
+ * @date 2021-05-18
  * <p>
  * 开启动态数据源
  */

+ 2 - 2
kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/config/ClearTtlDataSourceFilter.java

@@ -7,8 +7,8 @@ import org.springframework.core.Ordered;
 import java.io.IOException;
 
 /**
- * @author lengleng
- * @date 2020/12/11
+ * @author LXQ
+ * @date 2021/12/11
  * <p>
  * 清空上文的DS 设置避免污染当前线程
  */

+ 2 - 2
kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/config/DataSourceProperties.java

@@ -4,8 +4,8 @@ import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
- * @author lengleng
- * @date 2019-05-14
+ * @author LXQ
+ * @date 2021-05-14
  * <p>
  */
 @Data

+ 3 - 3
kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/config/JdbcDynamicDataSourceProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 sky4cloud Authors. All Rights Reserved.
+ * Copyright (c) 2021 sky4cloud Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author lengleng
- * @date 2020/2/6
+ * @author LXQ
+ * @date 2021/2/6
  * <p>
  * 从数据源中获取 配置信息
  */

+ 3 - 3
kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/config/LastParamDsProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 sky4cloud Authors. All Rights Reserved.
+ * Copyright (c) 2021 sky4cloud Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import org.aopalliance.intercept.MethodInvocation;
 
 /**
- * @author lengleng
- * @date 2020/2/6
+ * @author LXQ
+ * @date 2021/2/6
  * <p>
  * 参数数据源解析 @DS("#last)
  */

+ 2 - 2
kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/enums/DsConfTypeEnum.java

@@ -4,8 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * @author lengleng
- * @date 2020/12/11
+ * @author LXQ
+ * @date 2021/12/11
  * <p>
  * 数据源配置类型
  */

+ 2 - 2
kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/enums/DsJdbcUrlEnum.java

@@ -6,8 +6,8 @@ import lombok.Getter;
 import java.util.Arrays;
 
 /**
- * @author lengleng
- * @date 2020/12/11
+ * @author LXQ
+ * @date 2021/12/11
  * <p>
  * jdbc-url
  */

+ 3 - 3
kxs-common/kxs-common-datasource/src/main/java/com/kxs/common/datasource/support/DataSourceConstants.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 sky4cloud Authors. All Rights Reserved.
+ * Copyright (c) 2021 sky4cloud Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 package com.kxs.common.datasource.support;
 
 /**
- * @author lengleng
- * @date 2019-04-01
+ * @author LXQ
+ * @date 2021-04-01
  * <p>
  * 数据源相关常量
  */

+ 8 - 0
kxs-common/kxs-common-log/src/main/java/com/kxs/common/log/LogAutoConfiguration.java

@@ -2,6 +2,8 @@ package com.kxs.common.log;
 
 import com.kxs.common.log.aspect.SysLogAspect;
 import com.kxs.common.log.config.SkyLogProperties;
+import com.kxs.common.log.event.SysLogListener;
+import com.kxs.system.api.feign.RemoteLogService;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -17,9 +19,15 @@ import org.springframework.scheduling.annotation.EnableAsync;
  */
 @EnableAsync
 @Configuration(proxyBeanMethods = false)
+@EnableConfigurationProperties(SkyLogProperties.class)
 @ConditionalOnProperty(value = "security.log.enabled", matchIfMissing = true)
 public class LogAutoConfiguration {
 
+	@Bean
+	public SysLogListener sysLogListener(SkyLogProperties logProperties, RemoteLogService remoteLogService) {
+		return new SysLogListener(remoteLogService, logProperties);
+	}
+
 	@Bean
 	public SysLogAspect sysLogAspect() {
 		return new SysLogAspect();

+ 2 - 0
kxs-common/kxs-common-log/src/main/java/com/kxs/common/log/event/SysLogEventSource.java

@@ -2,6 +2,7 @@ package com.kxs.common.log.event;
 
 import com.kxs.system.api.model.SysLog;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 
 /**
@@ -10,6 +11,7 @@ import lombok.Data;
  * @author 没秃顶的码农
  * @date 2023/10/28
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class SysLogEventSource extends SysLog {
 

+ 78 - 75
kxs-common/kxs-common-log/src/main/java/com/kxs/common/log/event/SysLogListener.java

@@ -1,75 +1,78 @@
-//package com.kxs.common.log.event;
-//
-//import cn.hutool.core.util.StrUtil;
-//import com.fasterxml.jackson.annotation.JsonFilter;
-//import com.fasterxml.jackson.databind.ObjectMapper;
-//import com.fasterxml.jackson.databind.ser.FilterProvider;
-//import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
-//import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
-//import com.kxs.common.core.jackson.SkyJavaTimeModule;
-//import com.kxs.system.api.model.SysLog;
-//import com.kxs.common.log.config.SkyLogProperties;
-//import lombok.RequiredArgsConstructor;
-//import lombok.SneakyThrows;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.BeanUtils;
-//import org.springframework.beans.factory.InitializingBean;
-//import org.springframework.context.event.EventListener;
-//import org.springframework.core.annotation.Order;
-//import org.springframework.scheduling.annotation.Async;
-//
-//import java.util.Objects;
-//
-//
-///**
-// * 异步监听日志事件
-// *
-// * @author 没秃顶的码农
-// * @date 2023/10/28
-// */
-//@Slf4j
-//@RequiredArgsConstructor
-//public class SysLogListener implements InitializingBean {
-//
-//	// new 一个 避免日志脱敏策略影响全局ObjectMapper
-//	private final static ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-//
-//	private final SysLogService sysLogService;
-//
-//	private final SkyLogProperties logProperties;
-//
-//	@SneakyThrows
-//	@Async
-//	@Order
-//	@EventListener(SysLogEvent.class)
-//	public void saveSysLog(SysLogEvent event) {
-//		SysLogEventSource source = (SysLogEventSource) event.getSource();
-//		SysLog sysLog = new SysLog();
-//		BeanUtils.copyProperties(source, sysLog);
-//
-//		// json 格式刷参数放在异步中处理,提升性能
-//		if (Objects.nonNull(source.getBody())) {
-//			String params = OBJECT_MAPPER.writeValueAsString(source.getBody());
-//			sysLog.setParams(StrUtil.subPre(params, logProperties.getMaxLength()));
-//		}
-//
-//		sysLogService.saveLog(sysLog);
-//	}
-//
-//	@Override
-//	public void afterPropertiesSet() {
-//		OBJECT_MAPPER.addMixIn(Object.class, PropertyFilterMixIn.class);
-//		String[] ignorableFieldNames = logProperties.getExcludeFields().toArray(new String[0]);
-//
-//		FilterProvider filters = new SimpleFilterProvider().addFilter("filter properties by name",
-//				SimpleBeanPropertyFilter.serializeAllExcept(ignorableFieldNames));
-//		OBJECT_MAPPER.setFilterProvider(filters);
-//		OBJECT_MAPPER.registerModule(new SkyJavaTimeModule());
-//	}
-//
-//	@JsonFilter("filter properties by name")
-//	class PropertyFilterMixIn {
-//
-//	}
-//
-//}
+package com.kxs.common.log.event;
+
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.annotation.JsonFilter;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ser.FilterProvider;
+import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
+import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
+import com.kxs.common.core.constant.SecurityConstants;
+import com.kxs.common.core.jackson.SkyJavaTimeModule;
+import com.kxs.common.log.config.SkyLogProperties;
+import com.kxs.system.api.feign.RemoteLogService;
+import com.kxs.system.api.model.SysLog;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.context.event.EventListener;
+import org.springframework.core.annotation.Order;
+import org.springframework.scheduling.annotation.Async;
+
+import java.util.Objects;
+
+
+/**
+ * 异步监听日志事件
+ *
+ * @author 没秃顶的码农
+ * @date 2023/10/28
+ */
+@Slf4j
+@RequiredArgsConstructor
+public class SysLogListener implements InitializingBean {
+
+	// new 一个 避免日志脱敏策略影响全局ObjectMapper
+	private final static ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+	private final RemoteLogService remoteLogService;
+
+	private final SkyLogProperties logProperties;
+
+	@SneakyThrows
+	@Async
+	@Order
+	@EventListener(SysLogEvent.class)
+	public void saveSysLog(SysLogEvent event) {
+		SysLogEventSource source = (SysLogEventSource) event.getSource();
+		SysLog sysLog = new SysLog();
+		BeanUtils.copyProperties(source, sysLog);
+
+		// json 格式刷参数放在异步中处理,提升性能
+		if (Objects.nonNull(source.getBody())) {
+			String params = OBJECT_MAPPER.writeValueAsString(source.getBody());
+			sysLog.setParams(StrUtil.subPre(params, logProperties.getMaxLength()));
+		}
+		log.info("保存日志:{}", sysLog);
+        remoteLogService.saveLog(sysLog, SecurityConstants.FROM_IN);
+	}
+
+	@Override
+	public void afterPropertiesSet() {
+		OBJECT_MAPPER.addMixIn(Object.class, PropertyFilterMixIn.class);
+		String[] ignorableFieldNames = logProperties.getExcludeFields().toArray(new String[0]);
+
+		FilterProvider filters = new SimpleFilterProvider().addFilter("filter properties by name",
+				SimpleBeanPropertyFilter.serializeAllExcept(ignorableFieldNames));
+		OBJECT_MAPPER.setFilterProvider(filters);
+		OBJECT_MAPPER.registerModule(new SkyJavaTimeModule());
+	}
+
+	@JsonFilter("filter properties by name")
+	static
+	class PropertyFilterMixIn {
+
+	}
+
+}

+ 1 - 0
kxs-common/kxs-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1,2 @@
 com.kxs.common.log.LogAutoConfiguration
+com.kxs.system.api.feign.config.AdminFeignClientConfiguration

+ 2 - 1
kxs-common/kxs-common-security/src/main/java/com/kxs/common/security/component/SkySecurityInnerAspect.java

@@ -2,6 +2,7 @@ package com.kxs.common.security.component;
 
 import cn.hutool.core.util.StrUtil;
 import com.kxs.common.core.constant.SecurityConstants;
+import com.kxs.common.core.exception.AccessDeniedBizException;
 import com.kxs.common.security.annotation.Inner;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
@@ -38,7 +39,7 @@ public class SkySecurityInnerAspect implements Ordered {
 		String header = request.getHeader(SecurityConstants.FROM);
 		if (inner.value() && !StrUtil.equals(SecurityConstants.FROM_IN, header)) {
 			log.warn("访问接口 {} 没有权限", point.getSignature().getName());
-			throw new AccessDeniedException("Access is denied");
+			throw new AccessDeniedBizException("Access is denied");
 		}
 	}
 

Some files were not shown because too many files changed in this diff