From 2f1728def8ed04e214060e51b2d0739c0feaf1c5 Mon Sep 17 00:00:00 2001 From: DongZeLiang <2746733890@qq.com> Date: Mon, 18 Mar 2024 11:59:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9E=84=E7=BB=86=E8=8A=82=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 20 +++------ ruoyi-application/pom.xml | 12 ++--- ruoyi-basic/pom.xml | 2 +- ruoyi-basic/ruoyi-common/pom.xml | 4 +- .../com/ruoyi/common/annotation/Excel.java | 39 +++++++++++++++- ruoyi-basic/ruoyi-framework/pom.xml | 6 +-- ruoyi-basic/ruoyi-plugin/pom.xml | 2 +- .../ruoyi-plugin/ruoyi-generator/pom.xml | 8 ++-- .../generator/controller/GenController.java | 20 ++++----- .../generator/service/GenTableService.java | 2 +- .../service/impl/GenTableServiceImpl.java | 2 +- ruoyi-basic/ruoyi-plugin/ruoyi-quartz/pom.xml | 6 +-- ruoyi-basic/ruoyi-system/pom.xml | 6 +-- sql/vue-server.sql | 45 ++++++++----------- 14 files changed, 96 insertions(+), 78 deletions(-) diff --git a/pom.xml b/pom.xml index a7c1bbb..a407a1d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.ruoyi + com.muyu ruoyi 3.8.6 @@ -31,7 +31,6 @@ 2.3 0.9.1 4.3.0 - 8.0.33 @@ -54,13 +53,6 @@ ${knife4j.version} - - - mysql - mysql-connector-java - ${mysql.version} - - com.alibaba @@ -152,35 +144,35 @@ - com.ruoyi + com.muyu ruoyi-quartz ${ruoyi.version} - com.ruoyi + com.muyu ruoyi-generator ${ruoyi.version} - com.ruoyi + com.muyu ruoyi-framework ${ruoyi.version} - com.ruoyi + com.muyu ruoyi-system ${ruoyi.version} - com.ruoyi + com.muyu ruoyi-common ${ruoyi.version} diff --git a/ruoyi-application/pom.xml b/ruoyi-application/pom.xml index 74500d3..8e1a3ed 100644 --- a/ruoyi-application/pom.xml +++ b/ruoyi-application/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> ruoyi - com.ruoyi + com.muyu 3.8.6 4.0.0 @@ -54,25 +54,25 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j - com.ruoyi + com.muyu ruoyi-framework - com.ruoyi + com.muyu ruoyi-quartz - com.ruoyi + com.muyu ruoyi-generator diff --git a/ruoyi-basic/pom.xml b/ruoyi-basic/pom.xml index 78135a2..3660df6 100644 --- a/ruoyi-basic/pom.xml +++ b/ruoyi-basic/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.ruoyi + com.muyu ruoyi 3.8.6 diff --git a/ruoyi-basic/ruoyi-common/pom.xml b/ruoyi-basic/ruoyi-common/pom.xml index d4d10db..4c02e60 100644 --- a/ruoyi-basic/ruoyi-common/pom.xml +++ b/ruoyi-basic/ruoyi-common/pom.xml @@ -3,8 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + ruoyi-basic + com.muyu 3.8.6 4.0.0 diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java index d58a48a..a06580f 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java @@ -154,7 +154,18 @@ public @interface Excel { Type type () default Type.ALL; public enum Type { - ALL(0), EXPORT(1), IMPORT(2); + /** + * 支持导入导出 + */ + ALL(0), + /** + * 仅导出 + */ + EXPORT(1), + /** + * 仅导入 + */ + IMPORT(2); private final int value; Type (int value) { @@ -167,13 +178,37 @@ public @interface Excel { } public enum ColumnType { - NUMERIC(0), STRING(1), IMAGE(2); + /** + * 数字 + */ + NUMERIC(0), + /** + * 字符串 + */ + STRING(1), + + /** + * 图片 + */ + IMAGE(2); + + /** + * 枚举类型值 + */ private final int value; + /** + * 类类型枚举构造器 + * @param value 枚举类型值 + */ ColumnType (int value) { this.value = value; } + /** + * 获取列枚举类型 + * @return 枚举值 + */ public int value () { return this.value; } diff --git a/ruoyi-basic/ruoyi-framework/pom.xml b/ruoyi-basic/ruoyi-framework/pom.xml index ab909b7..5fc4372 100644 --- a/ruoyi-basic/ruoyi-framework/pom.xml +++ b/ruoyi-basic/ruoyi-framework/pom.xml @@ -3,8 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + ruoyi-basic + com.muyu 3.8.6 4.0.0 @@ -55,7 +55,7 @@ - com.ruoyi + com.muyu ruoyi-system diff --git a/ruoyi-basic/ruoyi-plugin/pom.xml b/ruoyi-basic/ruoyi-plugin/pom.xml index adb81c5..5a6fa88 100644 --- a/ruoyi-basic/ruoyi-plugin/pom.xml +++ b/ruoyi-basic/ruoyi-plugin/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.ruoyi + com.muyu ruoyi-basic 3.8.6 diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/pom.xml b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/pom.xml index 1180284..86c3dff 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/pom.xml +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/pom.xml @@ -3,8 +3,8 @@ 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"> - ruoyi - com.ruoyi + ruoyi-plugin + com.muyu 3.8.6 4.0.0 @@ -31,10 +31,10 @@ - com.ruoyi + com.muyu ruoyi-common - \ No newline at end of file + diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java index 119b04a..a09fe44 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java @@ -56,7 +56,7 @@ public class GenController extends BaseController { GenTable table = genTableService.selectGenTableById(tableId); List tables = genTableService.selectGenTableAll(); List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); - Map map = new HashMap(); + Map map = new HashMap<>(16); map.put("info", table); map.put("rows", list); map.put("tables", tables); @@ -79,12 +79,12 @@ public class GenController extends BaseController { */ @PreAuthorize("@ss.hasPermi('tool:gen:list')") @GetMapping(value = "/column/{tableId}") - public Result columnList (Long tableId) { - TableDataInfo dataInfo = new TableDataInfo(); + public Result> columnList (@PathVariable("tableId") Long tableId) { List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); - dataInfo.setRows(list); - dataInfo.setTotal(list.size()); - return Result.success(dataInfo); + return Result.success(TableDataInfo.builder() + .rows(list) + .total(list.size()) + .build()); } /** @@ -129,7 +129,7 @@ public class GenController extends BaseController { */ @PreAuthorize("@ss.hasPermi('tool:gen:preview')") @GetMapping("/preview/{tableId}") - public Result> preview (@PathVariable("tableId") Long tableId) throws IOException { + public Result> preview (@PathVariable("tableId") Long tableId) { Map dataMap = genTableService.previewCode(tableId); return Result.success(dataMap); } @@ -162,8 +162,8 @@ public class GenController extends BaseController { @PreAuthorize("@ss.hasPermi('tool:gen:edit')") @Log(title = "代码生成", businessType = BusinessType.UPDATE) @GetMapping("/synchDb/{tableName}") - public Result synchDb (@PathVariable("tableName") String tableName) { - genTableService.synchDb(tableName); + public Result syncDb (@PathVariable("tableName") String tableName) { + genTableService.syncDb(tableName); return Result.success(); } @@ -187,7 +187,7 @@ public class GenController extends BaseController { response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); - response.addHeader("Content-Length", "" + data.length); + response.addHeader("Content-Length", String.valueOf(data.length)); response.setContentType("application/octet-stream; charset=UTF-8"); IOUtils.write(data, response.getOutputStream()); } diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableService.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableService.java index 2923cd0..d951d6c 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableService.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableService.java @@ -111,7 +111,7 @@ public interface GenTableService { * * @param tableName 表名称 */ - public void synchDb (String tableName); + public void syncDb (String tableName); /** * 批量生成代码（下载方式） diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java index 1e3282a..78833c3 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java @@ -279,7 +279,7 @@ public class GenTableServiceImpl implements GenTableService { */ @Override @Transactional - public void synchDb (String tableName) { + public void syncDb (String tableName) { GenTable table = genTableMapper.selectGenTableByName(tableName); List tableColumns = table.getColumns(); Map tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity())); diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-quartz/pom.xml b/ruoyi-basic/ruoyi-plugin/ruoyi-quartz/pom.xml index 734bad0..3d9e210 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-quartz/pom.xml +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-quartz/pom.xml @@ -3,8 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + ruoyi-plugin + com.muyu 3.8.6 4.0.0 @@ -31,7 +31,7 @@ - com.ruoyi + com.muyu ruoyi-common diff --git a/ruoyi-basic/ruoyi-system/pom.xml b/ruoyi-basic/ruoyi-system/pom.xml index 675976c..7231816 100644 --- a/ruoyi-basic/ruoyi-system/pom.xml +++ b/ruoyi-basic/ruoyi-system/pom.xml @@ -3,8 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi - com.ruoyi + ruoyi-basic + com.muyu 3.8.6 4.0.0 @@ -19,7 +19,7 @@ - com.ruoyi + com.muyu ruoyi-common diff --git a/sql/vue-server.sql b/sql/vue-server.sql index 68f99f8..a0d4fc9 100644 --- a/sql/vue-server.sql +++ b/sql/vue-server.sql @@ -43,7 +43,7 @@ CREATE TABLE `gen_table` ( `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`table_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Table structure for gen_table_column @@ -73,16 +73,7 @@ CREATE TABLE `gen_table_column` ( `update_by` bigint(20) NULL DEFAULT NULL COMMENT '更新者', `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`column_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 42 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表字段' ROW_FORMAT = DYNAMIC; - --- ---------------------------- --- Records of gen_table_column --- ---------------------------- -INSERT INTO `gen_table_column` VALUES (37, 4, 'id', '主键', 'bigint(20)', 'Long', 'bookId', '1', '1', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 1, 1, '2023-10-08 20:27:10', NULL, '2023-10-11 22:03:46'); -INSERT INTO `gen_table_column` VALUES (38, 4, 'name', '名称', 'varchar(32)', 'String', 'name', '0', '0', '1', '1', '1', '1', '1', 'LIKE', 'input', '', 2, 1, '2023-10-08 20:27:11', NULL, '2023-10-11 22:03:46'); -INSERT INTO `gen_table_column` VALUES (39, 4, 'price', '价格', 'decimal(10,2)', 'BigDecimal', 'price', '0', '0', '1', '1', '1', '1', '1', 'BETWEEN', 'input', '', 3, 1, '2023-10-08 20:27:11', NULL, '2023-10-11 22:03:46'); -INSERT INTO `gen_table_column` VALUES (40, 4, 'create_by', '创建人', 'varchar(32)', 'String', 'createBy', '0', '0', '1', '1', NULL, NULL, NULL, 'EQ', 'input', '', 4, 1, '2023-10-08 20:27:11', NULL, '2023-10-11 22:03:46'); -INSERT INTO `gen_table_column` VALUES (41, 4, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', '1', '1', NULL, NULL, NULL, 'EQ', 'datetime', '', 5, 1, '2023-10-08 20:27:11', NULL, '2023-10-11 22:03:46'); +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表字段' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Table structure for qrtz_blob_triggers @@ -354,16 +345,16 @@ CREATE TABLE `sys_dept` ( -- ---------------------------- -- Records of sys_dept -- ---------------------------- -INSERT INTO `sys_dept` VALUES (100, 0, '0', '若依科技', 0, '若依', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); -INSERT INTO `sys_dept` VALUES (101, 100, '0,100', '深圳总公司', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); -INSERT INTO `sys_dept` VALUES (102, 100, '0,100', '长沙分公司', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); -INSERT INTO `sys_dept` VALUES (103, 101, '0,100,101', '研发部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); -INSERT INTO `sys_dept` VALUES (104, 101, '0,100,101', '市场部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); -INSERT INTO `sys_dept` VALUES (105, 101, '0,100,101', '测试部门', 3, '若依', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); -INSERT INTO `sys_dept` VALUES (106, 101, '0,100,101', '财务部门', 4, '若依', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); -INSERT INTO `sys_dept` VALUES (107, 101, '0,100,101', '运维部门', 5, '若依', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); -INSERT INTO `sys_dept` VALUES (108, 102, '0,100,102', '市场部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); -INSERT INTO `sys_dept` VALUES (109, 102, '0,100,102', '财务部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); +INSERT INTO `sys_dept` VALUES (100, 0, '0', '牧鱼科技', 0, '牧鱼', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); +INSERT INTO `sys_dept` VALUES (101, 100, '0,100', '深圳总公司', 1, '牧鱼', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); +INSERT INTO `sys_dept` VALUES (102, 100, '0,100', '长沙分公司', 2, '牧鱼', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); +INSERT INTO `sys_dept` VALUES (103, 101, '0,100,101', '研发部门', 1, '牧鱼', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); +INSERT INTO `sys_dept` VALUES (104, 101, '0,100,101', '市场部门', 2, '牧鱼', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); +INSERT INTO `sys_dept` VALUES (105, 101, '0,100,101', '测试部门', 3, '牧鱼', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); +INSERT INTO `sys_dept` VALUES (106, 101, '0,100,101', '财务部门', 4, '牧鱼', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); +INSERT INTO `sys_dept` VALUES (107, 101, '0,100,101', '运维部门', 5, '牧鱼', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); +INSERT INTO `sys_dept` VALUES (108, 102, '0,100,102', '市场部门', 1, '牧鱼', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); +INSERT INTO `sys_dept` VALUES (109, 102, '0,100,102', '财务部门', 2, '牧鱼', '15888888888', 'ry@qq.com', '0', '0', 1, '2023-09-29 11:47:27', NULL, NULL); -- ---------------------------- -- Table structure for sys_dict_data @@ -517,7 +508,7 @@ CREATE TABLE `sys_logininfor` ( PRIMARY KEY (`info_id`) USING BTREE, INDEX `idx_sys_logininfor_s`(`status`) USING BTREE, INDEX `idx_sys_logininfor_lt`(`login_time`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 117 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统访问记录' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统访问记录' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sys_logininfor @@ -659,8 +650,8 @@ CREATE TABLE `sys_notice` ( -- ---------------------------- -- Records of sys_notice -- ---------------------------- -INSERT INTO `sys_notice` VALUES (1, '温馨提醒：2018-07-01 若依新版本发布啦', '2', 0xE696B0E78988E69CACE58685E5AEB9, '0', 1, '2023-09-29 11:47:28', NULL, NULL, '管理员'); -INSERT INTO `sys_notice` VALUES (2, '维护通知：2018-07-01 若依系统凌晨维护', '1', 0xE7BBB4E68AA4E58685E5AEB9, '0', 1, '2023-09-29 11:47:28', NULL, NULL, '管理员'); +INSERT INTO `sys_notice` VALUES (1, '温馨提醒：2018-07-01 牧鱼新版本发布啦', '2', 0xE696B0E78988E69CACE58685E5AEB9, '0', 1, '2023-09-29 11:47:28', NULL, NULL, '管理员'); +INSERT INTO `sys_notice` VALUES (2, '维护通知：2018-07-01 牧鱼系统凌晨维护', '1', 0xE7BBB4E68AA4E58685E5AEB9, '0', 1, '2023-09-29 11:47:28', NULL, NULL, '管理员'); -- ---------------------------- -- Table structure for sys_oper_log @@ -688,7 +679,7 @@ CREATE TABLE `sys_oper_log` ( INDEX `idx_sys_oper_log_bt`(`business_type`) USING BTREE, INDEX `idx_sys_oper_log_s`(`status`) USING BTREE, INDEX `idx_sys_oper_log_ot`(`oper_time`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 135 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志记录' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志记录' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sys_oper_log @@ -893,8 +884,8 @@ CREATE TABLE `sys_user` ( -- ---------------------------- -- Records of sys_user -- ---------------------------- -INSERT INTO `sys_user` VALUES (1, 103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2023-10-11 20:35:54', 1, '2023-09-29 11:47:27', NULL, '2023-10-11 20:35:54', '管理员'); -INSERT INTO `sys_user` VALUES (2, 105, 'ry', '若依', '00', 'ry@qq.com', '15666666666', '0', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2023-09-29 11:47:27', 1, '2023-09-29 11:47:27', 1, '2023-09-29 15:50:31', '测试员'); +INSERT INTO `sys_user` VALUES (1, 103, 'admin', '牧鱼', '00', 'muyu@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2023-10-11 20:35:54', 1, '2023-09-29 11:47:27', NULL, '2023-10-11 20:35:54', '管理员'); +INSERT INTO `sys_user` VALUES (2, 105, 'muyu', '牧鱼', '00', 'muyu@qq.com', '15666666666', '0', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2023-09-29 11:47:27', 1, '2023-09-29 11:47:27', 1, '2023-09-29 15:50:31', '测试员'); -- ---------------------------- -- Table structure for sys_user_post