diff --git a/pom.xml b/pom.xml
index de2d78146..adff767d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
pqs-job/job-api
pqs-quality
pqs-advance
+ pqs-prepare
pom
灿能微服务生态系统
@@ -40,24 +41,26 @@
192.168.1.13
- 192.168.1.111
+ 192.168.1.22
+
+ 192.168.1.22
${middle.server.url}:18848
-
- fd74182b-1fce-4dba-afa7-2623b0376205
+
+ f6df4a49-39cb-4355-a8fd-8aeb0c537eb1
${middle.server.url}:8080
${service.server.url}:10215
- http://192.168.1.13:2375
+ http://${docker.server.url}:2375
- 192.168.1.13:8090
+ ${docker.server.url}:8090
njcn
- deploy
+ site
1.8
8
8
diff --git a/pqs-advance/advance-boot/pom.xml b/pqs-advance/advance-boot/pom.xml
index 7ed6a62a1..65c9b603b 100644
--- a/pqs-advance/advance-boot/pom.xml
+++ b/pqs-advance/advance-boot/pom.xml
@@ -80,44 +80,44 @@
-
- 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-prepare/pom.xml b/pqs-prepare/pom.xml
new file mode 100644
index 000000000..5dd7a1903
--- /dev/null
+++ b/pqs-prepare/pom.xml
@@ -0,0 +1,75 @@
+
+
+
+ pqs
+ com.njcn
+ 1.0.0
+
+ 4.0.0
+ pqs-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
diff --git a/pqs-prepare/src/main/java/com/njcn/prepare/PrepareApplication.java b/pqs-prepare/src/main/java/com/njcn/prepare/PrepareApplication.java
new file mode 100644
index 000000000..dae94963f
--- /dev/null
+++ b/pqs-prepare/src/main/java/com/njcn/prepare/PrepareApplication.java
@@ -0,0 +1,24 @@
+package com.njcn.prepare;
+
+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
+@MapperScan("com.njcn.**.mapper")
+@EnableFeignClients(basePackages = "com.njcn")
+@SpringBootApplication(scanBasePackages = "com.njcn")
+public class PrepareApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(PrepareApplication.class,args);
+ }
+
+}
diff --git a/pqs-prepare/src/main/resources/bootstrap.yml b/pqs-prepare/src/main/resources/bootstrap.yml
new file mode 100644
index 000000000..a2b624dd2
--- /dev/null
+++ b/pqs-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: 10220
+#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}