From c9a4846bcec4efa42385334de5522c5acaba7d91 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Wed, 28 Jun 2023 14:36:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/banner/core/BannerApplicationRunner.java | 2 +- .../mybatis/config/OrionMybatisAutoConfiguration.java | 3 ++- .../ops/framework/mybatis/generator/CodeGenerator.java | 3 +++ .../websocket/interceptor/UserHandshakeInterceptor.java | 2 ++ {orion-ops-server => orion-ops-launch}/pom.xml | 2 +- .../main/java/com/orion/ops/launch/LaunchApplication.java | 8 ++++---- .../ops/launch}/config/ApplicationConfiguration.java | 2 +- .../orion/ops/launch}/controller/BootstrapController.java | 2 +- .../src/main/resources/application-dev.yaml | 0 .../src/main/resources/application-prod.yaml | 0 .../src/main/resources/application.yaml | 2 +- .../orion/ops/launch}/controller/BootstrapController.http | 0 pom.xml | 2 +- 13 files changed, 17 insertions(+), 11 deletions(-) rename {orion-ops-server => orion-ops-launch}/pom.xml (98%) rename orion-ops-server/src/main/java/com/orion/ops/server/OrionOpsApplication.java => orion-ops-launch/src/main/java/com/orion/ops/launch/LaunchApplication.java (61%) rename {orion-ops-server/src/main/java/com/orion/ops/server => orion-ops-launch/src/main/java/com/orion/ops/launch}/config/ApplicationConfiguration.java (93%) rename {orion-ops-server/src/main/java/com/orion/ops/server => orion-ops-launch/src/main/java/com/orion/ops/launch}/controller/BootstrapController.java (92%) rename {orion-ops-server => orion-ops-launch}/src/main/resources/application-dev.yaml (100%) rename {orion-ops-server => orion-ops-launch}/src/main/resources/application-prod.yaml (100%) rename {orion-ops-server => orion-ops-launch}/src/main/resources/application.yaml (98%) rename {orion-ops-server/src/test/java/com/orion/ops/server => orion-ops-launch/src/test/java/com/orion/ops/launch}/controller/BootstrapController.http (100%) diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-banner/src/main/java/com/orion/ops/framework/banner/core/BannerApplicationRunner.java b/orion-ops-framework/orion-ops-spring-boot-starter-banner/src/main/java/com/orion/ops/framework/banner/core/BannerApplicationRunner.java index 8f39d8a9..cff6abe0 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-banner/src/main/java/com/orion/ops/framework/banner/core/BannerApplicationRunner.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-banner/src/main/java/com/orion/ops/framework/banner/core/BannerApplicationRunner.java @@ -30,7 +30,7 @@ public class BannerApplicationRunner implements ApplicationRunner { @Override public void run(ApplicationArguments args) { - String line = AnsiCode.GLOSS_GREEN.stain(":: orion-ops-server v" + version + " 服务已启动(" + env + ") ::\n") + + String line = AnsiCode.GLOSS_GREEN.stain(":: orion-ops-launch v" + version + " 服务已启动(" + env + ") ::\n") + AnsiCode.GLOSS_GREEN.stain(":: swagger 文档 ") + AnsiCode.GLOSS_BLUE.stain("http://127.0.0.1:" + port + "/doc.html\n") + AnsiCode.GLOSS_GREEN.stain(":: druid console ") + diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/config/OrionMybatisAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/config/OrionMybatisAutoConfiguration.java index 463ffd46..abeec40c 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/config/OrionMybatisAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/config/OrionMybatisAutoConfiguration.java @@ -5,6 +5,7 @@ import com.orion.ops.framework.common.constant.FilterOrderConst; import com.orion.ops.framework.common.filter.FilterCreator; import com.orion.ops.framework.mybatis.cache.RowCacheClearFilter; import com.orion.ops.framework.mybatis.handler.FieldFillHandler; +import org.apache.ibatis.annotations.Mapper; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.web.servlet.FilterRegistrationBean; @@ -19,7 +20,7 @@ import org.springframework.context.annotation.Bean; * @since 2023/6/23 18:35 */ @AutoConfiguration -@MapperScan(value = "com.orion.ops.module.*.dao", lazyInitialization = "true") +@MapperScan(value = "com.orion.ops.module.*.dao", annotationClass = Mapper.class, lazyInitialization = "true") public class OrionMybatisAutoConfiguration { /** diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/generator/CodeGenerator.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/generator/CodeGenerator.java index 126b1d02..9edbdd98 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/generator/CodeGenerator.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/generator/CodeGenerator.java @@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; import com.orion.lang.constant.Const; import com.orion.ops.framework.mybatis.domain.BaseDO; import com.orion.ops.framework.mybatis.mapper.IMapper; +import org.apache.ibatis.annotations.Mapper; /** * @author Jiahang Li @@ -111,6 +112,8 @@ public class CodeGenerator { .enableFileOverride() // mapper 配置 .mapperBuilder() + // dao 添加 @Mapper + .mapperAnnotation(Mapper.class) // mapper 父类 .superClass(IMapper.class) // 生成 BaseResultMap diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/interceptor/UserHandshakeInterceptor.java b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/interceptor/UserHandshakeInterceptor.java index 7550e8aa..4e00566c 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/interceptor/UserHandshakeInterceptor.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/interceptor/UserHandshakeInterceptor.java @@ -23,7 +23,9 @@ public class UserHandshakeInterceptor implements HandshakeInterceptor { attributes.put(WsAttr.USER, 1); // if (user == null){ // return false; + // response.setStatusCode(HttpStatus.MULTI_STATUS); // } + // HttpSessionHandshakeInterceptor return true; } diff --git a/orion-ops-server/pom.xml b/orion-ops-launch/pom.xml similarity index 98% rename from orion-ops-server/pom.xml rename to orion-ops-launch/pom.xml index 39daf032..b294efb3 100644 --- a/orion-ops-server/pom.xml +++ b/orion-ops-launch/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - orion-ops-server + orion-ops-launch jar 后端服务主项目容器 按需引用 orion-ops-module-xxx 依赖 diff --git a/orion-ops-server/src/main/java/com/orion/ops/server/OrionOpsApplication.java b/orion-ops-launch/src/main/java/com/orion/ops/launch/LaunchApplication.java similarity index 61% rename from orion-ops-server/src/main/java/com/orion/ops/server/OrionOpsApplication.java rename to orion-ops-launch/src/main/java/com/orion/ops/launch/LaunchApplication.java index 042798dc..eea81a3e 100644 --- a/orion-ops-server/src/main/java/com/orion/ops/server/OrionOpsApplication.java +++ b/orion-ops-launch/src/main/java/com/orion/ops/launch/LaunchApplication.java @@ -1,4 +1,4 @@ -package com.orion.ops.server; +package com.orion.ops.launch; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -10,11 +10,11 @@ import org.springframework.boot.builder.SpringApplicationBuilder; * @version 1.0.0 * @since 2023/6/19 16:55 */ -@SpringBootApplication(scanBasePackages = {"com.orion.ops.server", "com.orion.ops.module"}) -public class OrionOpsApplication { +@SpringBootApplication(scanBasePackages = {"com.orion.ops.launch", "com.orion.ops.module"}) +public class LaunchApplication { public static void main(String[] args) { - new SpringApplicationBuilder(OrionOpsApplication.class).run(args); + new SpringApplicationBuilder(LaunchApplication.class).run(args); } } diff --git a/orion-ops-server/src/main/java/com/orion/ops/server/config/ApplicationConfiguration.java b/orion-ops-launch/src/main/java/com/orion/ops/launch/config/ApplicationConfiguration.java similarity index 93% rename from orion-ops-server/src/main/java/com/orion/ops/server/config/ApplicationConfiguration.java rename to orion-ops-launch/src/main/java/com/orion/ops/launch/config/ApplicationConfiguration.java index 7011ecdf..dd7fe719 100644 --- a/orion-ops-server/src/main/java/com/orion/ops/server/config/ApplicationConfiguration.java +++ b/orion-ops-launch/src/main/java/com/orion/ops/launch/config/ApplicationConfiguration.java @@ -1,4 +1,4 @@ -package com.orion.ops.server.config; +package com.orion.ops.launch.config; import com.orion.spring.SpringHolder; import org.springframework.context.annotation.Bean; diff --git a/orion-ops-server/src/main/java/com/orion/ops/server/controller/BootstrapController.java b/orion-ops-launch/src/main/java/com/orion/ops/launch/controller/BootstrapController.java similarity index 92% rename from orion-ops-server/src/main/java/com/orion/ops/server/controller/BootstrapController.java rename to orion-ops-launch/src/main/java/com/orion/ops/launch/controller/BootstrapController.java index 4ec4d490..0bc1c847 100644 --- a/orion-ops-server/src/main/java/com/orion/ops/server/controller/BootstrapController.java +++ b/orion-ops-launch/src/main/java/com/orion/ops/launch/controller/BootstrapController.java @@ -1,4 +1,4 @@ -package com.orion.ops.server.controller; +package com.orion.ops.launch.controller; import com.orion.ops.framework.common.annotation.RestWrapper; import org.springframework.web.bind.annotation.GetMapping; diff --git a/orion-ops-server/src/main/resources/application-dev.yaml b/orion-ops-launch/src/main/resources/application-dev.yaml similarity index 100% rename from orion-ops-server/src/main/resources/application-dev.yaml rename to orion-ops-launch/src/main/resources/application-dev.yaml diff --git a/orion-ops-server/src/main/resources/application-prod.yaml b/orion-ops-launch/src/main/resources/application-prod.yaml similarity index 100% rename from orion-ops-server/src/main/resources/application-prod.yaml rename to orion-ops-launch/src/main/resources/application-prod.yaml diff --git a/orion-ops-server/src/main/resources/application.yaml b/orion-ops-launch/src/main/resources/application.yaml similarity index 98% rename from orion-ops-server/src/main/resources/application.yaml rename to orion-ops-launch/src/main/resources/application.yaml index 347ce1ef..fa60aad9 100644 --- a/orion-ops-server/src/main/resources/application.yaml +++ b/orion-ops-launch/src/main/resources/application.yaml @@ -3,7 +3,7 @@ server: spring: application: - name: orion-ops-server + name: orion-ops-launch profiles: active: dev main: diff --git a/orion-ops-server/src/test/java/com/orion/ops/server/controller/BootstrapController.http b/orion-ops-launch/src/test/java/com/orion/ops/launch/controller/BootstrapController.http similarity index 100% rename from orion-ops-server/src/test/java/com/orion/ops/server/controller/BootstrapController.http rename to orion-ops-launch/src/test/java/com/orion/ops/launch/controller/BootstrapController.http diff --git a/pom.xml b/pom.xml index 2865a376..4c72b18f 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ orion-ops-dependencies orion-ops-framework - orion-ops-server + orion-ops-launch