增加了模块的内容,后面可能会变,项目迁移时候test模块存在一点点问题,正在解决

This commit is contained in:
mianbin 2025-04-17 20:39:42 +08:00
parent 3f1f4a3268
commit 4221869ba3
18 changed files with 339 additions and 74 deletions

2
.gitignore vendored
View File

@ -41,3 +41,5 @@ target/
.vscode/!/.xcodemap/ .vscode/!/.xcodemap/
!/.idea/ !/.idea/
/.idea/ /.idea/
/.idea/
/.xcodemap/

File diff suppressed because one or more lines are too long

77
.idea/compiler.xml generated
View File

@ -18,85 +18,47 @@
<entry name="$MAVEN_REPOSITORY$/org/mapstruct/mapstruct-processor/1.6.2/mapstruct-processor-1.6.2.jar" /> <entry name="$MAVEN_REPOSITORY$/org/mapstruct/mapstruct-processor/1.6.2/mapstruct-processor-1.6.2.jar" />
<entry name="$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.6.2/mapstruct-1.6.2.jar" /> <entry name="$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.6.2/mapstruct-1.6.2.jar" />
</processorPath> </processorPath>
<module name="module-infra-api" />
<module name="spring-boot-starter-protection" /> <module name="spring-boot-starter-protection" />
<module name="spring-boot-starter-monitor" /> <module name="spring-boot-starter-monitor" />
<module name="module-system-biz" /> <module name="module-system-biz" />
<module name="module-system-api" />
<module name="spring-boot-starter-mq" />
<module name="spring-boot-starter-mongo" />
<module name="module-ci-flow" />
<module name="commons" />
<module name="spring-boot-starter-plugin" />
<module name="module-ci-engine" />
<module name="ops-server" />
<module name="spring-boot-starter-biz-data-permission" />
<module name="spring-boot-starter-mybatis" />
<module name="module-infra-api" />
<module name="spring-boot-starter-test" /> <module name="spring-boot-starter-test" />
<module name="spring-boot-starter-websocket" /> <module name="spring-boot-starter-websocket" />
<module name="system-plugin-example-web" /> <module name="system-plugin-example-web" />
<module name="module-system-api" />
<module name="spring-boot-starter-biz-ip" /> <module name="spring-boot-starter-biz-ip" />
<module name="module-infra-biz" /> <module name="module-infra-biz" />
<module name="spring-boot-starter-mq" /> <module name="module-ci-commons" />
<module name="spring-boot-starter-job" /> <module name="spring-boot-starter-job" />
<module name="spring-boot-starter-mongo" /> <module name="module-ci-store" />
<module name="commons" />
<module name="spring-boot-starter-web" /> <module name="spring-boot-starter-web" />
<module name="spring-boot-starter-plugin" /> <module name="module-ci-plugin" />
<module name="spring-boot-starter-excel" /> <module name="spring-boot-starter-excel" />
<module name="ops-server" />
<module name="spring-boot-starter-biz-tenant" /> <module name="spring-boot-starter-biz-tenant" />
<module name="spring-boot-starter-biz-data-permission" />
<module name="spring-boot-starter-redis" /> <module name="spring-boot-starter-redis" />
<module name="spring-boot-starter-security" /> <module name="spring-boot-starter-security" />
<module name="spring-boot-starter-mybatis" />
</profile> </profile>
</annotationProcessing> </annotationProcessing>
<bytecodeTargetLevel>
<module name="ci-common" target="17" />
<module name="ci-common-pipeline" target="17" />
<module name="ci-common-public" target="17" />
<module name="common-pipeline" target="17" />
<module name="common-public" target="17" />
<module name="module-ci-common" target="17" />
<module name="module-ci-common-pipeline" target="17" />
<module name="module-ci-commons" target="17" />
<module name="module-ci-dispatch-api" target="17" />
<module name="module-ci-environment" target="17" />
<module name="module-ci-event" target="17" />
<module name="module-ci-log" target="17" />
<module name="module-ci-market" target="17" />
<module name="module-ci-process-api" target="17" />
<module name="module-ci-process-biz" target="17" />
<module name="module-ci-project" target="17" />
<module name="module-ci-quality" target="17" />
<module name="module-ci-repository" target="17" />
<module name="module-ci-store-api" target="17" />
<module name="module-ci-ticket" target="17" />
<module name="module-ci-worker" target="17" />
<module name="pipeline-ci-api" target="17" />
<module name="pipeline-ci-common" target="17" />
<module name="pipeline-ci-process-api" target="17" />
<module name="pipline-ci-common" target="17" />
</bytecodeTargetLevel>
</component> </component>
<component name="JavacSettings"> <component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE"> <option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="app-plugins" options="-parameters" /> <module name="app-plugins" options="-parameters" />
<module name="ci-common" options="-parameters" />
<module name="ci-common-pipeline" options="-parameters" />
<module name="ci-common-public" options="-parameters" />
<module name="common-pipeline" options="-parameters" />
<module name="common-public" options="-parameters" />
<module name="commons" options="-parameters" /> <module name="commons" options="-parameters" />
<module name="framework" options="-parameters" /> <module name="framework" options="-parameters" />
<module name="module-ci-common" options="-parameters" />
<module name="module-ci-common-pipeline" options="-parameters" />
<module name="module-ci-commons" options="-parameters" /> <module name="module-ci-commons" options="-parameters" />
<module name="module-ci-dispatch-api" options="-parameters" /> <module name="module-ci-engine" options="-parameters" />
<module name="module-ci-environment" options="-parameters" /> <module name="module-ci-flow" options="-parameters" />
<module name="module-ci-event" options="-parameters" /> <module name="module-ci-plugin" options="-parameters" />
<module name="module-ci-log" options="-parameters" /> <module name="module-ci-store" options="-parameters" />
<module name="module-ci-market" options="-parameters" />
<module name="module-ci-process-api" options="-parameters" />
<module name="module-ci-process-biz" options="-parameters" />
<module name="module-ci-project" options="-parameters" />
<module name="module-ci-quality" options="-parameters" />
<module name="module-ci-repository" options="-parameters" />
<module name="module-ci-store-api" options="-parameters" />
<module name="module-ci-ticket" options="-parameters" />
<module name="module-ci-worker" options="-parameters" />
<module name="module-infra-api" options="-parameters" /> <module name="module-infra-api" options="-parameters" />
<module name="module-infra-biz" options="-parameters" /> <module name="module-infra-biz" options="-parameters" />
<module name="module-system-api" options="-parameters" /> <module name="module-system-api" options="-parameters" />
@ -104,9 +66,6 @@
<module name="modules" options="-parameters" /> <module name="modules" options="-parameters" />
<module name="ops-pro" options="-parameters" /> <module name="ops-pro" options="-parameters" />
<module name="ops-server" options="-parameters" /> <module name="ops-server" options="-parameters" />
<module name="pipeline-ci-api" options="-parameters" />
<module name="pipeline-ci-process-api" options="-parameters" />
<module name="pipline-ci-common" options="-parameters" />
<module name="spring-boot-starter-biz-data-permission" options="-parameters" /> <module name="spring-boot-starter-biz-data-permission" options="-parameters" />
<module name="spring-boot-starter-biz-ip" options="-parameters" /> <module name="spring-boot-starter-biz-ip" options="-parameters" />
<module name="spring-boot-starter-biz-tenant" options="-parameters" /> <module name="spring-boot-starter-biz-tenant" options="-parameters" />

8
.idea/encodings.xml generated
View File

@ -55,14 +55,20 @@
<file url="file://$PROJECT_DIR$/modules/module-ci-commons/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-commons/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-dispatch-api/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-dispatch-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-dispatch-api/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-dispatch-api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-engine/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-engine/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-environment/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-environment/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-environment/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-environment/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-event/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-event/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-event/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-event/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-flow/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-flow/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-log/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-log/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-log/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-log/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-market/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-market/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-market/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-market/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-plugin/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-plugin/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-process-api/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-process-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-process-api/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-process-api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-process-biz/pipeline-ci-common/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-process-biz/pipeline-ci-common/src/main/java" charset="UTF-8" />
@ -79,6 +85,8 @@
<file url="file://$PROJECT_DIR$/modules/module-ci-repository/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-repository/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-store-api/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-store-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-store-api/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-store-api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-store/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-store/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-ticket/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-ticket/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-ticket/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-ticket/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/modules/module-ci-worker/src/main/java" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/modules/module-ci-worker/src/main/java" charset="UTF-8" />

1
.idea/misc.xml generated
View File

@ -61,7 +61,6 @@
<option value="$PROJECT_DIR$/modules/module-ci-commons/ci-common-pipeline/pom.xml" /> <option value="$PROJECT_DIR$/modules/module-ci-commons/ci-common-pipeline/pom.xml" />
<option value="$PROJECT_DIR$/modules/module-ci-commons/ci-common-public/pom.xml" /> <option value="$PROJECT_DIR$/modules/module-ci-commons/ci-common-public/pom.xml" />
<option value="$PROJECT_DIR$/modules/module-ci-commons/ci-common/pom.xml" /> <option value="$PROJECT_DIR$/modules/module-ci-commons/ci-common/pom.xml" />
<option value="$PROJECT_DIR$/modules/module-ci-commons/pom.xml" />
<option value="$PROJECT_DIR$/modules/module-ci-dispatch-api/pom.xml" /> <option value="$PROJECT_DIR$/modules/module-ci-dispatch-api/pom.xml" />
<option value="$PROJECT_DIR$/modules/module-ci-environment/pom.xml" /> <option value="$PROJECT_DIR$/modules/module-ci-environment/pom.xml" />
<option value="$PROJECT_DIR$/modules/module-ci-event/pom.xml" /> <option value="$PROJECT_DIR$/modules/module-ci-event/pom.xml" />

16
dependencies/pom.xml vendored
View File

@ -85,8 +85,6 @@
<commons-exec.version>1.4.0</commons-exec.version> <commons-exec.version>1.4.0</commons-exec.version>
<dd-plist.version>1.28</dd-plist.version> <dd-plist.version>1.28</dd-plist.version>
<apk-parser.version>2.6.10</apk-parser.version> <apk-parser.version>2.6.10</apk-parser.version>
<logback-core.version>1.2.11</logback-core.version>
<logback-classic.version>1.2.11</logback-classic.version>
<caffeine.version>2.9.3</caffeine.version> <caffeine.version>2.9.3</caffeine.version>
<resilience4j-circuitbreaker.version>2.3.0</resilience4j-circuitbreaker.version> <resilience4j-circuitbreaker.version>2.3.0</resilience4j-circuitbreaker.version>
@ -654,23 +652,13 @@
<version>${apk-parser.version}</version> <version>${apk-parser.version}</version>
<!-- <version></version>--> <!-- <version></version>-->
</dependency> </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback-core.version}</version>
<!-- <version>1</version>-->
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback-classic.version}</version>
<!-- <version></version>-->
</dependency>
<dependency> <dependency>
<groupId>com.github.ben-manes.caffeine</groupId> <groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId> <artifactId>caffeine</artifactId>
<version>${caffeine.version}</version> <version>${caffeine.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.github.resilience4j</groupId> <groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-circuitbreaker</artifactId> <artifactId>resilience4j-circuitbreaker</artifactId>

View File

@ -1,6 +1,9 @@
package cd.casic.framework.mq.rabbitmq.config; package cd.casic.framework.mq.rabbitmq.config;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
import org.springframework.amqp.rabbit.connection.CorrelationData;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.amqp.support.converter.MessageConverter;
import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfiguration;
@ -25,4 +28,23 @@ public class OpsRabbitMQAutoConfiguration {
return new Jackson2JsonMessageConverter(); return new Jackson2JsonMessageConverter();
} }
/**
* 这里我这样写默认租户的信息不通过socket 发送rabbitmq处理流水线相关的消息因为具有回调
*
* @param connectionFactory
* @return
*/
@Bean
public RabbitTemplate rabbitTemplate(CachingConnectionFactory connectionFactory) {
RabbitTemplate rabbitTemplate = new RabbitTemplate(connectionFactory);
rabbitTemplate.setMessageConverter(createMessageConverter());
rabbitTemplate.setConfirmCallback(new RabbitTemplate.ConfirmCallback() {
@Override
public void confirm(CorrelationData correlationData, boolean ack, String cause) {
log.debug("收到消息发送异步确认, 消息ID:{}, ack:{}, cause:{}", correlationData.getId(), ack, cause);
}
});
return rabbitTemplate;
}
} }

View File

@ -0,0 +1,12 @@
import cd.casic.framework.test.core.ut.BaseRedisUnitTest;
import org.junit.jupiter.api.Test;
public class IsRightTest extends BaseRedisUnitTest {
@Test
public void testCreateDept() {
// 准备参数
System.out.println("----------");
}
}

View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cd.casic.boot</groupId>
<artifactId>modules</artifactId>
<version>${revision}</version>
</parent>
<packaging>jar</packaging>
<version>${revision}</version>
<name>${project.artifactId}</name>
<artifactId>module-ci-commons</artifactId>
<dependencies>
<dependency>
<groupId>cd.casic.boot</groupId>
<artifactId>commons</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -0,0 +1 @@
package cd.casic.ci.commons.bean;

View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cd.casic.boot</groupId>
<artifactId>modules</artifactId>
<version>${revision}</version>
</parent>
<artifactId>module-ci-engine</artifactId>
<packaging>jar</packaging>
<version>${revision}</version>
<name>${project.artifactId}</name>
<dependencies>
<dependency>
<groupId>cd.casic.boot</groupId>
<artifactId>commons</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cd.casic.boot</groupId>
<artifactId>modules</artifactId>
<version>${revision}</version>
</parent>
<artifactId>module-ci-flow</artifactId>
<packaging>jar</packaging>
<version>${revision}</version>
<name>${project.artifactId}</name>
<dependencies>
<dependency>
<groupId>cd.casic.boot</groupId>
<artifactId>commons</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -0,0 +1,7 @@
package cd.casic.ci.flow;
public class Main {
public static void main(String[] args) {
System.out.println("Hello world!");
}
}

View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cd.casic.boot</groupId>
<artifactId>modules</artifactId>
<version>${revision}</version>
</parent>
<artifactId>module-ci-plugin</artifactId>
<packaging>jar</packaging>
<version>${revision}</version>
<name>${project.artifactId}</name>
<dependencies>
<dependency>
<groupId>cd.casic.boot</groupId>
<artifactId>commons</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -0,0 +1,7 @@
package cd.casic.ci.plugin;
public class Main {
public static void main(String[] args) {
System.out.println("Hello world!");
}
}

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>cd.casic.boot</groupId>
<artifactId>modules</artifactId>
<version>${revision}</version>
</parent>
<artifactId>module-ci-store</artifactId>
<packaging>jar</packaging>
<version>${revision}</version>
<name>${project.artifactId}</name>
<dependencies>
<dependency>
<groupId>cd.casic.boot</groupId>
<artifactId>commons</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -0,0 +1,7 @@
package cd.casic.ci.store;
public class Main {
public static void main(String[] args) {
System.out.println("Hello world!");
}
}

View File

@ -17,6 +17,11 @@
<module>system-framework</module> <module>system-framework</module>
<module>app-plugins</module> <module>app-plugins</module>
<module>ops-server</module> <module>ops-server</module>
<module>modules/module-ci-commons</module>
<module>modules/module-ci-plugin</module>
<module>modules/module-ci-engine</module>
<module>modules/module-ci-flow</module>
<module>modules/module-ci-store</module>
</modules> </modules>
<description> <description>