From 94254f614f52a9b94505bb992a70b84331245e1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Thu, 10 Nov 2022 18:30:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=80=E6=9C=AF=E7=9B=91?= =?UTF-8?q?=E7=9D=A3=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + .../swagger/config/Knife4jSwaggerConfig.java | 4 +- pqs-gateway/src/main/resources/bootstrap.yml | 9 ++ pqs-process/pom.xml | 20 +++ pqs-process/process-api/pom.xml | 64 +++++++++ pqs-process/process-boot/pom.xml | 130 ++++++++++++++++++ .../com/njcn/process/ProcessApplication.java | 25 ++++ .../src/main/resources/bootstrap.yml | 60 ++++++++ .../njcn/process/ProcessApplicationTest.java | 22 +++ 9 files changed, 334 insertions(+), 1 deletion(-) create mode 100644 pqs-process/pom.xml create mode 100644 pqs-process/process-api/pom.xml create mode 100644 pqs-process/process-boot/pom.xml create mode 100644 pqs-process/process-boot/src/main/java/com/njcn/process/ProcessApplication.java create mode 100644 pqs-process/process-boot/src/main/resources/bootstrap.yml create mode 100644 pqs-process/process-boot/src/test/java/com/njcn/process/ProcessApplicationTest.java diff --git a/pom.xml b/pom.xml index c99be161f..f1fd32cd0 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,7 @@ pqs-quality pqs-advance pqs-prepare + pqs-process pom 灿能微服务生态系统 diff --git a/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java b/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java index e138686e5..547d96516 100644 --- a/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java +++ b/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java @@ -62,7 +62,9 @@ public class Knife4jSwaggerConfig { "com.njcn.harmonic.controller", "com.njcn.event.controller", "com.njcn.energy.controller", - "com.njcn.quality.controller") + "com.njcn.quality.controller", + "com.njcn.process.controller" + ) .collect(Collectors.toList()); List grantTypes = new ArrayList<>(); String passwordTokenUrl = "http://" + gatewayUrl + "/pqs-auth/oauth/token"; diff --git a/pqs-gateway/src/main/resources/bootstrap.yml b/pqs-gateway/src/main/resources/bootstrap.yml index 0b18ea50c..17ea7c0fb 100644 --- a/pqs-gateway/src/main/resources/bootstrap.yml +++ b/pqs-gateway/src/main/resources/bootstrap.yml @@ -110,6 +110,14 @@ spring: - SwaggerHeaderFilter - StripPrefix=1 + - id: process-boot + uri: lb://process-boot + predicates: + - Path=/process-boot/** + filters: + - SwaggerHeaderFilter + - StripPrefix=1 + #项目日志的配置 logging: config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml @@ -139,6 +147,7 @@ whitelist: - /event-boot/** - /quality-boot/** - /harmonic-prepare/** + - /process-boot/** mqtt: diff --git a/pqs-process/pom.xml b/pqs-process/pom.xml new file mode 100644 index 000000000..1cfb38469 --- /dev/null +++ b/pqs-process/pom.xml @@ -0,0 +1,20 @@ + + + + pqs + com.njcn + 1.0.0 + + + 4.0.0 + pqs-process + 技术监督管理 + + + process-api + process-boot + + pom + + diff --git a/pqs-process/process-api/pom.xml b/pqs-process/process-api/pom.xml new file mode 100644 index 000000000..cef078f3b --- /dev/null +++ b/pqs-process/process-api/pom.xml @@ -0,0 +1,64 @@ + + + + pqs-process + com.njcn + 1.0.0 + + + 4.0.0 + 技术监督管理 + process-api + + + 8 + 8 + + + + + com.njcn + common-core + ${project.version} + + + com.njcn + common-db + ${project.version} + + + com.njcn + common-microservice + ${project.version} + + + com.njcn + common-poi + ${project.version} + + + com.njcn + pms-device-api + ${project.version} + + + org.influxdb + influxdb-java + + + com.njcn + pq-device-api + 1.0.0 + compile + + + + com.github.jeffreyning + mybatisplus-plus + 1.5.1-RELEASE + compile + + + diff --git a/pqs-process/process-boot/pom.xml b/pqs-process/process-boot/pom.xml new file mode 100644 index 000000000..b83816598 --- /dev/null +++ b/pqs-process/process-boot/pom.xml @@ -0,0 +1,130 @@ + + + + pqs-process + com.njcn + 1.0.0 + + 4.0.0 + 技术监督管理模块 + process-boot + + + + 8 + 8 + + + + + + com.njcn + prepare-api + ${project.version} + + + com.njcn + common-web + ${project.version} + + + com.njcn + common-swagger + ${project.version} + + + com.njcn + common-influxDB + ${project.version} + compile + + + com.njcn + pq-device-api + ${project.version} + + + com.njcn + system-api + ${project.version} + + + com.njcn + user-api + ${project.version} + + + com.njcn + event-api + ${project.version} + + + com.njcn + common-minio + ${project.version} + + + + + processboot + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + -Xlint:unchecked + + + + org.springframework.boot + spring-boot-maven-plugin + + + package + + repackage + + + + + + + com.spotify + docker-maven-plugin + 1.0.0 + + + build-image + ${docker.operate} + + build + + + + + + http://${docker.repostory} + + ${docker.repostory}/${docker.registry.name}/${project.artifactId} + + latest + + ${docker.url} + ${basedir}/ + + + /ROOT + ${project.build.directory} + ${project.build.finalName}.jar + + + + + + + + + diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/ProcessApplication.java b/pqs-process/process-boot/src/main/java/com/njcn/process/ProcessApplication.java new file mode 100644 index 000000000..494de5864 --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/ProcessApplication.java @@ -0,0 +1,25 @@ +package com.njcn.process; + +import lombok.extern.slf4j.Slf4j; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * pqs + * + * @author cdf + * @date 2022/11/10 + */ +@Slf4j +@MapperScan("com.njcn.**.mapper") +@EnableFeignClients(basePackages = "com.njcn") +@SpringBootApplication(scanBasePackages = "com.njcn") +public class ProcessApplication { + + public static void main(String[] args) { + SpringApplication.run(ProcessApplication.class, args); + } + +} diff --git a/pqs-process/process-boot/src/main/resources/bootstrap.yml b/pqs-process/process-boot/src/main/resources/bootstrap.yml new file mode 100644 index 000000000..61a5f15e8 --- /dev/null +++ b/pqs-process/process-boot/src/main/resources/bootstrap.yml @@ -0,0 +1,60 @@ +#当前服务的基本信息 +microservice: + ename: @artifactId@ + name: '@name@' + version: @version@ + sentinel: + url: @sentinel.url@ + gateway: + url: @gateway.url@ +server: + port: 10222 +#feign接口开启服务熔断降级处理 +feign: + sentinel: + enabled: true +spring: + application: + name: @artifactId@ + #nacos注册中心以及配置中心的指定 + cloud: + nacos: + discovery: + ip: @service.server.url@ + server-addr: @nacos.url@ + namespace: @nacos.namespace@ + config: + server-addr: @nacos.url@ + namespace: @nacos.namespace@ + file-extension: yaml + shared-configs: + - data-id: share-config.yaml + refresh: true + - data-Id: share-config-datasource-db.yaml + refresh: true + main: + allow-bean-definition-overriding: true + servlet: + multipart: + max-file-size: 100MB + max-request-size: 100MB + + +#项目日志的配置 +logging: + config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml + level: + root: info + + +#mybatis配置信息 +mybatis-plus: + type-aliases-package: com.njcn.process.pojo + + +mqtt: + client-id: @artifactId@${random.value} + + + + diff --git a/pqs-process/process-boot/src/test/java/com/njcn/process/ProcessApplicationTest.java b/pqs-process/process-boot/src/test/java/com/njcn/process/ProcessApplicationTest.java new file mode 100644 index 000000000..98de78d76 --- /dev/null +++ b/pqs-process/process-boot/src/test/java/com/njcn/process/ProcessApplicationTest.java @@ -0,0 +1,22 @@ +package com.njcn.process; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +/** + * pqs + * + * @author cdf + * @date 2022/11/10 + */ +@RunWith(SpringRunner.class) +@SpringBootTest +public class ProcessApplicationTest { + + @Test + public void test1(){ + + } +}