From 0f4095a5646a61151121c20327760c4b67a55041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=95=E9=87=91=E6=B3=BD?= <1098696801@qq.com> Date: Sat, 5 Mar 2022 23:38:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=91=E6=8E=A7=EF=BC=8C=E6=94=B9?= =?UTF-8?q?SqlCache=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/magic-api/api/后台/安全/登录.ms | 20 ++++----- data/magic-api/api/后台/用户管理/保存.ms | 20 +++++++-- data/magic-api/api/后台/用户管理/删除.ms | 20 +++++++-- data/magic-api/api/后台/菜单管理/保存.ms | 20 +++++++-- .../api/后台/菜单管理/根据菜单id清除缓存.ms | 6 +-- .../api/后台/角色管理/根据角色id删除缓存.ms | 6 +-- .../src/components/magic/mb-select.vue | 2 +- magic-boot-ui/src/icons/database.svg | 1 + magic-boot-ui/src/icons/login-log.svg | 2 +- magic-boot-ui/src/icons/monitor.svg | 1 + .../src/views/lowcode/magic-editor.vue | 3 ++ .../src/views/system/monitor/druid.vue | 3 ++ .../system/{log => monitor}/login-log.vue | 0 .../system/{log => monitor}/oper-log.vue | 0 .../src/views/system/user/user-list.vue | 4 +- magic-boot/pom.xml | 4 +- magic-boot/src/main/resources/application.yml | 43 ++++++++++++++++++- 17 files changed, 120 insertions(+), 35 deletions(-) create mode 100644 magic-boot-ui/src/icons/database.svg create mode 100644 magic-boot-ui/src/icons/monitor.svg create mode 100644 magic-boot-ui/src/views/lowcode/magic-editor.vue create mode 100644 magic-boot-ui/src/views/system/monitor/druid.vue rename magic-boot-ui/src/views/system/{log => monitor}/login-log.vue (100%) rename magic-boot-ui/src/views/system/{log => monitor}/oper-log.vue (100%) diff --git a/data/magic-api/api/后台/安全/登录.ms b/data/magic-api/api/后台/安全/登录.ms index afd6765..aa80b03 100644 --- a/data/magic-api/api/后台/安全/登录.ms +++ b/data/magic-api/api/后台/安全/登录.ms @@ -4,8 +4,8 @@ "script" : null, "groupId" : "1952f25c81084e24b55b11385767dc38", "name" : "登录", - "createTime" : 1646490239399, - "updateTime" : 1646482165171, + "createTime" : null, + "updateTime" : 1646493566796, "lock" : "0", "createBy" : null, "updateBy" : null, @@ -28,10 +28,10 @@ "requestBody" : "{\r\n \"username\": \"admin\",\r\n \"password\": \"123456\"\r\n}", "headers" : [ ], "paths" : [ ], - "responseBody" : "{\n \"code\": 0,\n \"message\": \"用户名或密码错误\",\n \"data\": null,\n \"timestamp\": 1643710761990,\n \"executeTime\": 6\n}", + "responseBody" : "{\"code\":200,\"message\":\"success\",\"data\":\"60f0ddf8-c42c-4b3e-802f-7482f6bd1075\",\"timestamp\":1646493023758,\"executeTime\":316}", "description" : null, "requestBodyDefinition" : { - "name" : "root", + "name" : "", "value" : "", "description" : "", "required" : false, @@ -80,7 +80,7 @@ "expression" : "", "children" : [ { "name" : "code", - "value" : "0", + "value" : "200", "description" : "", "required" : false, "dataType" : "Integer", @@ -92,7 +92,7 @@ "children" : [ ] }, { "name" : "message", - "value" : "用户名或密码错误", + "value" : "success", "description" : "", "required" : false, "dataType" : "String", @@ -104,10 +104,10 @@ "children" : [ ] }, { "name" : "data", - "value" : "null", + "value" : "60f0ddf8-c42c-4b3e-802f-7482f6bd1075", "description" : "", "required" : false, - "dataType" : "Object", + "dataType" : "String", "type" : null, "defaultValue" : null, "validateType" : "", @@ -116,7 +116,7 @@ "children" : [ ] }, { "name" : "timestamp", - "value" : "1643710761990", + "value" : "1646493023758", "description" : "", "required" : false, "dataType" : "Long", @@ -128,7 +128,7 @@ "children" : [ ] }, { "name" : "executeTime", - "value" : "6", + "value" : "316", "description" : "", "required" : false, "dataType" : "Integer", diff --git a/data/magic-api/api/后台/用户管理/保存.ms b/data/magic-api/api/后台/用户管理/保存.ms index be4242b..f9647a4 100644 --- a/data/magic-api/api/后台/用户管理/保存.ms +++ b/data/magic-api/api/后台/用户管理/保存.ms @@ -4,8 +4,8 @@ "script" : null, "groupId" : "4f0230049d7e4f39b1e0897cc0f46f9a", "name" : "保存", - "createTime" : 1646490239467, - "updateTime" : 1644121682487, + "createTime" : null, + "updateTime" : 1646493559668, "lock" : "0", "createBy" : null, "updateBy" : null, @@ -30,12 +30,24 @@ "paths" : [ ], "responseBody" : null, "description" : null, - "requestBodyDefinition" : null, + "requestBodyDefinition" : { + "name" : "", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, "responseBodyDefinition" : null } ================================ import cn.dev33.satoken.secure.SaSecureUtil; -import org.ssssssss.magicapi.cache.SqlCache +import org.ssssssss.magicapi.modules.db.cache.SqlCache var usernameCount = db.selectInt("select count(1) from sys_user where is_del = 0 and username = #{username} ?{id, and id != #{id}}") if(usernameCount > 0){ diff --git a/data/magic-api/api/后台/用户管理/删除.ms b/data/magic-api/api/后台/用户管理/删除.ms index 8c7a57d..aff9aff 100644 --- a/data/magic-api/api/后台/用户管理/删除.ms +++ b/data/magic-api/api/后台/用户管理/删除.ms @@ -4,8 +4,8 @@ "script" : null, "groupId" : "4f0230049d7e4f39b1e0897cc0f46f9a", "name" : "删除", - "createTime" : 1646490239473, - "updateTime" : 1644121688496, + "createTime" : null, + "updateTime" : 1646493558181, "lock" : "0", "createBy" : null, "updateBy" : null, @@ -30,11 +30,23 @@ "paths" : [ ], "responseBody" : null, "description" : null, - "requestBodyDefinition" : null, + "requestBodyDefinition" : { + "name" : "", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, "responseBodyDefinition" : null } ================================ -import org.ssssssss.magicapi.cache.SqlCache +import org.ssssssss.magicapi.modules.db.cache.SqlCache for(userId in id.split(',')){ SqlCache.delete(`permissions:${userId}`) diff --git a/data/magic-api/api/后台/菜单管理/保存.ms b/data/magic-api/api/后台/菜单管理/保存.ms index 440de74..f1f1500 100644 --- a/data/magic-api/api/后台/菜单管理/保存.ms +++ b/data/magic-api/api/后台/菜单管理/保存.ms @@ -4,8 +4,8 @@ "script" : null, "groupId" : "67b2ce258e24491194b74992958c74aa", "name" : "保存", - "createTime" : 1646490239506, - "updateTime" : 1644121672548, + "createTime" : null, + "updateTime" : 1646493564406, "lock" : "0", "createBy" : null, "updateBy" : null, @@ -42,11 +42,23 @@ "paths" : [ ], "responseBody" : null, "description" : null, - "requestBodyDefinition" : null, + "requestBodyDefinition" : { + "name" : "", + "value" : "", + "description" : "", + "required" : false, + "dataType" : "Object", + "type" : null, + "defaultValue" : null, + "validateType" : "", + "error" : "", + "expression" : "", + "children" : [ ] + }, "responseBodyDefinition" : null } ================================ -import org.ssssssss.magicapi.cache.SqlCache; +import org.ssssssss.magicapi.modules.db.cache.SqlCache; import '@get:/menu/cache/delete' as cacheDelete; if(data.url){ diff --git a/data/magic-api/api/后台/菜单管理/根据菜单id清除缓存.ms b/data/magic-api/api/后台/菜单管理/根据菜单id清除缓存.ms index f961a26..50497a4 100644 --- a/data/magic-api/api/后台/菜单管理/根据菜单id清除缓存.ms +++ b/data/magic-api/api/后台/菜单管理/根据菜单id清除缓存.ms @@ -4,8 +4,8 @@ "script" : null, "groupId" : "67b2ce258e24491194b74992958c74aa", "name" : "根据菜单id清除缓存", - "createTime" : 1646490239517, - "updateTime" : 1641218495832, + "createTime" : null, + "updateTime" : 1646493562232, "lock" : "0", "createBy" : null, "updateBy" : null, @@ -22,7 +22,7 @@ "responseBodyDefinition" : null } ================================ -import org.ssssssss.magicapi.cache.SqlCache +import org.ssssssss.magicapi.modules.db.cache.SqlCache var userIds = db.select(""" select user_id from sys_user_role where role_id in ( select role_id from sys_role_menu where menu_id = #{menuId} diff --git a/data/magic-api/api/后台/角色管理/根据角色id删除缓存.ms b/data/magic-api/api/后台/角色管理/根据角色id删除缓存.ms index c8fbecf..23eea24 100644 --- a/data/magic-api/api/后台/角色管理/根据角色id删除缓存.ms +++ b/data/magic-api/api/后台/角色管理/根据角色id删除缓存.ms @@ -4,8 +4,8 @@ "script" : null, "groupId" : "89130d496f6f467c88b22ae4a7f688eb", "name" : "根据角色id删除缓存", - "createTime" : 1646490239532, - "updateTime" : 1641218346505, + "createTime" : null, + "updateTime" : 1646493560974, "lock" : "0", "createBy" : null, "updateBy" : null, @@ -22,7 +22,7 @@ "responseBodyDefinition" : null } ================================ -import org.ssssssss.magicapi.cache.SqlCache +import org.ssssssss.magicapi.modules.db.cache.SqlCache var userIds = db.select(""" select user_id from sys_user_role where role_id = #{roleId} and user_id is not null """) diff --git a/magic-boot-ui/src/components/magic/mb-select.vue b/magic-boot-ui/src/components/magic/mb-select.vue index 6808f49..2d7e814 100644 --- a/magic-boot-ui/src/components/magic/mb-select.vue +++ b/magic-boot-ui/src/components/magic/mb-select.vue @@ -121,7 +121,7 @@ async function loadData() { listConcat(handlerData(props.data)) } else if (props.url) { proxy.$get(props.url, props.params).then(res => { - listConcat(handlerData(res.data)) + listConcat(handlerData(res.data.list || res.data)) }) } else { listConcat(proxy.$common.getDictType(props.type)) diff --git a/magic-boot-ui/src/icons/database.svg b/magic-boot-ui/src/icons/database.svg new file mode 100644 index 0000000..c46913f --- /dev/null +++ b/magic-boot-ui/src/icons/database.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/magic-boot-ui/src/icons/login-log.svg b/magic-boot-ui/src/icons/login-log.svg index 43bc10b..4a669d5 100644 --- a/magic-boot-ui/src/icons/login-log.svg +++ b/magic-boot-ui/src/icons/login-log.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/magic-boot-ui/src/icons/monitor.svg b/magic-boot-ui/src/icons/monitor.svg new file mode 100644 index 0000000..bea0547 --- /dev/null +++ b/magic-boot-ui/src/icons/monitor.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/magic-boot-ui/src/views/lowcode/magic-editor.vue b/magic-boot-ui/src/views/lowcode/magic-editor.vue new file mode 100644 index 0000000..7b13fc8 --- /dev/null +++ b/magic-boot-ui/src/views/lowcode/magic-editor.vue @@ -0,0 +1,3 @@ + diff --git a/magic-boot-ui/src/views/system/monitor/druid.vue b/magic-boot-ui/src/views/system/monitor/druid.vue new file mode 100644 index 0000000..a1cac48 --- /dev/null +++ b/magic-boot-ui/src/views/system/monitor/druid.vue @@ -0,0 +1,3 @@ + diff --git a/magic-boot-ui/src/views/system/log/login-log.vue b/magic-boot-ui/src/views/system/monitor/login-log.vue similarity index 100% rename from magic-boot-ui/src/views/system/log/login-log.vue rename to magic-boot-ui/src/views/system/monitor/login-log.vue diff --git a/magic-boot-ui/src/views/system/log/oper-log.vue b/magic-boot-ui/src/views/system/monitor/oper-log.vue similarity index 100% rename from magic-boot-ui/src/views/system/log/oper-log.vue rename to magic-boot-ui/src/views/system/monitor/oper-log.vue diff --git a/magic-boot-ui/src/views/system/user/user-list.vue b/magic-boot-ui/src/views/system/user/user-list.vue index 4a5ef39..530e673 100644 --- a/magic-boot-ui/src/views/system/user/user-list.vue +++ b/magic-boot-ui/src/views/system/user/user-list.vue @@ -161,7 +161,7 @@ const table = ref() const userForm = ref() onMounted(() => { - setTimeout(function(){ + // setTimeout(function(){ console.log(proxy.$route.query.roleId) if(proxy.$route.query.roleId){ tableOptions.where.roleId.value = proxy.$route.query.roleId @@ -169,7 +169,7 @@ onMounted(() => { if(proxy.$route.query.officeId){ tableOptions.where.officeId = proxy.$route.query.officeId } - },1000) + // },1000) }) function checkChange(values) { diff --git a/magic-boot/pom.xml b/magic-boot/pom.xml index 75387a3..7ec3a93 100644 --- a/magic-boot/pom.xml +++ b/magic-boot/pom.xml @@ -15,7 +15,7 @@ 1.8 2.0.0-beta.2 - 1.2.1 + 1.1.10 5.7.13 1.26.0 @@ -39,7 +39,7 @@ com.alibaba - druid + druid-spring-boot-starter ${druid.version} diff --git a/magic-boot/src/main/resources/application.yml b/magic-boot/src/main/resources/application.yml index 615eb59..c41cf51 100644 --- a/magic-boot/src/main/resources/application.yml +++ b/magic-boot/src/main/resources/application.yml @@ -17,9 +17,50 @@ spring: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 datasource: - url: jdbc:mysql://localhost:3306/magic-boot?useSSL=false&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&serverTimezone=Asia/Shanghai + driver-class-name: com.mysql.cj.jdbc.Driver + type: com.alibaba.druid.pool.DruidDataSource + url: jdbc:mysql://localhost:3307/magic-boot?useSSL=false&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&serverTimezone=Asia/Shanghai username: root password: root + druid: + # 下面为连接池的补充设置，应用到上面所有数据源中 + # 初始化大小，最小，最大 + initial-size: 5 + min-idle: 5 + max-active: 1000 + # 配置获取连接等待超时的时间 + max-wait: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + time-between-eviction-runs-millis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + min-evictable-idle-time-millis: 300000 + validation-query: SELECT 1 + test-while-idle: true + test-on-borrow: false + test-on-return: false + # 打开PSCache，并且指定每个连接上PSCache的大小 + pool-prepared-statements: true + # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 + max-pool-prepared-statement-per-connection-size: 20 + filters: stat,wall + use-global-data-source-stat: true + # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 + connect-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 + # 配置监控服务器 + stat-view-servlet: + login-username: admin + login-password: 123456 + reset-enable: false + url-pattern: /druid/* + # 添加IP白名单 + #allow: + # 添加IP黑名单，当白名单和黑名单重复时，黑名单优先级更高 + #deny: + web-stat-filter: + # 添加过滤规则 + url-pattern: /* + # 忽略过滤格式 + exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*" upload: # oss,disk（磁盘）