diff --git a/data/magic-api/api/系统管理/用户管理/所有机构.ms b/data/magic-api/api/系统管理/用户管理/所有机构.ms index dc1123e..7c017f5 100644 --- a/data/magic-api/api/系统管理/用户管理/所有机构.ms +++ b/data/magic-api/api/系统管理/用户管理/所有机构.ms @@ -92,8 +92,8 @@ "children" : [ ] } ] } -} -================================ +} +================================ var toTree = (list,pid) => select t.*,toTree(list,t.key) children from list t where t.pid = pid var list = toTree(db.select('select id "key",name label,pid from sys_office where is_del = 0 order by sort'),'0') diff --git a/data/magic-api/api/系统管理/组件/选择组件.ms b/data/magic-api/api/系统管理/组件/选择组件.ms index e802cee..ea4530a 100644 --- a/data/magic-api/api/系统管理/组件/选择组件.ms +++ b/data/magic-api/api/系统管理/组件/选择组件.ms @@ -224,8 +224,8 @@ "children" : [ ] } ] } -} -================================ +} +================================ import org.ssssssss.magicapi.utils.PathUtils import org.ssssssss.magicapi.core.service.MagicResourceService var getFiles = (groupId) => { diff --git a/data/magic-api/api/系统管理/组织机构/删除.ms b/data/magic-api/api/系统管理/组织机构/删除.ms index a99459d..2417476 100644 --- a/data/magic-api/api/系统管理/组织机构/删除.ms +++ b/data/magic-api/api/系统管理/组织机构/删除.ms @@ -5,7 +5,7 @@ "groupId" : "8295fc13678d4144bf7363c465247a50", "name" : "删除", "createTime" : null, - "updateTime" : 1647615807925, + "updateTime" : 1679552802807, "lock" : "0", "createBy" : null, "updateBy" : null, @@ -126,9 +126,9 @@ var userCount = db.selectInt("select count(1) from sys_user where is_del = 0 and if(userCount > 0){ exit 500, '机构存在用户,不允许删除' } -var root = db.selectValue("select pid from sys_office where is_del = 0 and id = #{id}") -if(root == '0'){ - exit 500, '不能删除根节点' -} +// var root = db.selectValue("select pid from sys_office where is_del = 0 and id = #{id}") +// if(root == '0'){ +// exit 500, '不能删除根节点' +// } // db.table('sys_user_office').where().eq("office_id",id).delete(); -return db.table("sys_office").logic().where().eq("id",id).delete(); \ No newline at end of file +return db.table("sys_office").logic().where().eq("id",id).delete(); diff --git a/data/magic-api/api/系统管理/配置中心/保存.ms b/data/magic-api/api/系统管理/配置中心/保存.ms index 315051a..9ca64fe 100644 --- a/data/magic-api/api/系统管理/配置中心/保存.ms +++ b/data/magic-api/api/系统管理/配置中心/保存.ms @@ -5,7 +5,7 @@ "groupId" : "0295f2b4af9145f5a0ea29fa4b797214", "name" : "保存", "createTime" : null, - "updateTime" : 1653129238531, + "updateTime" : 1679725946724, "lock" : null, "createBy" : null, "updateBy" : null, @@ -218,4 +218,4 @@ import org.ssssssss.magicapi.modules.db.cache.SqlCache SqlCache.delete(`configure:${configureKey}${configureCondition}`) SqlCache.delete(`configure:${configureKey}`) -return db.table('sys_configure').primary('id').saveOrUpdate(data) +return db.table('sys_configure').primary('id').withBlank().saveOrUpdate(data) diff --git a/magic-boot/pom.xml b/magic-boot/pom.xml index 6f43c7a..ed6489f 100644 --- a/magic-boot/pom.xml +++ b/magic-boot/pom.xml @@ -5,20 +5,21 @@ org.ssssssss magic-boot-parent - 0.0.1 + 0.0.2 org.ssssssss magic-boot - 0.0.1 + 0.0.2 magic-boot magic-boot - 1.8 - 2.1.1 - 1.1.10 - 5.7.22 - 1.26.0 + 17 + 2.1.0 + 1.2.16 + 5.8.15 + 1.34.0 4.1.2 + 8.0.32 4.6.0 @@ -38,6 +39,7 @@ mysql mysql-connector-java + ${mysql.connector.version} com.alibaba @@ -51,7 +53,7 @@ cn.dev33 - sa-token-spring-boot-starter + sa-token-spring-boot3-starter ${sa-token.version} diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java b/magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java index ebfedf5..ac73e08 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java @@ -1,7 +1,6 @@ package org.ssssssss.magicboot.interceptor; import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.extra.servlet.ServletUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.annotation.Order; @@ -20,7 +19,6 @@ import org.ssssssss.magicapi.utils.PathUtils; import org.ssssssss.magicboot.model.StatusCode; import org.ssssssss.script.MagicScriptContext; -import javax.servlet.http.HttpServletRequest; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -65,7 +63,7 @@ public class PermissionInterceptor implements RequestInterceptor, HandlerInterce public Object postHandle(RequestEntity requestEntity, Object returnValue) throws Exception { if(StpUtil.isLogin()){ try { - HttpServletRequest request = requestEntity.getRequest().getRequest(); + MagicHttpServletRequest request = requestEntity.getRequest(); ApiInfo info = requestEntity.getApiInfo(); template.update("insert into sys_oper_log(api_name, api_path, api_method, cost_time, create_by, create_date, user_agent, user_ip) values(?,?,?,?,?,?,?,?)", // PathUtils.replaceSlash(groupServiceProvider.getFullName(info.getGroupId()) + "/" + info.getName()).replace("/","-"), @@ -76,7 +74,7 @@ public class PermissionInterceptor implements RequestInterceptor, HandlerInterce StpUtil.getLoginId(), new Date(requestEntity.getRequestTime()), request.getHeader("User-Agent"), - ServletUtil.getClientIP(request)); + request.getRemoteAddr()); } catch (Exception ignored){ ignored.printStackTrace(); } diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/provider/ExceptionResultProvider.java b/magic-boot/src/main/java/org/ssssssss/magicboot/provider/ExceptionResultProvider.java index f5f17f2..567bd8f 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/provider/ExceptionResultProvider.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/provider/ExceptionResultProvider.java @@ -1,6 +1,6 @@ package org.ssssssss.magicboot.provider; -import cn.dev33.satoken.exception.DisableLoginException; +import cn.dev33.satoken.exception.DisableServiceException; import org.springframework.stereotype.Component; import org.ssssssss.magicapi.core.context.RequestEntity; import org.ssssssss.magicapi.core.interceptor.ResultProvider; @@ -17,7 +17,7 @@ public class ExceptionResultProvider implements ResultProvider { @Override public Object buildException(RequestEntity requestEntity, Throwable throwable) { - if(throwable.getCause() instanceof DisableLoginException){ + if(throwable.getCause() instanceof DisableServiceException){ return buildResult(requestEntity, 500, "此账号已被临时封禁，请联系管理员"); } return buildResult(requestEntity, 500, "系统内部出现错误"); diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/utils/WebUtils.java b/magic-boot/src/main/java/org/ssssssss/magicboot/utils/WebUtils.java index 7e98059..73829f3 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/utils/WebUtils.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/utils/WebUtils.java @@ -1,10 +1,10 @@ package org.ssssssss.magicboot.utils; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import org.ssssssss.magicboot.model.Global; -import javax.servlet.http.HttpServletRequest; public class WebUtils { diff --git a/pom.xml b/pom.xml index 338bcaf..fd90c38 100644 --- a/pom.xml +++ b/pom.xml @@ -11,13 +11,13 @@ org.springframework.boot spring-boot-starter-parent - 2.4.5 + 3.0.4 org.ssssssss magic-boot-parent - 0.0.1 + 0.0.2 magic-boot-parent magic-boot-parent