Commit 49a386d7be172af79432694ab7795f1c3ff7d102
1 parent
fbf45cd6
错误码模块完成
Showing
6 changed files
with
261 additions
and
25 deletions
README.md
| ... | ... | @@ -37,7 +37,8 @@ |
| 37 | 37 | | | 字典管理 | 对系统中经常使用的一些较为固定的数据进行维护 | |
| 38 | 38 | | 🚀 | 短信管理 | 短信渠道、短息模板、短信日志,对接阿里云、云片等主流短信平台 | |
| 39 | 39 | | 🚀 | 操作日志 | 系统正常操作日志记录和查询,集成 Swagger 生成日志内容 | |
| 40 | -| | 登录日志 | 系统登录日志记录查询包含登录异常 | | |
| 40 | +| | 登录日志 | 系统登录日志记录查询,包含登录异常 | | |
| 41 | +| 🚀 | 错误码管理 | 系统所有错误码的管理,可在线修改错误提示,无需重启服务 | | |
| 41 | 42 | | | 通知公告 | 系统通知公告信息发布维护 | |
| 42 | 43 | |
| 43 | 44 | 计划新增功能: |
| ... | ... | @@ -53,7 +54,7 @@ |
| 53 | 54 | | 🚀 | 文件服务 | 支持本地文件存储,同时支持兼容 Amazon S3 协议的云服务、开源组件 | |
| 54 | 55 | | 🚀 | API 日志 | 包括 RESTful API 访问日志、异常日志两部分,方便排查 API 相关的问题 | |
| 55 | 56 | | | MySQL 监控 | 监视当前系统数据库连接池状态,可进行分析SQL找出系统性能瓶颈 | |
| 56 | -| | Redis 监控 |监控 Redis 数据库的使用情况,使用的 Redis Key 管理 | | |
| 57 | +| | Redis 监控 |监控 Redis 数据库的使用情况,使用的 Redis Key 管理 | | |
| 57 | 58 | | 🚀 |Java 监控 | 基于 Spring Boot Admin 实现 Java 应用的监控 | |
| 58 | 59 | | 🚀 | 链路追踪 | 基于 SkyWalking 实现性能监控,特别是链路的追踪 | |
| 59 | 60 | | 🚀 | 分布式锁 | 基于 Redis 实现分布式锁,满足并发场景 | |
| ... | ... | @@ -64,7 +65,6 @@ |
| 64 | 65 | |
| 65 | 66 | 计划新增: |
| 66 | 67 | * 工作流 |
| 67 | -* 错误码 | |
| 68 | 68 | |
| 69 | 69 | ### 研发工具 |
| 70 | 70 | ... | ... |
ruoyi-ui/src/views/system/errorCode/index.vue
| ... | ... | @@ -43,8 +43,8 @@ |
| 43 | 43 | |
| 44 | 44 | <!-- 列表 --> |
| 45 | 45 | <el-table v-loading="loading" :data="list"> |
| 46 | - <el-table-column label="错误码编号" align="center" prop="id" /> | |
| 47 | - <el-table-column label="错误码类型" align="center" prop="type" width="80"> | |
| 46 | + <el-table-column label="编号" align="center" prop="id" /> | |
| 47 | + <el-table-column label="类型" align="center" prop="type" width="80"> | |
| 48 | 48 | <template slot-scope="scope"> |
| 49 | 49 | <span>{{ getDictDataLabel(DICT_TYPE.SYS_ERROR_CODE_TYPE, scope.row.type) }}</span> |
| 50 | 50 | </template> | ... | ... |
sql/ruoyi-vue-pro.sql
| ... | ... | @@ -11,7 +11,7 @@ |
| 11 | 11 | Target Server Version : 50718 |
| 12 | 12 | File Encoding : 65001 |
| 13 | 13 | |
| 14 | - Date: 18/04/2021 00:36:06 | |
| 14 | + Date: 22/04/2021 00:48:26 | |
| 15 | 15 | */ |
| 16 | 16 | |
| 17 | 17 | SET NAMES utf8mb4; |
| ... | ... | @@ -43,7 +43,7 @@ CREATE TABLE `inf_api_access_log` ( |
| 43 | 43 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´', |
| 44 | 44 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是å¦åˆ 除', |
| 45 | 45 | PRIMARY KEY (`id`) USING BTREE |
| 46 | -) ENGINE=InnoDB AUTO_INCREMENT=3750 DEFAULT CHARSET=utf8mb4 COMMENT='API 访问日志表'; | |
| 46 | +) ENGINE=InnoDB AUTO_INCREMENT=4229 DEFAULT CHARSET=utf8mb4 COMMENT='API 访问日志表'; | |
| 47 | 47 | |
| 48 | 48 | -- ---------------------------- |
| 49 | 49 | -- Records of inf_api_access_log |
| ... | ... | @@ -84,7 +84,7 @@ CREATE TABLE `inf_api_error_log` ( |
| 84 | 84 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´', |
| 85 | 85 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是å¦åˆ 除', |
| 86 | 86 | PRIMARY KEY (`id`) USING BTREE |
| 87 | -) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COMMENT='系统异常日志'; | |
| 87 | +) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COMMENT='系统异常日志'; | |
| 88 | 88 | |
| 89 | 89 | -- ---------------------------- |
| 90 | 90 | -- Records of inf_api_error_log |
| ... | ... | @@ -118,7 +118,7 @@ CREATE TABLE `inf_config` ( |
| 118 | 118 | -- ---------------------------- |
| 119 | 119 | BEGIN; |
| 120 | 120 | INSERT INTO `inf_config` VALUES (1, 'ui', 1, '主框架页-é»˜è®¤çš®è‚¤æ ·å¼åç§°', 'sys.index.skinName', 'skin-blue', b'0', 'è“色 skin-blueã€ç»¿è‰² skin-greenã€ç´«è‰² skin-purpleã€çº¢è‰² skin-redã€é»„色 skin-yellow', 'admin', '2021-01-05 17:03:48', '', '2021-01-05 17:03:48', b'0'); |
| 121 | -INSERT INTO `inf_config` VALUES (2, 'biz', 1, '用户管ç†-è´¦å·åˆå§‹å¯†ç ', 'sys.user.initPassword', '123456', b'0', 'åˆå§‹åŒ–密ç 123456', 'admin', '2021-01-05 17:03:48', '', '2021-01-21 02:13:02', b'0'); | |
| 121 | +INSERT INTO `inf_config` VALUES (2, 'biz', 1, '用户管ç†-è´¦å·åˆå§‹å¯†ç ', 'sys.user.init-password', '123456', b'0', 'åˆå§‹åŒ–密ç 123456', 'admin', '2021-01-05 17:03:48', '', '2021-04-13 03:48:02', b'0'); | |
| 122 | 122 | INSERT INTO `inf_config` VALUES (3, 'ui', 1, '主框架页-ä¾§è¾¹æ 主题', 'sys.index.sideTheme', 'theme-dark', b'0', '深色主题theme-dark,浅色主题theme-light', 'admin', '2021-01-05 17:03:48', '', '2021-01-19 03:05:21', b'0'); |
| 123 | 123 | INSERT INTO `inf_config` VALUES (4, '1', 2, 'xxx', 'demo.test', '10', b'0', '5', '', '2021-01-19 03:10:26', '', '2021-01-20 09:25:55', b'0'); |
| 124 | 124 | INSERT INTO `inf_config` VALUES (5, 'xxx', 2, 'xxx', 'xxx', 'xxx', b'1', 'xxx', '', '2021-02-09 20:06:47', '', '2021-02-09 20:06:47', b'0'); |
| ... | ... | @@ -201,7 +201,7 @@ CREATE TABLE `inf_job_log` ( |
| 201 | 201 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´', |
| 202 | 202 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是å¦åˆ 除', |
| 203 | 203 | PRIMARY KEY (`id`) USING BTREE |
| 204 | -) ENGINE=InnoDB AUTO_INCREMENT=2322 DEFAULT CHARSET=utf8mb4 COMMENT='定时任务日志表'; | |
| 204 | +) ENGINE=InnoDB AUTO_INCREMENT=2527 DEFAULT CHARSET=utf8mb4 COMMENT='定时任务日志表'; | |
| 205 | 205 | |
| 206 | 206 | -- ---------------------------- |
| 207 | 207 | -- Records of inf_job_log |
| ... | ... | @@ -264,7 +264,7 @@ CREATE TABLE `sys_dict_data` ( |
| 264 | 264 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´', |
| 265 | 265 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是å¦åˆ 除', |
| 266 | 266 | PRIMARY KEY (`id`) USING BTREE |
| 267 | -) ENGINE=InnoDB AUTO_INCREMENT=78 DEFAULT CHARSET=utf8mb4 COMMENT='å—典数æ®è¡¨'; | |
| 267 | +) ENGINE=InnoDB AUTO_INCREMENT=80 DEFAULT CHARSET=utf8mb4 COMMENT='å—典数æ®è¡¨'; | |
| 268 | 268 | |
| 269 | 269 | -- ---------------------------- |
| 270 | 270 | -- Records of sys_dict_data |
| ... | ... | @@ -337,6 +337,8 @@ INSERT INTO `sys_dict_data` VALUES (74, 0, 'ç‰å¾…结果', '0', 'sys_sms_receive |
| 337 | 337 | INSERT INTO `sys_dict_data` VALUES (75, 1, '接收æˆåŠŸ', '10', 'sys_sms_receive_status', 0, NULL, '1', '2021-04-11 20:29:25', '1', '2021-04-11 20:29:35', b'0'); |
| 338 | 338 | INSERT INTO `sys_dict_data` VALUES (76, 2, '接收失败', '20', 'sys_sms_receive_status', 0, NULL, '1', '2021-04-11 20:29:31', '1', '2021-04-11 20:29:39', b'0'); |
| 339 | 339 | INSERT INTO `sys_dict_data` VALUES (77, 0, '调试(钉钉)', 'DEBUG_DING_TALK', 'sys_sms_channel_code', 0, NULL, '1', '2021-04-13 00:20:37', '1', '2021-04-13 00:20:37', b'0'); |
| 340 | +INSERT INTO `sys_dict_data` VALUES (78, 1, '自动生æˆ', '1', 'sys_error_code_type', 0, NULL, '1', '2021-04-21 00:06:48', '1', '2021-04-13 22:06:44', b'0'); | |
| 341 | +INSERT INTO `sys_dict_data` VALUES (79, 2, '手动编辑', '2', 'sys_error_code_type', 0, NULL, '1', '2021-04-21 00:07:14', '1', '2021-04-13 22:06:49', b'0'); | |
| 340 | 342 | COMMIT; |
| 341 | 343 | |
| 342 | 344 | -- ---------------------------- |
| ... | ... | @@ -356,7 +358,7 @@ CREATE TABLE `sys_dict_type` ( |
| 356 | 358 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是å¦åˆ 除', |
| 357 | 359 | PRIMARY KEY (`id`) USING BTREE, |
| 358 | 360 | UNIQUE KEY `dict_type` (`type`) |
| 359 | -) ENGINE=InnoDB AUTO_INCREMENT=115 DEFAULT CHARSET=utf8mb4 COMMENT='å—典类型表'; | |
| 361 | +) ENGINE=InnoDB AUTO_INCREMENT=116 DEFAULT CHARSET=utf8mb4 COMMENT='å—典类型表'; | |
| 360 | 362 | |
| 361 | 363 | -- ---------------------------- |
| 362 | 364 | -- Records of sys_dict_type |
| ... | ... | @@ -383,6 +385,109 @@ INSERT INTO `sys_dict_type` VALUES (111, 'çŸä¿¡æ¸ é“ç¼–ç ', 'sys_sms_channel_ |
| 383 | 385 | INSERT INTO `sys_dict_type` VALUES (112, 'çŸä¿¡æ¨¡æ¿çš„类型', 'sys_sms_template_type', 0, NULL, '1', '2021-04-05 21:50:43', '1', '2021-04-05 21:50:43', b'0'); |
| 384 | 386 | INSERT INTO `sys_dict_type` VALUES (113, 'çŸä¿¡å‘é€çжæ€', 'sys_sms_send_status', 0, NULL, '1', '2021-04-11 20:18:03', '1', '2021-04-11 09:30:02', b'0'); |
| 385 | 387 | INSERT INTO `sys_dict_type` VALUES (114, 'çŸä¿¡æŽ¥æ”¶çжæ€', 'sys_sms_receive_status', 0, NULL, '1', '2021-04-11 20:27:14', '1', '2021-04-11 20:27:14', b'0'); |
| 388 | +INSERT INTO `sys_dict_type` VALUES (115, '错误ç 的类型', 'sys_error_code_type', 0, NULL, '1', '2021-04-21 00:06:30', '1', '2021-04-13 22:07:12', b'0'); | |
| 389 | +COMMIT; | |
| 390 | + | |
| 391 | +-- ---------------------------- | |
| 392 | +-- Table structure for sys_error_code | |
| 393 | +-- ---------------------------- | |
| 394 | +DROP TABLE IF EXISTS `sys_error_code`; | |
| 395 | +CREATE TABLE `sys_error_code` ( | |
| 396 | + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '错误ç ç¼–å·', | |
| 397 | + `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '错误ç 类型', | |
| 398 | + `application_name` varchar(50) NOT NULL COMMENT '应用å', | |
| 399 | + `code` int(11) NOT NULL DEFAULT '0' COMMENT '错误ç ç¼–ç ', | |
| 400 | + `message` varchar(512) NOT NULL DEFAULT '' COMMENT '错误ç 错误æç¤º', | |
| 401 | + `memo` varchar(512) DEFAULT '' COMMENT '备注', | |
| 402 | + `creator` varchar(64) DEFAULT '' COMMENT '创建者', | |
| 403 | + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', | |
| 404 | + `updater` varchar(64) DEFAULT '' COMMENT '更新者', | |
| 405 | + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´', | |
| 406 | + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是å¦åˆ 除', | |
| 407 | + PRIMARY KEY (`id`) USING BTREE | |
| 408 | +) ENGINE=InnoDB AUTO_INCREMENT=4016 DEFAULT CHARSET=utf8mb4 COMMENT='错误ç 表'; | |
| 409 | + | |
| 410 | +-- ---------------------------- | |
| 411 | +-- Records of sys_error_code | |
| 412 | +-- ---------------------------- | |
| 413 | +BEGIN; | |
| 414 | +INSERT INTO `sys_error_code` VALUES (3939, 2, 'dashboard', 1001000001, '傿•°é…ç½®ä¸å˜åœ¨', 'ceshi', NULL, '2021-04-20 23:52:56', '1', '2021-04-21 23:44:15', b'0'); | |
| 415 | +INSERT INTO `sys_error_code` VALUES (3940, 1, 'dashboard', 1001000002, '傿•°é…ç½® key é‡å¤', '', NULL, '2021-04-20 23:52:56', NULL, '2021-04-20 23:52:56', b'0'); | |
| 416 | +INSERT INTO `sys_error_code` VALUES (3941, 1, 'dashboard', 1001000003, 'ä¸èƒ½åˆ é™¤ç±»åž‹ä¸ºç³»ç»Ÿå†…ç½®çš„å‚æ•°é…ç½®', '', NULL, '2021-04-20 23:52:56', NULL, '2021-04-20 23:52:56', b'0'); | |
| 417 | +INSERT INTO `sys_error_code` VALUES (3942, 1, 'dashboard', 1001000004, 'ä¸å…è®¸èŽ·å–æ•感é…置到å‰ç«¯', '', NULL, '2021-04-20 23:52:56', NULL, '2021-04-20 23:52:56', b'0'); | |
| 418 | +INSERT INTO `sys_error_code` VALUES (3943, 1, 'dashboard', 1001001000, '定时任务ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:56', NULL, '2021-04-20 23:52:56', b'0'); | |
| 419 | +INSERT INTO `sys_error_code` VALUES (3944, 1, 'dashboard', 1001001001, '定时任务的处ç†å™¨å·²ç»å˜åœ¨', '', NULL, '2021-04-20 23:52:56', NULL, '2021-04-20 23:52:56', b'0'); | |
| 420 | +INSERT INTO `sys_error_code` VALUES (3945, 1, 'dashboard', 1001001002, 'åªå…è®¸ä¿®æ”¹ä¸ºå¼€å¯æˆ–者关é—状æ€', '', NULL, '2021-04-20 23:52:56', NULL, '2021-04-20 23:52:56', b'0'); | |
| 421 | +INSERT INTO `sys_error_code` VALUES (3946, 1, 'dashboard', 1001001003, '定时任务已ç»å¤„于该状æ€ï¼Œæ— 需修改', '', NULL, '2021-04-20 23:52:56', NULL, '2021-04-20 23:52:56', b'0'); | |
| 422 | +INSERT INTO `sys_error_code` VALUES (3947, 1, 'dashboard', 1001001004, 'åªæœ‰å¼€å¯çжæ€çš„任务,æ‰å¯ä»¥ä¿®æ”¹', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 423 | +INSERT INTO `sys_error_code` VALUES (3948, 1, 'dashboard', 1001001005, 'CRON 表达å¼ä¸æ£ç¡®', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 424 | +INSERT INTO `sys_error_code` VALUES (3949, 2, 'dashboard', 1001002000, 'API 错误日志ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', '1', '2021-04-13 21:55:55', b'1'); | |
| 425 | +INSERT INTO `sys_error_code` VALUES (3950, 1, 'dashboard', 1001002001, 'API 错误日志已处ç†', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 426 | +INSERT INTO `sys_error_code` VALUES (3951, 1, 'dashboard', 1001003000, '文件ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 427 | +INSERT INTO `sys_error_code` VALUES (3952, 1, 'dashboard', 1002000000, '登录失败,账å·å¯†ç 䏿£ç¡®', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 428 | +INSERT INTO `sys_error_code` VALUES (3953, 1, 'dashboard', 1002000001, '登录失败,账å·è¢«ç¦ç”¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 429 | +INSERT INTO `sys_error_code` VALUES (3954, 1, 'dashboard', 1002000002, '登录失败', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 430 | +INSERT INTO `sys_error_code` VALUES (3955, 1, 'dashboard', 1002000003, '验è¯ç ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 431 | +INSERT INTO `sys_error_code` VALUES (3956, 1, 'dashboard', 1002000004, '验è¯ç 䏿£ç¡®', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 432 | +INSERT INTO `sys_error_code` VALUES (3957, 1, 'dashboard', 1002001000, 'Token å·²ç»è¿‡æœŸ', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 433 | +INSERT INTO `sys_error_code` VALUES (3958, 1, 'dashboard', 1002001001, 'Token è§£æžå¤±è´¥', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 434 | +INSERT INTO `sys_error_code` VALUES (3959, 1, 'dashboard', 1002002000, 'å·²ç»å˜åœ¨è¯¥åå—çš„èœå•', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 435 | +INSERT INTO `sys_error_code` VALUES (3960, 1, 'dashboard', 1002002001, '父èœå•ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 436 | +INSERT INTO `sys_error_code` VALUES (3961, 1, 'dashboard', 1002002002, 'ä¸èƒ½è®¾ç½®è‡ªå·±ä¸ºçˆ¶èœå•', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 437 | +INSERT INTO `sys_error_code` VALUES (3962, 1, 'dashboard', 1002002003, 'èœå•ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 438 | +INSERT INTO `sys_error_code` VALUES (3963, 1, 'dashboard', 1002002004, 'å˜åœ¨åèœå•ï¼Œæ— æ³•åˆ é™¤', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 439 | +INSERT INTO `sys_error_code` VALUES (3964, 1, 'dashboard', 1002002005, '父èœå•的类型必须是目录或者èœå•', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 440 | +INSERT INTO `sys_error_code` VALUES (3965, 1, 'dashboard', 1002003000, '角色ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 441 | +INSERT INTO `sys_error_code` VALUES (3966, 1, 'dashboard', 1002003001, 'å·²ç»å˜åœ¨å为ã€{}】的角色', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 442 | +INSERT INTO `sys_error_code` VALUES (3967, 1, 'dashboard', 1002003002, 'å·²ç»å˜åœ¨ç¼–ç 为ã€{}】的角色', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 443 | +INSERT INTO `sys_error_code` VALUES (3968, 1, 'dashboard', 1002003004, 'ä¸èƒ½æ“作类型为系统内置的角色', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 444 | +INSERT INTO `sys_error_code` VALUES (3969, 1, 'dashboard', 1002004000, '用户账å·å·²ç»å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 445 | +INSERT INTO `sys_error_code` VALUES (3970, 1, 'dashboard', 1002004001, 'å·²ç»å˜åœ¨è¯¥åå—的部门', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-22 00:04:06', b'0'); | |
| 446 | +INSERT INTO `sys_error_code` VALUES (3971, 1, 'dashboard', 1002004002, '父级部门ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-22 00:04:06', b'0'); | |
| 447 | +INSERT INTO `sys_error_code` VALUES (3972, 1, 'dashboard', 1002004003, '用户ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-22 00:04:06', b'0'); | |
| 448 | +INSERT INTO `sys_error_code` VALUES (3973, 1, 'dashboard', 1002004004, 'å˜åœ¨åéƒ¨é—¨ï¼Œæ— æ³•åˆ é™¤', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-22 00:04:06', b'0'); | |
| 449 | +INSERT INTO `sys_error_code` VALUES (3974, 1, 'dashboard', 1002004005, 'ä¸èƒ½è®¾ç½®è‡ªå·±ä¸ºçˆ¶éƒ¨é—¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-22 00:04:06', b'0'); | |
| 450 | +INSERT INTO `sys_error_code` VALUES (3975, 1, 'dashboard', 1002004001, 'å·²ç»å˜åœ¨è¯¥åå—的部门', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 451 | +INSERT INTO `sys_error_code` VALUES (3976, 1, 'dashboard', 1002004002, '父级部门ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 452 | +INSERT INTO `sys_error_code` VALUES (3977, 1, 'dashboard', 1002004003, '当å‰éƒ¨é—¨ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 453 | +INSERT INTO `sys_error_code` VALUES (3978, 1, 'dashboard', 1002004004, 'å˜åœ¨åéƒ¨é—¨ï¼Œæ— æ³•åˆ é™¤', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 454 | +INSERT INTO `sys_error_code` VALUES (3979, 1, 'dashboard', 1002004005, 'ä¸èƒ½è®¾ç½®è‡ªå·±ä¸ºçˆ¶éƒ¨é—¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 455 | +INSERT INTO `sys_error_code` VALUES (3980, 1, 'dashboard', 1002004006, '部门ä¸å˜åœ¨å‘˜å·¥ï¼Œæ— æ³•åˆ é™¤', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 456 | +INSERT INTO `sys_error_code` VALUES (3981, 1, 'dashboard', 1002004007, '部门ä¸å¤„于开å¯çжæ€ï¼Œä¸å…许选择', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 457 | +INSERT INTO `sys_error_code` VALUES (3982, 1, 'dashboard', 1002004008, 'ä¸èƒ½è®¾ç½®è‡ªå·±çš„å部门为父部门', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 458 | +INSERT INTO `sys_error_code` VALUES (3983, 1, 'dashboard', 1002005001, 'å·²ç»å˜åœ¨è¯¥æ ‡è¯†çš„å²—ä½', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-22 00:04:06', b'0'); | |
| 459 | +INSERT INTO `sys_error_code` VALUES (3984, 1, 'dashboard', 1002005002, 'å²—ä½({}) ä¸å¤„于开å¯çжæ€ï¼Œä¸å…许选择', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 460 | +INSERT INTO `sys_error_code` VALUES (3985, 1, 'dashboard', 1002005001, 'å·²ç»å˜åœ¨è¯¥åå—的岗ä½', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 461 | +INSERT INTO `sys_error_code` VALUES (3986, 1, 'dashboard', 1002005001, 'å·²ç»å˜åœ¨è¯¥æ ‡è¯†çš„å²—ä½', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 462 | +INSERT INTO `sys_error_code` VALUES (3987, 1, 'dashboard', 1002006001, '当å‰å—典类型ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 463 | +INSERT INTO `sys_error_code` VALUES (3988, 1, 'dashboard', 1002006002, 'å—典类型ä¸å¤„于开å¯çжæ€ï¼Œä¸å…许选择', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 464 | +INSERT INTO `sys_error_code` VALUES (3989, 1, 'dashboard', 1002006003, 'å·²ç»å˜åœ¨è¯¥åå—çš„å—典类型', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 465 | +INSERT INTO `sys_error_code` VALUES (3990, 1, 'dashboard', 1002006004, 'æ— æ³•åˆ é™¤ï¼Œè¯¥å—典类型还有å—典数æ®', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-22 00:04:06', b'0'); | |
| 466 | +INSERT INTO `sys_error_code` VALUES (3991, 1, 'dashboard', 1002006004, 'æ— æ³•åˆ é™¤ï¼Œè¯¥å—典类型还有å—典数æ®', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 467 | +INSERT INTO `sys_error_code` VALUES (3992, 1, 'dashboard', 1002007001, '当å‰å—典数æ®ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 468 | +INSERT INTO `sys_error_code` VALUES (3993, 1, 'dashboard', 1002007002, 'å—典数æ®ä¸å¤„于开å¯çжæ€ï¼Œä¸å…许选择', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 469 | +INSERT INTO `sys_error_code` VALUES (3994, 1, 'dashboard', 1002007003, 'å·²ç»å˜åœ¨è¯¥å€¼çš„å—典数æ®', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 470 | +INSERT INTO `sys_error_code` VALUES (3995, 1, 'dashboard', 1002008001, '当å‰é€šçŸ¥å…¬å‘Šä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 471 | +INSERT INTO `sys_error_code` VALUES (3996, 1, 'dashboard', 1002009001, '文件路径已ç»å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-21 00:03:20', b'0'); | |
| 472 | +INSERT INTO `sys_error_code` VALUES (3997, 1, 'dashboard', 1002009002, 'æ–‡ä»¶ä¸Šä¼ å¤±è´¥', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 473 | +INSERT INTO `sys_error_code` VALUES (3998, 1, 'dashboard', 1002009003, '文件为空', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 474 | +INSERT INTO `sys_error_code` VALUES (3999, 1, 'dashboard', 1002011000, 'çŸä¿¡æ¨¡æ¿ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-22 00:04:06', b'0'); | |
| 475 | +INSERT INTO `sys_error_code` VALUES (4000, 1, 'dashboard', 1002011001, 'å·²ç»å˜åœ¨ç¼–ç 为ã€{}】的çŸä¿¡æ¨¡æ¿', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-22 00:04:06', b'0'); | |
| 476 | +INSERT INTO `sys_error_code` VALUES (4001, 2, 'dashboard', 1002011002, 'æ— æ³•åˆ é™¤ï¼Œè¯¥çŸä¿¡æ¸ é“还有çŸä¿¡æ¨¡æ¿', '', NULL, '2021-04-20 23:52:57', '1', '2021-04-22 00:06:52', b'0'); | |
| 477 | +INSERT INTO `sys_error_code` VALUES (4002, 1, 'dashboard', 1002011000, 'çŸä¿¡æ¨¡æ¿ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 478 | +INSERT INTO `sys_error_code` VALUES (4003, 1, 'dashboard', 1002011001, 'å·²ç»å˜åœ¨ç¼–ç 为ã€{}】的çŸä¿¡æ¨¡æ¿', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 479 | +INSERT INTO `sys_error_code` VALUES (4004, 1, 'dashboard', 1002012000, '手机å·ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 480 | +INSERT INTO `sys_error_code` VALUES (4005, 1, 'dashboard', 1002012001, '模æ¿å‚æ•°({})缺失', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 481 | +INSERT INTO `sys_error_code` VALUES (4006, 1, 'dashboard', 1002009000, '错误ç ä¸å˜åœ¨', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 482 | +INSERT INTO `sys_error_code` VALUES (4007, 1, 'dashboard', 1002009001, 'å·²ç»å˜åœ¨ç¼–ç 为ã€{}}】的错误ç ', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 483 | +INSERT INTO `sys_error_code` VALUES (4008, 1, 'dashboard', 1002004003, 'ä¸èƒ½ä¿®æ”¹ç±»åž‹ä¸ºç³»ç»Ÿå†…置的错误ç ', '', NULL, '2021-04-20 23:52:57', NULL, '2021-04-20 23:52:57', b'0'); | |
| 484 | +INSERT INTO `sys_error_code` VALUES (4009, 1, 'dashboard', 1001004000, '错误ç ä¸å˜åœ¨', '', NULL, '2021-04-21 00:38:01', NULL, '2021-04-21 00:38:01', b'0'); | |
| 485 | +INSERT INTO `sys_error_code` VALUES (4010, 1, 'dashboard', 1001004001, 'å·²ç»å˜åœ¨ç¼–ç 为ã€{}】的错误ç ', '', NULL, '2021-04-21 00:38:01', NULL, '2021-04-21 23:48:44', b'0'); | |
| 486 | +INSERT INTO `sys_error_code` VALUES (4011, 1, 'dashboard', 1001004002, 'ä¸èƒ½ä¿®æ”¹ç±»åž‹ä¸ºç³»ç»Ÿå†…置的错误ç ', '', NULL, '2021-04-21 00:38:01', NULL, '2021-04-21 00:38:01', b'0'); | |
| 487 | +INSERT INTO `sys_error_code` VALUES (4012, 2, 'dashboard', 1201002000, '啦啦啦啦', 'biubiub', '1', '2021-04-21 23:46:02', '1', '2021-04-21 23:46:02', b'0'); | |
| 488 | +INSERT INTO `sys_error_code` VALUES (4013, 1, 'dashboard', 1001002000, 'API 错误日志ä¸å˜åœ¨', '', NULL, '2021-04-21 23:48:44', NULL, '2021-04-21 23:48:44', b'0'); | |
| 489 | +INSERT INTO `sys_error_code` VALUES (4014, 1, 'dashboard', 1002013000, '错误ç ä¸å˜åœ¨', '', NULL, '2021-04-22 00:04:06', NULL, '2021-04-22 00:04:06', b'0'); | |
| 490 | +INSERT INTO `sys_error_code` VALUES (4015, 1, 'dashboard', 1002013001, 'å·²ç»å˜åœ¨ç¼–ç 为ã€{}】的错误ç ', '', NULL, '2021-04-22 00:04:06', NULL, '2021-04-22 00:04:06', b'0'); | |
| 386 | 491 | COMMIT; |
| 387 | 492 | |
| 388 | 493 | -- ---------------------------- |
| ... | ... | @@ -403,7 +508,7 @@ CREATE TABLE `sys_login_log` ( |
| 403 | 508 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´', |
| 404 | 509 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是å¦åˆ 除', |
| 405 | 510 | PRIMARY KEY (`id`) USING BTREE |
| 406 | -) ENGINE=InnoDB AUTO_INCREMENT=84 DEFAULT CHARSET=utf8mb4 COMMENT='系统访问记录'; | |
| 511 | +) ENGINE=InnoDB AUTO_INCREMENT=98 DEFAULT CHARSET=utf8mb4 COMMENT='系统访问记录'; | |
| 407 | 512 | |
| 408 | 513 | -- ---------------------------- |
| 409 | 514 | -- Records of sys_login_log |
| ... | ... | @@ -432,7 +537,7 @@ CREATE TABLE `sys_menu` ( |
| 432 | 537 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´', |
| 433 | 538 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是å¦åˆ 除', |
| 434 | 539 | PRIMARY KEY (`id`) USING BTREE |
| 435 | -) ENGINE=InnoDB AUTO_INCREMENT=1110 DEFAULT CHARSET=utf8mb4 COMMENT='èœå•æƒé™è¡¨'; | |
| 540 | +) ENGINE=InnoDB AUTO_INCREMENT=1116 DEFAULT CHARSET=utf8mb4 COMMENT='èœå•æƒé™è¡¨'; | |
| 436 | 541 | |
| 437 | 542 | -- ---------------------------- |
| 438 | 543 | -- Records of sys_menu |
| ... | ... | @@ -563,6 +668,12 @@ INSERT INTO `sys_menu` VALUES (1106, 'å‘逿µ‹è¯•çŸä¿¡', 'system:sms-template: |
| 563 | 668 | INSERT INTO `sys_menu` VALUES (1107, 'çŸä¿¡æ—¥å¿—', '', 2, 2, 1093, 'sms-log', 'phone', 'system/sms/smsLog', 0, '', '2021-04-11 08:37:05', '1', '2021-04-11 19:34:25', b'0'); |
| 564 | 669 | INSERT INTO `sys_menu` VALUES (1108, 'çŸä¿¡æ—¥å¿—查询', 'system:sms-log:query', 3, 1, 1107, '', '', '', 0, '', '2021-04-11 08:37:05', '', '2021-04-11 08:37:05', b'0'); |
| 565 | 670 | INSERT INTO `sys_menu` VALUES (1109, 'çŸä¿¡æ—¥å¿—导出', 'system:sms-log:export', 3, 5, 1107, '', '', '', 0, '', '2021-04-11 08:37:05', '', '2021-04-11 08:37:05', b'0'); |
| 671 | +INSERT INTO `sys_menu` VALUES (1110, '错误ç 管ç†', '', 2, 12, 1, 'error-code', 'code', 'system/errorCode/index', 0, '', '2021-04-13 21:46:42', '1', '2021-04-22 00:04:35', b'0'); | |
| 672 | +INSERT INTO `sys_menu` VALUES (1111, 'é”™è¯¯ç æŸ¥è¯¢', 'system:error-code:query', 3, 1, 1110, '', '', '', 0, '', '2021-04-13 21:46:42', '', '2021-04-13 22:09:37', b'0'); | |
| 673 | +INSERT INTO `sys_menu` VALUES (1112, '错误ç 创建', 'system:error-code:create', 3, 2, 1110, '', '', '', 0, '', '2021-04-13 21:46:42', '', '2021-04-13 22:09:43', b'0'); | |
| 674 | +INSERT INTO `sys_menu` VALUES (1113, 'é”™è¯¯ç æ›´æ–°', 'system:error-code:update', 3, 3, 1110, '', '', '', 0, '', '2021-04-13 21:46:42', '', '2021-04-13 22:09:47', b'0'); | |
| 675 | +INSERT INTO `sys_menu` VALUES (1114, '错误ç åˆ é™¤', 'system:error-code:delete', 3, 4, 1110, '', '', '', 0, '', '2021-04-13 21:46:42', '', '2021-04-13 22:09:51', b'0'); | |
| 676 | +INSERT INTO `sys_menu` VALUES (1115, '错误ç 导出', 'system:error-code:export', 3, 5, 1110, '', '', '', 0, '', '2021-04-13 21:46:42', '', '2021-04-13 22:09:55', b'0'); | |
| 566 | 677 | COMMIT; |
| 567 | 678 | |
| 568 | 679 | -- ---------------------------- |
| ... | ... | @@ -622,7 +733,7 @@ CREATE TABLE `sys_operate_log` ( |
| 622 | 733 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´', |
| 623 | 734 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是å¦åˆ 除', |
| 624 | 735 | PRIMARY KEY (`id`) USING BTREE |
| 625 | -) ENGINE=InnoDB AUTO_INCREMENT=177 DEFAULT CHARSET=utf8mb4 COMMENT='æ“作日志记录'; | |
| 736 | +) ENGINE=InnoDB AUTO_INCREMENT=193 DEFAULT CHARSET=utf8mb4 COMMENT='æ“作日志记录'; | |
| 626 | 737 | |
| 627 | 738 | -- ---------------------------- |
| 628 | 739 | -- Records of sys_operate_log |
| ... | ... | @@ -933,7 +1044,7 @@ CREATE TABLE `sys_sms_log` ( |
| 933 | 1044 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´', |
| 934 | 1045 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是å¦åˆ 除', |
| 935 | 1046 | PRIMARY KEY (`id`) USING BTREE |
| 936 | -) ENGINE=InnoDB AUTO_INCREMENT=35 DEFAULT CHARSET=utf8mb4 COMMENT='çŸä¿¡æ—¥å¿—'; | |
| 1047 | +) ENGINE=InnoDB AUTO_INCREMENT=36 DEFAULT CHARSET=utf8mb4 COMMENT='çŸä¿¡æ—¥å¿—'; | |
| 937 | 1048 | |
| 938 | 1049 | -- ---------------------------- |
| 939 | 1050 | -- Records of sys_sms_log |
| ... | ... | @@ -1074,6 +1185,7 @@ INSERT INTO `sys_user_session` VALUES ('12166cd28b4f448ea468d13c471dfc6e', 1, '2 |
| 1074 | 1185 | INSERT INTO `sys_user_session` VALUES ('134d908ae33146bd9b5291471c04f604', 1, '2021-04-10 00:29:28', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-09 23:10:26', NULL, '2021-04-02 08:08:17', b'1'); |
| 1075 | 1186 | INSERT INTO `sys_user_session` VALUES ('1407ce21e47947b9b8d93bff1b55c7d6', 1, '2021-04-07 01:09:11', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-07 00:07:43', NULL, '2021-04-01 18:10:44', b'1'); |
| 1076 | 1187 | INSERT INTO `sys_user_session` VALUES ('1477c38290ff4cee8887ebfe593faa02', 1, '2021-04-17 23:34:57', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-17 23:04:57', NULL, '2021-04-12 21:36:29', b'1'); |
| 1188 | +INSERT INTO `sys_user_session` VALUES ('347ec49c06d74d138a95266cbb5535a0', 1, '2021-04-21 00:45:41', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-21 00:03:50', NULL, '2021-04-13 18:38:39', b'1'); | |
| 1077 | 1189 | INSERT INTO `sys_user_session` VALUES ('3c75ea73e13b4857a18eb57ca2eea80f', 1, '2021-04-11 20:06:52', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-11 19:36:52', NULL, '2021-04-11 09:10:53', b'1'); |
| 1078 | 1190 | INSERT INTO `sys_user_session` VALUES ('40d532d8900c43b791266429a7911751', 1, '2021-04-05 22:11:34', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-05 21:41:34', NULL, '2021-04-01 12:28:20', b'1'); |
| 1079 | 1191 | INSERT INTO `sys_user_session` VALUES ('43676e85d0e04980b2a67181f8d9933b', 1, '2021-04-11 10:41:09', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-11 09:56:31', NULL, '2021-04-02 17:32:07', b'1'); |
| ... | ... | @@ -1084,16 +1196,22 @@ INSERT INTO `sys_user_session` VALUES ('5c30d80eb72048daa1a24d3d4f01317b', 1, '2 |
| 1084 | 1196 | INSERT INTO `sys_user_session` VALUES ('5dca80a5c61541479a4dbb6e004c2e28', 1, '2021-04-14 00:57:25', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-13 23:38:30', NULL, '2021-04-12 17:33:48', b'1'); |
| 1085 | 1197 | INSERT INTO `sys_user_session` VALUES ('7324a76b029a49ee95bf54ceb4164ba9', 1, '2021-04-13 01:29:14', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-13 00:18:40', NULL, '2021-04-11 23:15:00', b'1'); |
| 1086 | 1198 | INSERT INTO `sys_user_session` VALUES ('749619894bc441bb9773902515f81e6a', 1, '2021-04-11 00:39:51', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-11 00:09:51', NULL, '2021-04-02 16:50:56', b'1'); |
| 1199 | +INSERT INTO `sys_user_session` VALUES ('750dca41b315488b8c17e1c0f8b6a519', 1, '2021-04-21 01:24:28', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-21 00:54:28', NULL, '2021-04-13 21:42:10', b'1'); | |
| 1087 | 1200 | INSERT INTO `sys_user_session` VALUES ('7768ae62ad974fd989f5159649a4be82', 1, '2021-04-11 00:53:39', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-10 23:23:27', NULL, '2021-04-02 17:04:58', b'1'); |
| 1088 | 1201 | INSERT INTO `sys_user_session` VALUES ('79efcb8f64aa42af9f4b327fb383532f', 1, '2021-04-11 22:44:07', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-11 21:34:53', NULL, '2021-04-11 14:10:45', b'1'); |
| 1202 | +INSERT INTO `sys_user_session` VALUES ('83b227ad356f4343b01d321ad26807ce', 1, '2021-04-22 00:49:12', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-21 23:33:02', NULL, '2021-04-22 00:19:12', b'0'); | |
| 1089 | 1203 | INSERT INTO `sys_user_session` VALUES ('87d5b95fdad9447189a95abf8a5152df', 1, '2021-04-17 23:01:18', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-17 22:31:18', NULL, '2021-04-12 21:03:27', b'1'); |
| 1090 | 1204 | INSERT INTO `sys_user_session` VALUES ('8b3eac5e4a104a4191c8070e03d553ea', 1, '2021-04-05 02:45:12', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-05 02:15:12', NULL, '2021-04-01 11:05:25', b'1'); |
| 1091 | 1205 | INSERT INTO `sys_user_session` VALUES ('9ae27346d8b7491aad1385f51e8aa196', 1, '2021-03-13 14:02:12', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', NULL, '2021-03-13 10:43:06', NULL, '2021-03-13 06:40:35', b'1'); |
| 1092 | 1206 | INSERT INTO `sys_user_session` VALUES ('a2fb443b31c049008975ff8ee5499db1', 1, '2021-04-11 09:42:09', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-11 09:12:09', NULL, '2021-04-02 17:16:00', b'1'); |
| 1093 | 1207 | INSERT INTO `sys_user_session` VALUES ('a71a74adf9d141e2849d2a411d558205', 1, '2021-04-17 18:24:44', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-17 17:54:44', NULL, '2021-04-12 17:54:50', b'1'); |
| 1208 | +INSERT INTO `sys_user_session` VALUES ('ab2099c12f5c4b0288c60abe8cfff307', 1, '2021-04-18 01:41:46', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-18 01:01:35', NULL, '2021-04-13 05:14:54', b'1'); | |
| 1094 | 1209 | INSERT INTO `sys_user_session` VALUES ('ae9ee7452ee54e4b983d658188c15c4d', 1, '2021-03-14 21:32:57', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.96 Safari/537.36', NULL, '2021-03-14 20:25:00', NULL, '2021-03-13 15:19:10', b'1'); |
| 1095 | 1210 | INSERT INTO `sys_user_session` VALUES ('b727853eccea4c8589e006ffea985146', 1, '2021-04-12 01:36:00', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-12 01:06:00', NULL, '2021-04-11 19:40:07', b'1'); |
| 1211 | +INSERT INTO `sys_user_session` VALUES ('b9ee6fde7bf74ed49cad99abf86c94d6', 1, '2021-04-18 20:21:02', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-18 19:18:52', NULL, '2021-04-13 06:36:39', b'1'); | |
| 1212 | +INSERT INTO `sys_user_session` VALUES ('bb4ad4579bd1436c859b94228967582f', 1, '2021-04-18 20:52:38', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-18 20:22:38', NULL, '2021-04-13 07:14:58', b'1'); | |
| 1096 | 1213 | INSERT INTO `sys_user_session` VALUES ('c095616db95044c5bed66a3f84519b8b', 1, '2021-04-11 19:59:33', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-11 19:29:33', NULL, '2021-04-11 09:04:19', b'1'); |
| 1214 | +INSERT INTO `sys_user_session` VALUES ('c8805f37eb76432c89d6d54feb14756f', 1, '2021-04-18 21:54:56', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-18 21:00:38', NULL, '2021-04-13 17:45:30', b'1'); | |
| 1097 | 1215 | INSERT INTO `sys_user_session` VALUES ('d0adf48f82914212b947e5ab04d9fb65', 1, '2021-03-21 19:16:28', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-03-21 18:13:37', NULL, '2021-03-15 05:53:20', b'1'); |
| 1098 | 1216 | INSERT INTO `sys_user_session` VALUES ('dfbce0af867547f4bb01ac6f2e583337', 1, '2021-04-11 17:06:15', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-11 16:36:15', NULL, '2021-04-11 08:24:03', b'1'); |
| 1099 | 1217 | INSERT INTO `sys_user_session` VALUES ('e5ecf10e40a5463b8f9b5b453cb1649b', 1, '2021-04-11 17:06:22', 'admin', '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36', NULL, '2021-04-11 16:36:22', NULL, '2021-04-11 08:24:03', b'1'); |
| ... | ... | @@ -1134,7 +1252,7 @@ CREATE TABLE `tool_codegen_column` ( |
| 1134 | 1252 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´', |
| 1135 | 1253 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是å¦åˆ 除', |
| 1136 | 1254 | PRIMARY KEY (`id`) USING BTREE |
| 1137 | -) ENGINE=InnoDB AUTO_INCREMENT=447 DEFAULT CHARSET=utf8mb4 COMMENT='代ç 生æˆè¡¨å—段定义'; | |
| 1255 | +) ENGINE=InnoDB AUTO_INCREMENT=458 DEFAULT CHARSET=utf8mb4 COMMENT='代ç 生æˆè¡¨å—段定义'; | |
| 1138 | 1256 | |
| 1139 | 1257 | -- ---------------------------- |
| 1140 | 1258 | -- Records of tool_codegen_column |
| ... | ... | @@ -1354,6 +1472,17 @@ INSERT INTO `tool_codegen_column` VALUES (443, 36, 'create_time', 'datetime', 'å |
| 1354 | 1472 | INSERT INTO `tool_codegen_column` VALUES (444, 36, 'updater', 'varchar(64)', '更新者', b'1', b'0', '0', 27, 'String', 'updater', '', NULL, b'0', b'0', b'0', '=', b'0', 'input', '1', '2021-04-11 09:13:48', '1', '2021-04-11 20:33:54', b'0'); |
| 1355 | 1473 | INSERT INTO `tool_codegen_column` VALUES (445, 36, 'update_time', 'datetime', 'æ›´æ–°æ—¶é—´', b'0', b'0', '0', 28, 'Date', 'updateTime', '', NULL, b'0', b'0', b'0', 'BETWEEN', b'0', 'datetime', '1', '2021-04-11 09:13:48', '1', '2021-04-11 20:33:54', b'0'); |
| 1356 | 1474 | INSERT INTO `tool_codegen_column` VALUES (446, 36, 'deleted', 'bit(1)', '是å¦åˆ 除', b'0', b'0', '0', 29, 'Boolean', 'deleted', '', NULL, b'0', b'0', b'0', '=', b'0', 'radio', '1', '2021-04-11 09:13:48', '1', '2021-04-11 20:33:54', b'0'); |
| 1475 | +INSERT INTO `tool_codegen_column` VALUES (447, 37, 'id', 'bigint(20)', '错误ç ç¼–å·', b'0', b'1', '1', 1, 'Long', 'id', '', '1024', b'0', b'1', b'0', '=', b'1', 'input', '1', '2021-04-21 00:04:13', '1', '2021-04-21 00:55:37', b'0'); | |
| 1476 | +INSERT INTO `tool_codegen_column` VALUES (448, 37, 'type', 'tinyint(4)', '错误ç 类型', b'0', b'0', '0', 2, 'Integer', 'type', 'inf_error_code_type', '1', b'0', b'0', b'1', '=', b'1', 'select', '1', '2021-04-21 00:04:13', '1', '2021-04-21 00:55:37', b'0'); | |
| 1477 | +INSERT INTO `tool_codegen_column` VALUES (449, 37, 'application_name', 'varchar(50)', '应用å', b'0', b'0', '0', 3, 'String', 'applicationName', '', 'dashboard', b'1', b'1', b'1', 'LIKE', b'1', 'input', '1', '2021-04-21 00:04:13', '1', '2021-04-21 00:55:37', b'0'); | |
| 1478 | +INSERT INTO `tool_codegen_column` VALUES (450, 37, 'code', 'int(11)', '错误ç ç¼–ç ', b'0', b'0', '0', 4, 'Integer', 'code', '', '1234', b'1', b'1', b'1', '=', b'1', 'input', '1', '2021-04-21 00:04:13', '1', '2021-04-21 00:55:37', b'0'); | |
| 1479 | +INSERT INTO `tool_codegen_column` VALUES (451, 37, 'message', 'varchar(512)', '错误ç 错误æç¤º', b'0', b'0', '0', 5, 'String', 'message', '', '帅气', b'1', b'1', b'1', 'LIKE', b'1', 'input', '1', '2021-04-21 00:04:13', '1', '2021-04-21 00:55:37', b'0'); | |
| 1480 | +INSERT INTO `tool_codegen_column` VALUES (452, 37, 'memo', 'varchar(512)', '备注', b'1', b'0', '0', 6, 'String', 'memo', '', '哈哈哈', b'1', b'1', b'0', '=', b'1', 'input', '1', '2021-04-21 00:04:13', '1', '2021-04-21 00:55:37', b'0'); | |
| 1481 | +INSERT INTO `tool_codegen_column` VALUES (453, 37, 'creator', 'varchar(64)', '创建者', b'1', b'0', '0', 7, 'String', 'creator', '', NULL, b'0', b'0', b'0', '=', b'0', 'input', '1', '2021-04-21 00:04:13', '1', '2021-04-21 00:55:37', b'0'); | |
| 1482 | +INSERT INTO `tool_codegen_column` VALUES (454, 37, 'create_time', 'datetime', '创建时间', b'0', b'0', '0', 8, 'Date', 'createTime', '', NULL, b'0', b'0', b'1', 'BETWEEN', b'1', 'datetime', '1', '2021-04-21 00:04:13', '1', '2021-04-21 00:55:37', b'0'); | |
| 1483 | +INSERT INTO `tool_codegen_column` VALUES (455, 37, 'updater', 'varchar(64)', '更新者', b'1', b'0', '0', 9, 'String', 'updater', '', NULL, b'0', b'0', b'0', '=', b'0', 'input', '1', '2021-04-21 00:04:13', '1', '2021-04-21 00:55:37', b'0'); | |
| 1484 | +INSERT INTO `tool_codegen_column` VALUES (456, 37, 'update_time', 'datetime', 'æ›´æ–°æ—¶é—´', b'0', b'0', '0', 10, 'Date', 'updateTime', '', NULL, b'0', b'0', b'0', 'BETWEEN', b'0', 'datetime', '1', '2021-04-21 00:04:13', '1', '2021-04-21 00:55:37', b'0'); | |
| 1485 | +INSERT INTO `tool_codegen_column` VALUES (457, 37, 'deleted', 'bit(1)', '是å¦åˆ 除', b'0', b'0', '0', 11, 'Boolean', 'deleted', '', NULL, b'0', b'0', b'0', '=', b'0', 'radio', '1', '2021-04-21 00:04:13', '1', '2021-04-21 00:55:37', b'0'); | |
| 1357 | 1486 | COMMIT; |
| 1358 | 1487 | |
| 1359 | 1488 | -- ---------------------------- |
| ... | ... | @@ -1379,7 +1508,7 @@ CREATE TABLE `tool_codegen_table` ( |
| 1379 | 1508 | `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'æ›´æ–°æ—¶é—´', |
| 1380 | 1509 | `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是å¦åˆ 除', |
| 1381 | 1510 | PRIMARY KEY (`id`) USING BTREE |
| 1382 | -) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=utf8mb4 COMMENT='代ç 生æˆè¡¨å®šä¹‰'; | |
| 1511 | +) ENGINE=InnoDB AUTO_INCREMENT=38 DEFAULT CHARSET=utf8mb4 COMMENT='代ç 生æˆè¡¨å®šä¹‰'; | |
| 1383 | 1512 | |
| 1384 | 1513 | -- ---------------------------- |
| 1385 | 1514 | -- Records of tool_codegen_table |
| ... | ... | @@ -1400,6 +1529,7 @@ INSERT INTO `tool_codegen_table` VALUES (33, 1, 'inf_file', '文件表', NULL, ' |
| 1400 | 1529 | INSERT INTO `tool_codegen_table` VALUES (34, 1, 'sys_sms_channel', 'çŸä¿¡æ¸ é“', NULL, 'system', 'sms', 'SysSmsChannel', 'çŸä¿¡æ¸ é“', 'èŠ‹é“æºç ', 1, 1093, '1', '2021-04-03 13:39:06', '1', '2021-04-05 20:52:09', b'0'); |
| 1401 | 1530 | INSERT INTO `tool_codegen_table` VALUES (35, 1, 'sys_sms_template', 'çŸä¿¡æ¨¡æ¿', NULL, 'system', 'sms', 'SysSmsTemplate', 'çŸä¿¡æ¨¡æ¿', 'èŠ‹é“æºç ', 1, 1093, '1', '2021-04-03 13:58:55', '1', '2021-04-05 22:23:38', b'0'); |
| 1402 | 1531 | INSERT INTO `tool_codegen_table` VALUES (36, 1, 'sys_sms_log', 'çŸä¿¡æ—¥å¿—', NULL, 'system', 'sms', 'SysSmsLog', 'çŸä¿¡æ—¥å¿—', 'èŠ‹é“æºç ', 1, 1093, '1', '2021-04-11 01:12:57', '1', '2021-04-11 20:33:54', b'0'); |
| 1532 | +INSERT INTO `tool_codegen_table` VALUES (37, 1, 'inf_error_code', '错误ç 表', NULL, 'infra', 'errorcode', 'InfErrorCode', '错误ç ', 'èŠ‹é“æºç ', 1, 2, '1', '2021-04-20 15:27:45', '1', '2021-04-21 00:55:37', b'0'); | |
| 1403 | 1533 | COMMIT; |
| 1404 | 1534 | |
| 1405 | 1535 | -- ---------------------------- | ... | ... |
src/main/java/cn/iocoder/dashboard/framework/errorcode/core/generator/ErrorCodeAutoGeneratorImpl.java
| ... | ... | @@ -18,7 +18,7 @@ import java.util.List; |
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * ErrorCodeAutoGenerator 的实现类 |
| 21 | - * 目的是,扫描指定的 {@link #constantsClassList} 类,写入到 infra 服务中 | |
| 21 | + * 目的是,扫描指定的 {@link #constantsClassList} 类,写入到 system 服务中 | |
| 22 | 22 | * |
| 23 | 23 | * @author dylan |
| 24 | 24 | */ |
| ... | ... | @@ -47,9 +47,9 @@ public class ErrorCodeAutoGeneratorImpl implements ErrorCodeAutoGenerator { |
| 47 | 47 | List<ErrorCodeAutoGenerateReqDTO> autoGenerateDTOs = parseErrorCode(); |
| 48 | 48 | log.info("[execute][解析到错误码数量为 ({}) 个]", autoGenerateDTOs.size()); |
| 49 | 49 | |
| 50 | - // 第二步,写入到 infra 服务 | |
| 50 | + // 第二步,写入到 system 服务 | |
| 51 | 51 | errorCodeService.autoGenerateErrorCodes(autoGenerateDTOs); |
| 52 | - log.info("[execute][写入到 infra 组件完成]"); | |
| 52 | + log.info("[execute][写入到 system 组件完成]"); | |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | /** |
| ... | ... | @@ -60,7 +60,7 @@ public class ErrorCodeAutoGeneratorImpl implements ErrorCodeAutoGenerator { |
| 60 | 60 | private List<ErrorCodeAutoGenerateReqDTO> parseErrorCode() { |
| 61 | 61 | // 校验 errorCodeConstantsClass 参数 |
| 62 | 62 | if (CollUtil.isEmpty(constantsClassList)) { |
| 63 | - log.info("[execute][未配置 yudao.error-code.constants-class-list 配置项,不进行自动写入到 infra 服务中]"); | |
| 63 | + log.info("[execute][未配置 yudao.error-code.constants-class-list 配置项,不进行自动写入到 system 服务中]"); | |
| 64 | 64 | return new ArrayList<>(); |
| 65 | 65 | } |
| 66 | 66 | ... | ... |
src/main/java/cn/iocoder/dashboard/modules/system/service/errorcode/impl/SysErrorCodeServiceImpl.java
| ... | ... | @@ -147,7 +147,7 @@ public class SysErrorCodeServiceImpl implements SysErrorCodeService { |
| 147 | 147 | if (!SysErrorCodeTypeEnum.AUTO_GENERATION.getType().equals(errorCodeDO.getType())) { |
| 148 | 148 | return; |
| 149 | 149 | } |
| 150 | - // 条件 2. 分组 group 必须匹配,避免存在错误码冲突的情况 | |
| 150 | + // 条件 2. 分组 applicationName 必须匹配,避免存在错误码冲突的情况 | |
| 151 | 151 | if (!autoGenerateDTO.getApplicationName().equals(errorCodeDO.getApplicationName())) { |
| 152 | 152 | log.error("[autoGenerateErrorCodes][自动创建({}/{}) 错误码失败,数据库中已经存在({}/{})]", |
| 153 | 153 | autoGenerateDTO.getCode(), autoGenerateDTO.getApplicationName(), | ... | ... |
src/test/java/cn/iocoder/dashboard/modules/system/service/errorcode/SysErrorCodeServiceTest.java
| ... | ... | @@ -2,18 +2,22 @@ package cn.iocoder.dashboard.modules.system.service.errorcode; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.dashboard.BaseDbUnitTest; |
| 4 | 4 | import cn.iocoder.dashboard.common.pojo.PageResult; |
| 5 | +import cn.iocoder.dashboard.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO; | |
| 6 | +import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum; | |
| 5 | 7 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO; |
| 6 | 8 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeExportReqVO; |
| 7 | 9 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodePageReqVO; |
| 8 | 10 | import cn.iocoder.dashboard.modules.system.controller.errorcode.vo.SysErrorCodeUpdateReqVO; |
| 9 | 11 | import cn.iocoder.dashboard.modules.system.dal.dataobject.errorcode.SysErrorCodeDO; |
| 10 | 12 | import cn.iocoder.dashboard.modules.system.dal.mysql.errorcode.SysErrorCodeMapper; |
| 11 | -import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum; | |
| 12 | 13 | import cn.iocoder.dashboard.modules.system.enums.errorcode.SysErrorCodeTypeEnum; |
| 13 | 14 | import cn.iocoder.dashboard.modules.system.service.errorcode.impl.SysErrorCodeServiceImpl; |
| 14 | 15 | import cn.iocoder.dashboard.util.collection.ArrayUtils; |
| 15 | 16 | import cn.iocoder.dashboard.util.object.ObjectUtils; |
| 17 | +import org.assertj.core.util.Lists; | |
| 16 | 18 | import org.junit.jupiter.api.Test; |
| 19 | +import org.mockito.Mock; | |
| 20 | +import org.slf4j.Logger; | |
| 17 | 21 | import org.springframework.context.annotation.Import; |
| 18 | 22 | |
| 19 | 23 | import javax.annotation.Resource; |
| ... | ... | @@ -21,7 +25,8 @@ import java.util.List; |
| 21 | 25 | import java.util.function.Consumer; |
| 22 | 26 | |
| 23 | 27 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 24 | -import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.*; | |
| 28 | +import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_DUPLICATE; | |
| 29 | +import static cn.iocoder.dashboard.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_NOT_EXISTS; | |
| 25 | 30 | import static cn.iocoder.dashboard.util.AssertUtils.assertPojoEquals; |
| 26 | 31 | import static cn.iocoder.dashboard.util.AssertUtils.assertServiceException; |
| 27 | 32 | import static cn.iocoder.dashboard.util.RandomUtils.*; |
| ... | ... | @@ -42,6 +47,9 @@ public class SysErrorCodeServiceTest extends BaseDbUnitTest { |
| 42 | 47 | @Resource |
| 43 | 48 | private SysErrorCodeMapper errorCodeMapper; |
| 44 | 49 | |
| 50 | + @Mock | |
| 51 | + private Logger log; | |
| 52 | + | |
| 45 | 53 | @Test |
| 46 | 54 | public void testCreateErrorCode_success() { |
| 47 | 55 | // 准备参数 |
| ... | ... | @@ -186,6 +194,104 @@ public class SysErrorCodeServiceTest extends BaseDbUnitTest { |
| 186 | 194 | ERROR_CODE_NOT_EXISTS); |
| 187 | 195 | } |
| 188 | 196 | |
| 197 | + /** | |
| 198 | + * 情况 1,错误码不存在的情况 | |
| 199 | + */ | |
| 200 | + @Test | |
| 201 | + public void testAutoGenerateErrorCodes_01() { | |
| 202 | + // 准备参数 | |
| 203 | + ErrorCodeAutoGenerateReqDTO generateReqDTO = randomPojo(ErrorCodeAutoGenerateReqDTO.class); | |
| 204 | + // mock 方法 | |
| 205 | + | |
| 206 | + // 调用 | |
| 207 | + errorCodeService.autoGenerateErrorCodes(Lists.newArrayList(generateReqDTO)); | |
| 208 | + // 断言 | |
| 209 | + SysErrorCodeDO errorCode = errorCodeMapper.selectOne(null); | |
| 210 | + assertPojoEquals(generateReqDTO, errorCode); | |
| 211 | + assertEquals(SysErrorCodeTypeEnum.AUTO_GENERATION.getType(), errorCode.getType()); | |
| 212 | + } | |
| 213 | + | |
| 214 | + /** | |
| 215 | + * 情况 2.1,错误码存在,但是是 SysErrorCodeTypeEnum.MANUAL_OPERATION 类型 | |
| 216 | + */ | |
| 217 | + @Test | |
| 218 | + public void testAutoGenerateErrorCodes_021() { | |
| 219 | + // mock 数据 | |
| 220 | + SysErrorCodeDO dbErrorCode = randomInfErrorCodeDO(o -> o.setType(SysErrorCodeTypeEnum.MANUAL_OPERATION.getType())); | |
| 221 | + errorCodeMapper.insert(dbErrorCode); | |
| 222 | + // 准备参数 | |
| 223 | + ErrorCodeAutoGenerateReqDTO generateReqDTO = randomPojo(ErrorCodeAutoGenerateReqDTO.class, | |
| 224 | + o -> o.setCode(dbErrorCode.getCode())); | |
| 225 | + // mock 方法 | |
| 226 | + | |
| 227 | + // 调用 | |
| 228 | + errorCodeService.autoGenerateErrorCodes(Lists.newArrayList(generateReqDTO)); | |
| 229 | + // 断言,相等,说明不会更新 | |
| 230 | + SysErrorCodeDO errorCode = errorCodeMapper.selectById(dbErrorCode.getId()); | |
| 231 | + assertPojoEquals(dbErrorCode, errorCode); | |
| 232 | + } | |
| 233 | + | |
| 234 | + /** | |
| 235 | + * 情况 2.2,错误码存在,但是是 applicationName 不匹配 | |
| 236 | + */ | |
| 237 | + @Test | |
| 238 | + public void testAutoGenerateErrorCodes_022() { | |
| 239 | + // mock 数据 | |
| 240 | + SysErrorCodeDO dbErrorCode = randomInfErrorCodeDO(o -> o.setType(SysErrorCodeTypeEnum.AUTO_GENERATION.getType())); | |
| 241 | + errorCodeMapper.insert(dbErrorCode); | |
| 242 | + // 准备参数 | |
| 243 | + ErrorCodeAutoGenerateReqDTO generateReqDTO = randomPojo(ErrorCodeAutoGenerateReqDTO.class, | |
| 244 | + o -> o.setCode(dbErrorCode.getCode()).setApplicationName(randomString())); | |
| 245 | + // mock 方法 | |
| 246 | + | |
| 247 | + // 调用 | |
| 248 | + errorCodeService.autoGenerateErrorCodes(Lists.newArrayList(generateReqDTO)); | |
| 249 | + // 断言,相等,说明不会更新 | |
| 250 | + SysErrorCodeDO errorCode = errorCodeMapper.selectById(dbErrorCode.getId()); | |
| 251 | + assertPojoEquals(dbErrorCode, errorCode); | |
| 252 | + } | |
| 253 | + | |
| 254 | + /** | |
| 255 | + * 情况 2.3,错误码存在,但是是 message 相同 | |
| 256 | + */ | |
| 257 | + @Test | |
| 258 | + public void testAutoGenerateErrorCodes_023() { | |
| 259 | + // mock 数据 | |
| 260 | + SysErrorCodeDO dbErrorCode = randomInfErrorCodeDO(o -> o.setType(SysErrorCodeTypeEnum.AUTO_GENERATION.getType())); | |
| 261 | + errorCodeMapper.insert(dbErrorCode); | |
| 262 | + // 准备参数 | |
| 263 | + ErrorCodeAutoGenerateReqDTO generateReqDTO = randomPojo(ErrorCodeAutoGenerateReqDTO.class, | |
| 264 | + o -> o.setCode(dbErrorCode.getCode()).setApplicationName(dbErrorCode.getApplicationName()) | |
| 265 | + .setMessage(dbErrorCode.getMessage())); | |
| 266 | + // mock 方法 | |
| 267 | + | |
| 268 | + // 调用 | |
| 269 | + errorCodeService.autoGenerateErrorCodes(Lists.newArrayList(generateReqDTO)); | |
| 270 | + // 断言,相等,说明不会更新 | |
| 271 | + SysErrorCodeDO errorCode = errorCodeMapper.selectById(dbErrorCode.getId()); | |
| 272 | + assertPojoEquals(dbErrorCode, errorCode); | |
| 273 | + } | |
| 274 | + | |
| 275 | + /** | |
| 276 | + * 情况 2.3,错误码存在,但是是 message 不同,则进行更新 | |
| 277 | + */ | |
| 278 | + @Test | |
| 279 | + public void testAutoGenerateErrorCodes_024() { | |
| 280 | + // mock 数据 | |
| 281 | + SysErrorCodeDO dbErrorCode = randomInfErrorCodeDO(o -> o.setType(SysErrorCodeTypeEnum.AUTO_GENERATION.getType())); | |
| 282 | + errorCodeMapper.insert(dbErrorCode); | |
| 283 | + // 准备参数 | |
| 284 | + ErrorCodeAutoGenerateReqDTO generateReqDTO = randomPojo(ErrorCodeAutoGenerateReqDTO.class, | |
| 285 | + o -> o.setCode(dbErrorCode.getCode()).setApplicationName(dbErrorCode.getApplicationName())); | |
| 286 | + // mock 方法 | |
| 287 | + | |
| 288 | + // 调用 | |
| 289 | + errorCodeService.autoGenerateErrorCodes(Lists.newArrayList(generateReqDTO)); | |
| 290 | + // 断言,匹配 | |
| 291 | + SysErrorCodeDO errorCode = errorCodeMapper.selectById(dbErrorCode.getId()); | |
| 292 | + assertPojoEquals(generateReqDTO, errorCode); | |
| 293 | + } | |
| 294 | + | |
| 189 | 295 | // ========== 随机对象 ========== |
| 190 | 296 | |
| 191 | 297 | @SafeVarargs | ... | ... |