diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 3a7333fb..1733bd57 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -331,6 +331,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -339,7 +363,6 @@ - @@ -368,6 +391,7 @@ + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 85aa9669..533805d3 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -101,6 +101,8 @@ + + diff --git a/dependencies/.flattened-pom.xml b/dependencies/.flattened-pom.xml index 6efd46b9..fa311514 100644 --- a/dependencies/.flattened-pom.xml +++ b/dependencies/.flattened-pom.xml @@ -197,6 +197,16 @@ module-system-biz ${revision} + + cd.casic.boot + module-ci-process-api + ${revision} + + + cd.casic.boot + module-ci-process-biz + ${revision} + cd.casic.boot module-ci-commons diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 1b34c452..5f9e9155 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -220,6 +220,17 @@ module-system-biz ${revision} + + cd.casic.boot + module-ci-process-api + ${revision} + + + cd.casic.boot + module-ci-process-biz + ${revision} + + diff --git a/modules/module-ci-process-api/pom.xml b/modules/module-ci-process-api/pom.xml new file mode 100644 index 00000000..1ab93012 --- /dev/null +++ b/modules/module-ci-process-api/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + cd.casic.boot + modules + ${revision} + + + module-ci-process-api + + + + cd.casic.boot + module-ci-commons + + + + \ No newline at end of file diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/ssh/WinRMHelper.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/ssh/WinRMHelper.java index 14fa8560..6908eede 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/ssh/WinRMHelper.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/ssh/WinRMHelper.java @@ -126,43 +126,4 @@ public class WinRMHelper { } return builder.toString(); } - - public static void main(String[] args) throws IOException { -// WinRMHelper exec = new WinRMHelper("192.168.0.88", "hrb", "1qaz!QAZ"); -// List commands = new ArrayList<>(); -//// commands.add("powershell"); -// commands.add("dir"); -// commands.add("cd /d D:\\Users\\hrb\\Desktop"); -// commands.add("dir"); -// commands.add("git clone -b master http://192.168.0.12:3000/liuyuchao/testrepo.git"); -//// commands.add("rmdir /s /q 456123"); -// -// int resp = exec.execute(commands, System.out::println); -// System.out.println(resp); - PipedWriter writer = new PipedWriter(); - PipedReader reader = new PipedReader(writer); - - Thread t = new Thread(() -> { - try { - for (int i = 0; i < 10; i++) { - writer.write("Line " + i + "\n"); - writer.flush(); - Thread.sleep(500); - } - writer.close(); - } catch (Exception e) { - e.printStackTrace(); - } - }); - t.start(); - - try (BufferedReader br = new BufferedReader(reader)) { - String line; - while ((line = br.readLine()) != null) { - System.out.println(line); - } - } catch (Exception e) { - e.printStackTrace(); - } - } } diff --git a/modules/pom.xml b/modules/pom.xml index c6b28aba..8452406c 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -15,9 +15,10 @@ module-infra-biz module-system-api module-system-biz - module-ci-process-biz module-ci-repository module-ci-execute + module-ci-process-api + module-ci-process-biz modules diff --git a/ops-server/pom.xml b/ops-server/pom.xml index a47f910c..c6b96c55 100644 --- a/ops-server/pom.xml +++ b/ops-server/pom.xml @@ -47,7 +47,6 @@ cd.casic.boot module-ci-process-biz - 2.0.0-jdk17 diff --git a/ops-server/src/main/resources/application-local.yaml b/ops-server/src/main/resources/application-local.yaml index 2237153b..76a240b0 100644 --- a/ops-server/src/main/resources/application-local.yaml +++ b/ops-server/src/main/resources/application-local.yaml @@ -45,7 +45,7 @@ spring: primary: master datasource: master: - url: jdbc:mysql://1.14.125.6:13306/ops-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://1.14.125.6:13306/ops-pro-temp?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 @@ -63,7 +63,7 @@ spring: # password: Yudao@2024 # OpenGauss 连接的示例 slave: # 模拟从库，可根据自己需要修改 lazy: true # 开启懒加载，保证启动速度 - url: jdbc:mysql://1.14.125.6:13306/ops-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://1.14.125.6:13306/ops-pro-temp?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true username: root password: 1qaz!QAZ diff --git a/ops-ui/pom.xml b/ops-ui/pom.xml new file mode 100644 index 00000000..64742568 --- /dev/null +++ b/ops-ui/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + ops-pro + cd.casic.boot + ${revision} + ../pom.xml + + + cd.casic.boot + ops-ui + ${project.artifactId} + + + + 17 + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.7 + + + org.apache.maven.shared + maven-filtering + 1.3 + + + + + + + \ No newline at end of file diff --git a/ops-ui/src/main/java/cd/casic/ops/ui/StaticUiApplication.java b/ops-ui/src/main/java/cd/casic/ops/ui/StaticUiApplication.java new file mode 100644 index 00000000..b2316dd1 --- /dev/null +++ b/ops-ui/src/main/java/cd/casic/ops/ui/StaticUiApplication.java @@ -0,0 +1,17 @@ +package cd.casic.ops.ui; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @description: 启动类 + * @author: mianbin + * @date: 2025/5/31 0:19 + * @version: 1.0 + */ +@SpringBootApplication +public class StaticUiApplication { + public static void main(String[] args) { + SpringApplication.run(StaticUiApplication.class, args); + } +} diff --git a/ops-ui/src/main/java/cd/casic/ops/ui/UiConfig.java b/ops-ui/src/main/java/cd/casic/ops/ui/UiConfig.java new file mode 100644 index 00000000..fe7bd523 --- /dev/null +++ b/ops-ui/src/main/java/cd/casic/ops/ui/UiConfig.java @@ -0,0 +1,46 @@ +package cd.casic.ops.ui; + +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * @description: 不想弄nginx配置，直接启动 + * @author: mianbin + * @date: 2025/5/31 0:19 + * @version: 1.0 + */ +@Configuration(proxyBeanMethods = false) +public class UiConfig implements WebMvcConfigurer { + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + // 管理后台 Ops 的配置 + registry.addResourceHandler("/yudao/**", "/yudao/", "/yudao") + .addResourceLocations("classpath:/yudao/") + .addResourceLocations(new ClassPathResource("/yudao/index.html") { + + @Override + public Resource createRelative(String relativePath) { + return this; + } + + }) + ; + } + + @Component + public static class UiApplicationRunner implements ApplicationRunner { + + @Override + public void run(ApplicationArguments args) throws Exception { + System.out.println("Ops 项目 无服务启动版：http://127.0.0.1:4096/casic/"); + } + + } +} diff --git a/ops-ui/src/main/resources/application.properties b/ops-ui/src/main/resources/application.properties new file mode 100644 index 00000000..c0095ac9 --- /dev/null +++ b/ops-ui/src/main/resources/application.properties @@ -0,0 +1,3 @@ +spring.application.name=static-ui +spring.web.resources.static-locations=classpath:/yudao/** +server.port=4096 \ No newline at end of file diff --git a/pom.xml b/pom.xml index ec8d324f..fec814e1 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ system-framework app-plugins ops-server + ops-ui