diff --git a/pqs-prepare/event-prepare/pom.xml b/pqs-prepare/event-prepare/pom.xml new file mode 100644 index 000000000..3ccbca8e1 --- /dev/null +++ b/pqs-prepare/event-prepare/pom.xml @@ -0,0 +1,63 @@ + + + + pqs-prepare + com.njcn + 1.0.0 + + 4.0.0 + event-prepare + jar + 暂态预处理模块 + + 8 + 8 + + + + + com.njcn + user-api + ${project.version} + + + com.njcn + event-api + ${project.version} + + + com.njcn + common-core + ${project.version} + + + com.njcn + common-influxDB + ${project.version} + compile + + + com.njcn + common-web + ${project.version} + + + com.njcn + common-swagger + ${project.version} + + + com.njcn + common-microservice + ${project.version} + + + com.njcn + common-redis + ${project.version} + + + + \ No newline at end of file diff --git a/pqs-prepare/src/main/java/com/njcn/prepare/PrepareApplication.java b/pqs-prepare/event-prepare/src/main/java/com/njcn/prepare/event/PrepareEventApplication.java similarity index 76% rename from pqs-prepare/src/main/java/com/njcn/prepare/PrepareApplication.java rename to pqs-prepare/event-prepare/src/main/java/com/njcn/prepare/event/PrepareEventApplication.java index dae94963f..8bafb6103 100644 --- a/pqs-prepare/src/main/java/com/njcn/prepare/PrepareApplication.java +++ b/pqs-prepare/event-prepare/src/main/java/com/njcn/prepare/event/PrepareEventApplication.java @@ -1,4 +1,4 @@ -package com.njcn.prepare; +package com.njcn.prepare.event; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; @@ -12,13 +12,12 @@ import org.springframework.cloud.openfeign.EnableFeignClients; * @date 2021年12月14日 20:33 */ @Slf4j -@MapperScan("com.njcn.**.mapper") @EnableFeignClients(basePackages = "com.njcn") @SpringBootApplication(scanBasePackages = "com.njcn") -public class PrepareApplication { +public class PrepareEventApplication { public static void main(String[] args) { - SpringApplication.run(PrepareApplication.class,args); + SpringApplication.run(PrepareEventApplication.class,args); } } diff --git a/pqs-prepare/src/main/resources/bootstrap.yml b/pqs-prepare/event-prepare/src/main/resources/bootstrap.yml similarity index 100% rename from pqs-prepare/src/main/resources/bootstrap.yml rename to pqs-prepare/event-prepare/src/main/resources/bootstrap.yml diff --git a/pqs-prepare/harmonic-prepare/pom.xml b/pqs-prepare/harmonic-prepare/pom.xml new file mode 100644 index 000000000..0a820908f --- /dev/null +++ b/pqs-prepare/harmonic-prepare/pom.xml @@ -0,0 +1,65 @@ + + + + pqs-prepare + com.njcn + 1.0.0 + + 4.0.0 + harmonic-prepare + jar + 稳态预处理模块 + + 8 + 8 + + + + + + com.njcn + user-api + ${project.version} + + + com.njcn + common-core + ${project.version} + + + com.njcn + harmonic-api + ${project.version} + compile + + + com.njcn + common-influxDB + ${project.version} + compile + + + com.njcn + common-web + ${project.version} + + + com.njcn + common-swagger + ${project.version} + + + com.njcn + common-microservice + ${project.version} + + + com.njcn + common-redis + ${project.version} + + + + \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/PrepareHarmonicApplication.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/PrepareHarmonicApplication.java new file mode 100644 index 000000000..92834c31e --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/PrepareHarmonicApplication.java @@ -0,0 +1,23 @@ +package com.njcn.prepare.harmonic; + +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; + +/** + * @author hongawen + * @version 1.0.0 + * @date 2021年12月14日 20:33 + */ +@Slf4j +@EnableFeignClients(basePackages = "com.njcn") +@SpringBootApplication(scanBasePackages = "com.njcn") +public class PrepareHarmonicApplication { + + public static void main(String[] args) { + SpringApplication.run(PrepareHarmonicApplication.class,args); + } + +} diff --git a/pqs-prepare/harmonic-prepare/src/main/resources/bootstrap.yml b/pqs-prepare/harmonic-prepare/src/main/resources/bootstrap.yml new file mode 100644 index 000000000..1da0f78b0 --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/resources/bootstrap.yml @@ -0,0 +1,53 @@ +#当前服务的基本信息 +microservice: + ename: @artifactId@ + name: '@name@' + version: @version@ + sentinel: + url: @sentinel.url@ + gateway: + url: @gateway.url@ +server: + port: 10221 +#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 + + +#项目日志的配置 +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.user.pojo + +mqtt: + client-id: @artifactId@${random.value} diff --git a/pqs-prepare/pom.xml b/pqs-prepare/pom.xml index 5dd7a1903..405f5e01c 100644 --- a/pqs-prepare/pom.xml +++ b/pqs-prepare/pom.xml @@ -9,67 +9,16 @@ 4.0.0 pqs-prepare + pom 预处理模块 + + event-prepare + harmonic-prepare + 8 8 - - - com.njcn - user-api - ${project.version} - - - com.njcn - common-core - ${project.version} - - - com.njcn - harmonic-api - ${project.version} - compile - - - com.njcn - common-influxDB - ${project.version} - compile - - - com.njcn - energy-api - ${project.version} - compile - - - com.njcn - common-web - ${project.version} - - - com.njcn - common-swagger - ${project.version} - - - com.njcn - common-microservice - ${project.version} - - - com.njcn - common-db - ${project.version} - - - com.njcn - common-redis - ${project.version} - - - \ No newline at end of file