From 756311e1231c14eb6ed92d43ed7e981359f12c33 Mon Sep 17 00:00:00 2001 From: zegezy <1098696801@qq.com> Date: Thu, 24 Aug 2023 12:19:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7springboot3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/magic-api/api/系统管理/在线用户/列表.ms | 7 +- magic-boot/pom.xml | 94 ------------------- pom.xml | 94 +++++++++++++++++-- .../magicboot/MagicBootApplication.java | 0 .../configuration/MagicBootConfiguration.java | 0 .../configuration/WebConfiguration.java | 6 -- .../NamedTableFunctionExtension.java | 0 .../extension/ResponseFunctionExtension.java | 6 +- .../NamedTableHandlerInterceptor.java | 0 .../interceptor/PermissionInterceptor.java | 0 .../magicboot/model/CodeCacheMap.java | 0 .../org/ssssssss/magicboot/model/Global.java | 0 .../magicboot/model/MagicBootConstants.java | 0 .../ssssssss/magicboot/model/StatusCode.java | 0 .../magicboot/model/UeditorConfig.java | 0 .../provider/ExceptionResultProvider.java | 0 .../ssssssss/magicboot/utils/AddressUtil.java | 0 .../ssssssss/magicboot/utils/FileUtils.java | 0 .../ssssssss/magicboot/utils/WebUtils.java | 1 - .../main/resources/application-demo.yml | 0 src/main/resources/application-dev.yml | 11 +++ .../main/resources/application-online.yml | 0 .../main/resources/application.yml | 0 23 files changed, 101 insertions(+), 118 deletions(-) delete mode 100644 magic-boot/pom.xml rename {magic-boot/src => src}/main/java/org/ssssssss/magicboot/MagicBootApplication.java (100%) rename {magic-boot/src => src}/main/java/org/ssssssss/magicboot/configuration/MagicBootConfiguration.java (100%) rename {magic-boot/src => src}/main/java/org/ssssssss/magicboot/configuration/WebConfiguration.java (67%) rename {magic-boot/src => src}/main/java/org/ssssssss/magicboot/extension/NamedTableFunctionExtension.java (100%) rename {magic-boot/src => src}/main/java/org/ssssssss/magicboot/extension/ResponseFunctionExtension.java (91%) rename {magic-boot/src => src}/main/java/org/ssssssss/magicboot/interceptor/NamedTableHandlerInterceptor.java (100%) rename {magic-boot/src => src}/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java (100%) rename {magic-boot/src => src}/main/java/org/ssssssss/magicboot/model/CodeCacheMap.java (100%) rename {magic-boot/src => src}/main/java/org/ssssssss/magicboot/model/Global.java (100%) rename {magic-boot/src => src}/main/java/org/ssssssss/magicboot/model/MagicBootConstants.java (100%) rename {magic-boot/src => src}/main/java/org/ssssssss/magicboot/model/StatusCode.java (100%) rename {magic-boot/src => src}/main/java/org/ssssssss/magicboot/model/UeditorConfig.java (100%) rename {magic-boot/src => src}/main/java/org/ssssssss/magicboot/provider/ExceptionResultProvider.java (100%) rename {magic-boot/src => src}/main/java/org/ssssssss/magicboot/utils/AddressUtil.java (100%) rename {magic-boot/src => src}/main/java/org/ssssssss/magicboot/utils/FileUtils.java (100%) rename {magic-boot/src => src}/main/java/org/ssssssss/magicboot/utils/WebUtils.java (94%) rename {magic-boot/src => src}/main/resources/application-demo.yml (100%) create mode 100644 src/main/resources/application-dev.yml rename {magic-boot/src => src}/main/resources/application-online.yml (100%) rename {magic-boot/src => src}/main/resources/application.yml (100%) diff --git a/data/magic-api/api/系统管理/在线用户/列表.ms b/data/magic-api/api/系统管理/在线用户/列表.ms index 786ac7f..c3b50b1 100644 --- a/data/magic-api/api/系统管理/在线用户/列表.ms +++ b/data/magic-api/api/系统管理/在线用户/列表.ms @@ -5,7 +5,7 @@ "groupId" : "d95a58e77d314370862ffc4cdfdb8283", "name" : "列表", "createTime" : null, - "updateTime" : 1680332611352, + "updateTime" : 1692848227765, "lock" : null, "createBy" : null, "updateBy" : null, @@ -28,7 +28,7 @@ "requestBody" : "", "headers" : [ ], "paths" : [ ], - "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": [\"cb63a01c-63d7-4722-a2c4-48fffa4b3502\", \"876dd178-0065-42d5-989a-a6ef460113b1\"],\n \"timestamp\": 1647396771372,\n \"executeTime\": 11\n}", + "responseBody" : "{\n \"code\": 200,\n \"message\": \"success\",\n \"data\": [\n \"0bde782e-fb15-4aaa-9795-406f644a513d\",\n \"08d818e1-62bb-426e-9eba-c88458c40e55\"\n ],\n \"timestamp\": 1692848223759,\n \"executeTime\": 10\n}", "description" : null, "requestBodyDefinition" : null, "responseBodyDefinition" : { @@ -119,8 +119,7 @@ } ================================ import cn.dev33.satoken.stp.StpUtil -var tokens = StpUtil.searchTokenValue("", -1, 0).map(it => it.replace('token:login:token:', '')) - +var tokens = StpUtil.searchTokenValue("", 0, -1, true).map(it => it.replace('token:login:token:', '')) return db.page(""" select su.id, diff --git a/magic-boot/pom.xml b/magic-boot/pom.xml deleted file mode 100644 index ed6489f..0000000 --- a/magic-boot/pom.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - 4.0.0 - - org.ssssssss - magic-boot-parent - 0.0.2 - - org.ssssssss - magic-boot - 0.0.2 - magic-boot - magic-boot - - 17 - 2.1.0 - 1.2.16 - 5.8.15 - 1.34.0 - 4.1.2 - 8.0.32 - 4.6.0 - - - - org.springframework.boot - spring-boot-starter-test - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.ssssssss - magic-api-spring-boot-starter - ${magic-api.version} - - - mysql - mysql-connector-java - ${mysql.connector.version} - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - cn.hutool - hutool-all - ${hutool-all.version} - - - cn.dev33 - sa-token-spring-boot3-starter - ${sa-token.version} - - - org.ssssssss - magic-api-plugin-task - ${magic-api.version} - - - org.ssssssss - magic-api-plugin-component - ${magic-api.version} - - - org.apache.poi - poi-ooxml - ${poi.version} - - - com.aliyun - aliyun-java-sdk-core - ${aliyun-core.version} - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - magic-boot - org.ssssssss.magicboot.MagicBootApplication - - - - - - diff --git a/pom.xml b/pom.xml index fd90c38..ecfbbb4 100644 --- a/pom.xml +++ b/pom.xml @@ -1,24 +1,98 @@ - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - pom - - magic-boot - org.springframework.boot spring-boot-starter-parent - 3.0.4 + 3.1.2 org.ssssssss - magic-boot-parent + magic-boot 0.0.2 - magic-boot-parent - magic-boot-parent + magic-boot + magic-boot + + 17 + 2.1.1 + 1.2.16 + 5.8.15 + 1.35.0.RC + 4.1.2 + 8.0.32 + 4.6.0 + + + + org.springframework.boot + spring-boot-starter-test + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.ssssssss + magic-api-spring-boot-starter + ${magic-api.version} + + + mysql + mysql-connector-java + ${mysql.connector.version} + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + cn.hutool + hutool-all + ${hutool-all.version} + + + cn.dev33 + sa-token-spring-boot3-starter + ${sa-token.version} + + + org.ssssssss + magic-api-plugin-task + ${magic-api.version} + + + org.ssssssss + magic-api-plugin-component + ${magic-api.version} + + + org.apache.poi + poi-ooxml + ${poi.version} + + + com.aliyun + aliyun-java-sdk-core + ${aliyun-core.version} + + + + + magic-boot + + + org.springframework.boot + spring-boot-maven-plugin + 2.2.1.RELEASE + + org.ssssssss.magicboot.MagicBootApplication + + + + diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/MagicBootApplication.java b/src/main/java/org/ssssssss/magicboot/MagicBootApplication.java similarity index 100% rename from magic-boot/src/main/java/org/ssssssss/magicboot/MagicBootApplication.java rename to src/main/java/org/ssssssss/magicboot/MagicBootApplication.java diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/configuration/MagicBootConfiguration.java b/src/main/java/org/ssssssss/magicboot/configuration/MagicBootConfiguration.java similarity index 100% rename from magic-boot/src/main/java/org/ssssssss/magicboot/configuration/MagicBootConfiguration.java rename to src/main/java/org/ssssssss/magicboot/configuration/MagicBootConfiguration.java diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/configuration/WebConfiguration.java b/src/main/java/org/ssssssss/magicboot/configuration/WebConfiguration.java similarity index 67% rename from magic-boot/src/main/java/org/ssssssss/magicboot/configuration/WebConfiguration.java rename to src/main/java/org/ssssssss/magicboot/configuration/WebConfiguration.java index 06e0a92..d257b64 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/configuration/WebConfiguration.java +++ b/src/main/java/org/ssssssss/magicboot/configuration/WebConfiguration.java @@ -1,16 +1,10 @@ package org.ssssssss.magicboot.configuration; import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpHeaders; -import org.springframework.scheduling.concurrent.ConcurrentTaskExecutor; -import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer; -import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.ssssssss.magicboot.model.Global; -import java.util.concurrent.Executors; - @Configuration public class WebConfiguration implements WebMvcConfigurer { diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/extension/NamedTableFunctionExtension.java b/src/main/java/org/ssssssss/magicboot/extension/NamedTableFunctionExtension.java similarity index 100% rename from magic-boot/src/main/java/org/ssssssss/magicboot/extension/NamedTableFunctionExtension.java rename to src/main/java/org/ssssssss/magicboot/extension/NamedTableFunctionExtension.java diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/extension/ResponseFunctionExtension.java b/src/main/java/org/ssssssss/magicboot/extension/ResponseFunctionExtension.java similarity index 91% rename from magic-boot/src/main/java/org/ssssssss/magicboot/extension/ResponseFunctionExtension.java rename to src/main/java/org/ssssssss/magicboot/extension/ResponseFunctionExtension.java index 674c62f..98b483e 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/extension/ResponseFunctionExtension.java +++ b/src/main/java/org/ssssssss/magicboot/extension/ResponseFunctionExtension.java @@ -1,5 +1,8 @@ package org.ssssssss.magicboot.extension; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; @@ -10,9 +13,6 @@ import org.ssssssss.magicapi.modules.servlet.ResponseModule; import org.ssssssss.script.annotation.Comment; import org.ssssssss.script.functions.ExtensionMethod; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; @Component diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/NamedTableHandlerInterceptor.java b/src/main/java/org/ssssssss/magicboot/interceptor/NamedTableHandlerInterceptor.java similarity index 100% rename from magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/NamedTableHandlerInterceptor.java rename to src/main/java/org/ssssssss/magicboot/interceptor/NamedTableHandlerInterceptor.java diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java b/src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java similarity index 100% rename from magic-boot/src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java rename to src/main/java/org/ssssssss/magicboot/interceptor/PermissionInterceptor.java diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/model/CodeCacheMap.java b/src/main/java/org/ssssssss/magicboot/model/CodeCacheMap.java similarity index 100% rename from magic-boot/src/main/java/org/ssssssss/magicboot/model/CodeCacheMap.java rename to src/main/java/org/ssssssss/magicboot/model/CodeCacheMap.java diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/model/Global.java b/src/main/java/org/ssssssss/magicboot/model/Global.java similarity index 100% rename from magic-boot/src/main/java/org/ssssssss/magicboot/model/Global.java rename to src/main/java/org/ssssssss/magicboot/model/Global.java diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/model/MagicBootConstants.java b/src/main/java/org/ssssssss/magicboot/model/MagicBootConstants.java similarity index 100% rename from magic-boot/src/main/java/org/ssssssss/magicboot/model/MagicBootConstants.java rename to src/main/java/org/ssssssss/magicboot/model/MagicBootConstants.java diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/model/StatusCode.java b/src/main/java/org/ssssssss/magicboot/model/StatusCode.java similarity index 100% rename from magic-boot/src/main/java/org/ssssssss/magicboot/model/StatusCode.java rename to src/main/java/org/ssssssss/magicboot/model/StatusCode.java diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/model/UeditorConfig.java b/src/main/java/org/ssssssss/magicboot/model/UeditorConfig.java similarity index 100% rename from magic-boot/src/main/java/org/ssssssss/magicboot/model/UeditorConfig.java rename to src/main/java/org/ssssssss/magicboot/model/UeditorConfig.java diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/provider/ExceptionResultProvider.java b/src/main/java/org/ssssssss/magicboot/provider/ExceptionResultProvider.java similarity index 100% rename from magic-boot/src/main/java/org/ssssssss/magicboot/provider/ExceptionResultProvider.java rename to src/main/java/org/ssssssss/magicboot/provider/ExceptionResultProvider.java diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/utils/AddressUtil.java b/src/main/java/org/ssssssss/magicboot/utils/AddressUtil.java similarity index 100% rename from magic-boot/src/main/java/org/ssssssss/magicboot/utils/AddressUtil.java rename to src/main/java/org/ssssssss/magicboot/utils/AddressUtil.java diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/utils/FileUtils.java b/src/main/java/org/ssssssss/magicboot/utils/FileUtils.java similarity index 100% rename from magic-boot/src/main/java/org/ssssssss/magicboot/utils/FileUtils.java rename to src/main/java/org/ssssssss/magicboot/utils/FileUtils.java diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/utils/WebUtils.java b/src/main/java/org/ssssssss/magicboot/utils/WebUtils.java similarity index 94% rename from magic-boot/src/main/java/org/ssssssss/magicboot/utils/WebUtils.java rename to src/main/java/org/ssssssss/magicboot/utils/WebUtils.java index 73829f3..1806e49 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/utils/WebUtils.java +++ b/src/main/java/org/ssssssss/magicboot/utils/WebUtils.java @@ -3,7 +3,6 @@ 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; public class WebUtils { diff --git a/magic-boot/src/main/resources/application-demo.yml b/src/main/resources/application-demo.yml similarity index 100% rename from magic-boot/src/main/resources/application-demo.yml rename to src/main/resources/application-demo.yml diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 0000000..4be2053 --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,11 @@ + +server: + port: 8089 + +spring: + datasource: + username: root + password: 123456789 + +upload: + dir: /Users/lvjinze/mb/ \ No newline at end of file diff --git a/magic-boot/src/main/resources/application-online.yml b/src/main/resources/application-online.yml similarity index 100% rename from magic-boot/src/main/resources/application-online.yml rename to src/main/resources/application-online.yml diff --git a/magic-boot/src/main/resources/application.yml b/src/main/resources/application.yml similarity index 100% rename from magic-boot/src/main/resources/application.yml rename to src/main/resources/application.yml