Merge remote-tracking branch 'origin/master'

# Conflicts:
#	gateway-server/src/main/resources/application.yml

config-server/src/main/resources/properties/config-dev.yml

@@ -13,6 +13,9 @@ spiderflow.name: SPIDER-FLOW-SERVER
 model.port: 9877
 model.name: MODEL-SERVER
 
+data.port: 9688
+data.name: DATAOPERATION-SERVER
+
 redis.url: 127.0.0.1
 redis.port: 6379
 redis.password:
@@ -29,4 +32,4 @@ spring:
       # 设置 上传文件的大小
       max-file-size: 1024MB
       # 设置 整个请求的大小
-      max-request-size: 2048MB
\ No newline at end of file
+      max-request-size: 2048MB

dataoperation-server/pom.xml

@@ -76,16 +76,6 @@
             <artifactId>poi</artifactId>
             <version>4.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>4.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>2.11.0</version>
-        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>com.oracle</groupId>-->
 <!--            <artifactId>ojdbc6</artifactId>-->

dataoperation-server/src/main/java/com/zq/dataoperation/DataoperationApplication.java

@@ -6,14 +6,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-/**
- * @author wilmiam
- * @since 2022/11/14 11:40
- */
 @EnableScheduling
-@MapperScan({"com.zq.dataoperation.dao"})
-@EnableDiscoveryClient
-@SpringBootApplication(scanBasePackages = {"com.zq.dataoperation"})
+@SpringBootApplication
+@MapperScan("com.zq.dataoperation.dao")
 public class DataoperationApplication {
 
     public static void main(String[] args) {

dataoperation-server/src/main/java/com/zq/dataoperation/controller/DataCleanController.java

+package com.zq.dataoperation.controller;
+
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "数据清洗")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping(value = "/data/clean")
+public class DataCleanController {
+
+
+
+}

dataoperation-server/src/main/resources/application.yml

 server:
-  port: 9688
+  port: ${data.port}
 #配置数据源
 spring:
   application:
-    name: DATAOPERATION-SERVER
+    name: ${data.name}
   servlet:
     #上传文件限制
     multipart:
@@ -25,10 +25,10 @@ spring:
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
-      driver-class-name: ${db.fc.driver-class-name}
-      username: ${db.fc.username}
-      password: ${db.fc.password}
-      url: ${db.fc.url.fc}
+      driver-class-name: ${jdbc.driver-class-name}
+      username: ${jdbc.username}
+      password: ${jdbc.password}
+      url: ${jdbc.url}
       # 初始连接数
       initial-size: 5
       # 最小连接数