energy-biz-anomaly和energy-biz-appraise服务改造

energy-service-api/energy-biz-appraise-api/src/main/java/org/springenergy/bizAppraise/vo/BizAppraisePlanVO.java

@@ -17,7 +17,6 @@
 package org.springenergy.bizAppraise.vo;
 
 import org.springenergy.bizAppraise.entity.BizAppraisePlanEntity;
-import org.springenergy.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

energy-service/energy-biz-anomaly/pom.xml

@@ -14,6 +14,24 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <version>2021.0.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2021.0.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springenergy</groupId>
+            <artifactId>energy-framework-compat</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -24,17 +42,14 @@
         </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <artifactId>knife4j-annotations</artifactId>
+            <version>${knife4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springenergy</groupId>
             <artifactId>energy-biz-anomaly-api</artifactId>
             <version>1.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.springenergy</groupId>
-            <artifactId>energy-user-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>

energy-service/energy-biz-anomaly/src/main/java/org/springenergy/bizAnomalyInfo/BizAnomalyApplication.java

@@ -16,8 +16,11 @@
  */
 package org.springenergy.bizAnomalyInfo;
 
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * Desk启动器
@@ -25,6 +28,9 @@ import org.springframework.boot.SpringApplication;
  * @author Chill
  */
 @SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients(basePackages = "org.springenergy")
+@MapperScan("org.springenergy.bizAnomalyInfo.mapper")
 public class BizAnomalyApplication {
 
     public static void main(String[] args) {

energy-service/energy-biz-anomaly/src/main/resources/application-dev.yml

@@ -4,8 +4,20 @@ server:
 
 #数据源配置
 spring:
+  application:
+    name: energy-biz-anomaly
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   datasource:
-    url: ${energy.datasource.dev.url}
-    username: ${energy.datasource.dev.username}
-    password: ${energy.datasource.dev.password}
+    dynamic:
+      enabled: false
+    driver-class-name: oracle.jdbc.OracleDriver
+    url: ${ENERGY_DATASOURCE_DEV_URL:${energy.datasource.dev.url:jdbc:oracle:thin:@//192.168.1.102:1521/ORCLPDB}}
+    username: ${ENERGY_DATASOURCE_DEV_USERNAME:${energy.datasource.dev.username:ENERGYX}}
+    password: ${ENERGY_DATASOURCE_DEV_PASSWORD:${energy.datasource.dev.password:}}
+
+springfox:
+  documentation:
+    enabled: false
 

energy-service/energy-biz-anomaly/src/main/resources/bootstrap.yml

@@ -0,0 +1,21 @@
+spring:
+  application:
+    name: energy-biz-anomaly
+  profiles:
+    active: ${SPRING_PROFILES_ACTIVE:dev}
+  cloud:
+    nacos:
+      username: ${NACOS_USERNAME:nacos}
+      password: ${NACOS_PASSWORD:nacos}
+      discovery:
+        server-addr: ${NACOS_ADDR:localhost:8848}
+      config:
+        server-addr: ${NACOS_ADDR:localhost:8848}
+        file-extension: yaml
+        shared-configs:
+          - data-id: energy.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: energy-${spring.profiles.active}.yaml
+            group: DEFAULT_GROUP
+            refresh: true

energy-service/energy-biz-appraise/pom.xml

@@ -14,6 +14,24 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <version>2021.0.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2021.0.5.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springenergy</groupId>
+            <artifactId>energy-framework-compat</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -24,17 +42,14 @@
         </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <artifactId>knife4j-annotations</artifactId>
+            <version>${knife4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springenergy</groupId>
             <artifactId>energy-biz-appraise-api</artifactId>
             <version>1.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.springenergy</groupId>
-            <artifactId>energy-user-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>

energy-service/energy-biz-appraise/src/main/java/org/springenergy/bizAppraise/BizAppraiseApplication.java

@@ -16,8 +16,11 @@
  */
 package org.springenergy.bizAppraise;
 
-import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * Desk启动器
@@ -25,6 +28,9 @@ import org.springframework.boot.SpringApplication;
  * @author Chill
  */
 @SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients(basePackages = "org.springenergy")
+@MapperScan("org.springenergy.bizAppraise.mapper")
 public class BizAppraiseApplication {
 
     public static void main(String[] args) {

energy-service/energy-biz-appraise/src/main/resources/application-dev.yml

@@ -4,8 +4,20 @@ server:
 
 #数据源配置
 spring:
+  application:
+    name: energy-biz-appraise
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   datasource:
-    url: ${energy.datasource.dev.url}
-    username: ${energy.datasource.dev.username}
-    password: ${energy.datasource.dev.password}
+    dynamic:
+      enabled: false
+    driver-class-name: oracle.jdbc.OracleDriver
+    url: ${ENERGY_DATASOURCE_DEV_URL:${energy.datasource.dev.url:jdbc:oracle:thin:@//192.168.1.102:1521/ORCLPDB}}
+    username: ${ENERGY_DATASOURCE_DEV_USERNAME:${energy.datasource.dev.username:ENERGYX}}
+    password: ${ENERGY_DATASOURCE_DEV_PASSWORD:${energy.datasource.dev.password:}}
+
+springfox:
+  documentation:
+    enabled: false
 

energy-service/energy-biz-appraise/src/main/resources/bootstrap.yml

@@ -0,0 +1,21 @@
+spring:
+  application:
+    name: energy-biz-appraise
+  profiles:
+    active: ${SPRING_PROFILES_ACTIVE:dev}
+  cloud:
+    nacos:
+      username: ${NACOS_USERNAME:nacos}
+      password: ${NACOS_PASSWORD:nacos}
+      discovery:
+        server-addr: ${NACOS_ADDR:localhost:8848}
+      config:
+        server-addr: ${NACOS_ADDR:localhost:8848}
+        file-extension: yaml
+        shared-configs:
+          - data-id: energy.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: energy-${spring.profiles.active}.yaml
+            group: DEFAULT_GROUP
+            refresh: true