修改包名

This commit is contained in:
lijiahang
2023-06-28 14:36:17 +08:00
parent a650723962
commit c9a4846bce
13 changed files with 17 additions and 11 deletions

View File

@@ -30,7 +30,7 @@ public class BannerApplicationRunner implements ApplicationRunner {
@Override @Override
public void run(ApplicationArguments args) { 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_GREEN.stain(":: swagger 文档 ") +
AnsiCode.GLOSS_BLUE.stain("http://127.0.0.1:" + port + "/doc.html\n") + AnsiCode.GLOSS_BLUE.stain("http://127.0.0.1:" + port + "/doc.html\n") +
AnsiCode.GLOSS_GREEN.stain(":: druid console ") + AnsiCode.GLOSS_GREEN.stain(":: druid console ") +

View File

@@ -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.common.filter.FilterCreator;
import com.orion.ops.framework.mybatis.cache.RowCacheClearFilter; import com.orion.ops.framework.mybatis.cache.RowCacheClearFilter;
import com.orion.ops.framework.mybatis.handler.FieldFillHandler; import com.orion.ops.framework.mybatis.handler.FieldFillHandler;
import org.apache.ibatis.annotations.Mapper;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -19,7 +20,7 @@ import org.springframework.context.annotation.Bean;
* @since 2023/6/23 18:35 * @since 2023/6/23 18:35
*/ */
@AutoConfiguration @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 { public class OrionMybatisAutoConfiguration {
/** /**

View File

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
import com.orion.lang.constant.Const; import com.orion.lang.constant.Const;
import com.orion.ops.framework.mybatis.domain.BaseDO; import com.orion.ops.framework.mybatis.domain.BaseDO;
import com.orion.ops.framework.mybatis.mapper.IMapper; import com.orion.ops.framework.mybatis.mapper.IMapper;
import org.apache.ibatis.annotations.Mapper;
/** /**
* @author Jiahang Li * @author Jiahang Li
@@ -111,6 +112,8 @@ public class CodeGenerator {
.enableFileOverride() .enableFileOverride()
// mapper 配置 // mapper 配置
.mapperBuilder() .mapperBuilder()
// dao 添加 @Mapper
.mapperAnnotation(Mapper.class)
// mapper 父类 // mapper 父类
.superClass(IMapper.class) .superClass(IMapper.class)
// 生成 BaseResultMap // 生成 BaseResultMap

View File

@@ -23,7 +23,9 @@ public class UserHandshakeInterceptor implements HandshakeInterceptor {
attributes.put(WsAttr.USER, 1); attributes.put(WsAttr.USER, 1);
// if (user == null){ // if (user == null){
// return false; // return false;
// response.setStatusCode(HttpStatus.MULTI_STATUS);
// } // }
// HttpSessionHandshakeInterceptor
return true; return true;
} }

View File

@@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>orion-ops-server</artifactId> <artifactId>orion-ops-launch</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>后端服务主项目容器 按需引用 orion-ops-module-xxx 依赖</description> <description>后端服务主项目容器 按需引用 orion-ops-module-xxx 依赖</description>

View File

@@ -1,4 +1,4 @@
package com.orion.ops.server; package com.orion.ops.launch;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -10,11 +10,11 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
* @version 1.0.0 * @version 1.0.0
* @since 2023/6/19 16:55 * @since 2023/6/19 16:55
*/ */
@SpringBootApplication(scanBasePackages = {"com.orion.ops.server", "com.orion.ops.module"}) @SpringBootApplication(scanBasePackages = {"com.orion.ops.launch", "com.orion.ops.module"})
public class OrionOpsApplication { public class LaunchApplication {
public static void main(String[] args) { public static void main(String[] args) {
new SpringApplicationBuilder(OrionOpsApplication.class).run(args); new SpringApplicationBuilder(LaunchApplication.class).run(args);
} }
} }

View File

@@ -1,4 +1,4 @@
package com.orion.ops.server.config; package com.orion.ops.launch.config;
import com.orion.spring.SpringHolder; import com.orion.spring.SpringHolder;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;

View File

@@ -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 com.orion.ops.framework.common.annotation.RestWrapper;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;

View File

@@ -3,7 +3,7 @@ server:
spring: spring:
application: application:
name: orion-ops-server name: orion-ops-launch
profiles: profiles:
active: dev active: dev
main: main:

View File

@@ -16,7 +16,7 @@
<modules> <modules>
<module>orion-ops-dependencies</module> <module>orion-ops-dependencies</module>
<module>orion-ops-framework</module> <module>orion-ops-framework</module>
<module>orion-ops-server</module> <module>orion-ops-launch</module>
</modules> </modules>
<properties> <properties>