diff --git a/server/like-admin/src/main/java/com/mdd/admin/config/AdminConfig.java b/server/like-admin/src/main/java/com/mdd/admin/config/AdminConfig.java index 1370b30a..49941c75 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/config/AdminConfig.java +++ b/server/like-admin/src/main/java/com/mdd/admin/config/AdminConfig.java @@ -27,6 +27,7 @@ public class AdminConfig { "system:role:all", // 所有角色 "system:post:all", // 所有岗位 "system:dept:list", // 所有部门 + "system:menu:list", // 菜单列表 "setting:dict:type:all", // 所有字典类型 "setting:dict:data:all", // 所有字典数据 "article:cate:all", // 所有文章分类 diff --git a/server/like-admin/src/main/java/com/mdd/admin/crontab/MyJob.java b/server/like-admin/src/main/java/com/mdd/admin/crontab/MyJob.java index c55fd5f7..c020730d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/crontab/MyJob.java +++ b/server/like-admin/src/main/java/com/mdd/admin/crontab/MyJob.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; public class MyJob { public void handle(String s) { - System.out.println("有参数定时任务执行逻辑 : " + s); + // System.out.println("有参数定时任务执行逻辑 : " + s); } } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/AlbumsServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/AlbumsServiceImpl.java index 96de8fc1..25ad536e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/AlbumsServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/AlbumsServiceImpl.java @@ -156,12 +156,17 @@ public class AlbumsServiceImpl implements IAlbumsService { */ @Override public Integer albumAdd(Map params) { + String name = params.get("name"); + if (name.length() >= 100) { + name = name.substring(0, 99); + } + Album album = new Album(); album.setCid(Integer.parseInt(params.get("cid") == null ? "0" : params.get("cid"))); album.setAid(Integer.parseInt(params.get("aid") == null ? "0" : params.get("aid"))); album.setUid(Integer.parseInt(params.get("uid") == null ? "0" : params.get("uid"))); album.setType(Integer.parseInt(params.get("type"))); - album.setName(params.get("name").substring(0, 99)); + album.setName(name); album.setExt(params.get("ext")); album.setUri(params.get("url")); album.setSize(Long.parseLong(params.get("size"))); diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingStorageServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingStorageServiceImpl.java index d82b5f88..b365059a 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingStorageServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/SettingStorageServiceImpl.java @@ -41,14 +41,14 @@ public class SettingStorageServiceImpl implements ISettingStorageService { list.add(qiniu); Map aliyun = new LinkedHashMap<>(); - aliyun.put("name", "阿里云存储"); + aliyun.put("name", "阿里云OSS"); aliyun.put("alias", "aliyun"); aliyun.put("describe", "存储在阿里云，请前往阿里云开通存储服务"); aliyun.put("status", engine.equals("aliyun") ? 1 : 0); list.add(aliyun); Map qcloud = new LinkedHashMap<>(); - qcloud.put("name", "腾讯云存储"); + qcloud.put("name", "腾讯云COS"); qcloud.put("alias", "qcloud"); qcloud.put("describe", "存储在腾讯云，请前往腾讯云开通存储服务"); qcloud.put("status", engine.equals("qcloud") ? 1 : 0); diff --git a/sql/install.sql b/sql/install.sql index 45cdc4e3..83accf53 100644 --- a/sql/install.sql +++ b/sql/install.sql @@ -274,13 +274,13 @@ CREATE TABLE `la_official_reply` ( DROP TABLE IF EXISTS `la_system_auth_admin`; CREATE TABLE `la_system_auth_admin` ( `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', - `dept_id` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '部门ID', - `post_id` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '岗位ID', + `role_ids` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '角色主键', + `dept_ids` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '部门ID', + `post_ids` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '岗位ID', `username` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户账号', `nickname` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户昵称', `password` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户密码', `avatar` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户头像', - `role` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '角色主键', `salt` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '加密盐巴', `sort` smallint(5) UNSIGNED NOT NULL DEFAULT 0 COMMENT '排序编号', `is_multipoint` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '多端登录: 0=否, 1=是', @@ -292,7 +292,7 @@ CREATE TABLE `la_system_auth_admin` ( `update_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '更新时间', `delete_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '删除时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 2 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 la_system_auth_dept @@ -311,7 +311,7 @@ CREATE TABLE `la_system_auth_dept` ( `update_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '更新时间', `delete_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '删除时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 10 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 la_system_auth_menu @@ -335,7 +335,7 @@ CREATE TABLE `la_system_auth_menu` ( `create_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建时间', `update_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 775 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 la_system_auth_perm @@ -492,23 +492,49 @@ CREATE TABLE `la_user_auth` ( UNIQUE INDEX `openid`(`openid`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户授权表' ROW_FORMAT = Dynamic; +-- ---------------------------- +-- Table structure for la_crontab +-- ---------------------------- +DROP TABLE IF EXISTS `la_crontab`; +CREATE TABLE `la_crontab` ( + `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + `name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '任务名称', + `groups` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '任务分组', + `command` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '任务命令', + `rules` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '任务贵州', + `remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注信息', + `error` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '错误信息', + `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 2 COMMENT '执行状态: 1=正在运行, 2=任务停止, 3=发生错误', + `strategy` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '执行策略: 1=立即执行, 2=执行一次, 3=放弃执行', + `concurrent` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '并发执行: 0=否, 1=是', + `is_delete` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否删除: 0=否, 1=是', + `start_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '开始时间', + `end_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '结束时间', + `task_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '任务耗时', + `create_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建时间', + `update_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '更新时间', + `delete_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '删除时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '计划任务表' ROW_FORMAT = Dynamic; + SET FOREIGN_KEY_CHECKS = 1; -- ---------------------------- -- INSERT -- ---------------------------- BEGIN; -INSERT INTO `la_system_auth_dept` VALUES (1, 0, '默认部门', '康明', '18327647788', 10, 0, 0, 1649841995, 1660190949, 0); -INSERT INTO `la_system_auth_admin` VALUES (1, 1, 0, 'admin', 'admin', '7fac2474740becfaf1ecbdd6cc8fb076', '/api/static/backend_avatar.png', '0', '5Xar0', 0, 1, 0, 0, '127.0.0.1', 1660641347, 1642321599, 1660287325, 0); +INSERT INTO `la_system_auth_dept` VALUES (1, 0, '默认部门', 'LikeAdmin', '18327647788', 10, 0, 0, 1649841995, 1660190949, 0); INSERT INTO `la_system_auth_role` VALUES (1, '审核员', '审核数据', 0, 0, 1668679451, 1668679468); +INSERT INTO `la_system_auth_admin` VALUES (1, '0', '1', '', 'admin', 'admin', '4919832b10f1d2133c0f24a7dbe8330e', '/api/static/backend_avatar.png', 'Huku0', 0, 1, 0, 0, '127.0.0.1', 1670314940, 1642321599, 1670376604, 0); +INSERT INTO `la_crontab` VALUES (1, '有参数任务', 'default', 'myJob.handle(\"参数\")', '* * * * * ?', '', '', 1, 1, 0, 0, 1670377612, 1670377612, 0, 1669970830, 1670289651, 0); COMMIT; BEGIN; INSERT INTO `la_system_config` VALUES (1, 'storage', 'default', 'local', 1660620367, 1662620927); INSERT INTO `la_system_config` VALUES (2, 'storage', 'local', '{\"name\":\"本地存储\"}', 1660620367, 1662620927); INSERT INTO `la_system_config` VALUES (3, 'storage', 'qiniu', '{\"name\":\"七牛云存储\",\"bucket\":\"\",\"secretKey\":\"\",\"accessKey\":\"\",\"domain\":\"\"}', 1660620367, 1660620367); -INSERT INTO `la_system_config` VALUES (4, 'storage', 'aliyun', '{\"name\":\"阿里云存储\",\"bucket\":\"\",\"secretKey\":\"\",\"accessKey\":\"\",\"domain\":\"\"}', 1660620367, 1662620071); -INSERT INTO `la_system_config` VALUES (5, 'storage', 'qcloud', '{\"name\":\"腾讯云存储\",\"bucket\":\"\",\"secretKey\":\"\",\"accessKey\":\"\",\"domain\":\"\",\"region\":\"\"}', 1660620367, 1660620367); +INSERT INTO `la_system_config` VALUES (4, 'storage', 'aliyun', '{\"name\":\"阿里云OSS\",\"bucket\":\"\",\"secretKey\":\"\",\"accessKey\":\"\",\"domain\":\"\"}', 1660620367, 1662620071); +INSERT INTO `la_system_config` VALUES (5, 'storage', 'qcloud', '{\"name\":\"腾讯云COS\",\"bucket\":\"\",\"secretKey\":\"\",\"accessKey\":\"\",\"domain\":\"\",\"region\":\"\"}', 1660620367, 1660620367); INSERT INTO `la_system_config` VALUES (6, 'sms', 'default', 'aliyun', 1660620367, 1660620367); INSERT INTO `la_system_config` VALUES (7, 'sms', 'aliyun', '{\"name\":\"阿里云短信\",\"alias\":\"aliyun\",\"sign\":\"\",\"appKey\":\"\",\"secretKey\":\"\"}', 1660620367, 1660620367); INSERT INTO `la_system_config` VALUES (8, 'sms', 'tencent', '{\"name\":\"腾讯云短信\",\"alias\":\"tencent\",\"sign\":\"\",\"appId\":\"\",\"secretId\":\"\",\"secretKey\":\"\"}', 1660620367, 1660620367); @@ -700,7 +726,7 @@ INSERT INTO `la_system_auth_menu` VALUES (744, 707, 'A', '设置保存', '', 0, INSERT INTO `la_system_auth_menu` VALUES (745, 710, 'A', '设置保存', '', 0, 'channel:mp:detail', '', '', '', '', 0, 1, 0, 1662638359, 1662638359); INSERT INTO `la_system_auth_menu` VALUES (746, 711, 'A', '保存设置', '', 0, 'channel:wx:save', '', '', '', '', 0, 1, 0, 1662638410, 1662638410); INSERT INTO `la_system_auth_menu` VALUES (747, 709, 'A', '保存', '', 0, 'channel:oa:save', '', '', '', '', 0, 1, 0, 1662638459, 1663310514); -INSERT INTO `la_system_auth_menu` VALUES (748, 708, 'C', '菜单管理', '', 0, '', 'menu', 'channel/wx_oa/menu', '', '', 0, 1, 0, 1663050714, 1663050714); +INSERT INTO `la_system_auth_menu` VALUES (748, 708, 'C', '菜单管理', '', 0, 'channel:oaMenu:detail', 'menu', 'channel/wx_oa/menu', '', '', 0, 1, 0, 1663050714, 1669963980); INSERT INTO `la_system_auth_menu` VALUES (750, 708, 'C', '关注回复', '', 0, 'channel:oaReplyFollow:list', 'follow', 'channel/wx_oa/reply/follow_reply', '', '', 0, 1, 0, 1663149592, 1664511108); INSERT INTO `la_system_auth_menu` VALUES (751, 708, 'C', '关键字回复', '', 0, 'channel:oaReplyKeyword:list', 'keyword', 'channel/wx_oa/reply/keyword_reply', '', '', 0, 1, 0, 1663149622, 1664511241); INSERT INTO `la_system_auth_menu` VALUES (752, 708, 'C', '默认回复', '', 0, 'channel:oaReplyDefault:list', 'default', 'channel/wx_oa/reply/default_reply', '', '', 0, 1, 0, 1663149650, 1664517685); @@ -726,4 +752,6 @@ INSERT INTO `la_system_auth_menu` VALUES (772, 752, 'A', '状态', '', 0, 'chann INSERT INTO `la_system_auth_menu` VALUES (773, 752, 'A', '删除', '', 0, 'channel:oaReplyDefault:del', '', '', '', '', 1, 1, 0, 1664517778, 1664517778); INSERT INTO `la_system_auth_menu` VALUES (774, 610, 'A', '导入数据表列表', '', 0, 'gen:db', '', '', '', '', 1, 1, 0, 1665646316, 1665646316); INSERT INTO `la_system_auth_menu` VALUES (775, 703, 'C', '文章添加/编辑', '', 0, 'article:add/edit', 'lists/edit', 'article/lists/edit', '/article/lists', '', 0, 0, 0, 1668677477, 1668677477); +INSERT INTO `la_system_auth_menu` VALUES (776, 550, 'C', '定时任务', '', 0, 'crontab:list', 'scheduled_task', 'setting/system/scheduled_task/index', '', '', 0, 1, 0, 1669964588, 1669964598); +INSERT INTO `la_system_auth_menu` VALUES (777, 550, 'C', '定时任务添加/编辑', '', 0, 'crontab/add:edit', 'scheduled_task/edit', 'setting/system/scheduled_task/edit', '/setting/system/scheduled_task', '', 0, 0, 0, 1669965065, 1669965660); COMMIT; \ No newline at end of file