Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/StuApp.java # srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/controllor/StuController.java # srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/mapper/StuMapper.java # srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/StuService.java # srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/impl/StuServiceImpl.java # srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/vo/Stu.java # srt-cloud-module/srt-cloud-datax/src/main/resources/auth.yml
2023-12-14 20:46:33 +08:00 · 2023-12-14 20:46:33 +08:00 · 458daa1f83
parent 4387cd696e f4aec38b54
commit 458daa1f83
9 changed files with 65 additions and 34 deletions
--- a/srt-cloud-gateway/src/main/resources/bootstrap.yml
+++ b/srt-cloud-gateway/src/main/resources/bootstrap.yml
@ -23,6 +23,7 @@ spring:
            - Path=/sys/**
          filters:
            - StripPrefix=1
+
        - id: srt-cloud-quartz
          uri: lb://srt-cloud-quartz
          order: 2
@ -30,6 +31,7 @@ spring:
            - Path=/schedule/**
          filters:
            - StripPrefix=1
+
        - id: srt-cloud-message
          uri: lb://srt-cloud-message
          order: 3
@ -37,6 +39,7 @@ spring:
            - Path=/message/**
          filters:
            - StripPrefix=1
+
        - id: srt-cloud-data-integrate
          uri: lb://srt-cloud-data-integrate
          order: 4
@ -44,6 +47,7 @@ spring:
            - Path=/data-integrate/**
          filters:
            - StripPrefix=1
+
        - id: srt-cloud-data-development
          uri: lb://srt-cloud-data-development
          order: 5
@ -51,6 +55,7 @@ spring:
            - Path=/data-development/**
          filters:
            - StripPrefix=1
+
        - id: srt-cloud-data-service
          uri: lb://srt-cloud-data-service
          order: 6
@ -58,6 +63,7 @@ spring:
            - Path=/data-service/**
          filters:
            - StripPrefix=1
+
        - id: srt-cloud-data-governance
          uri: lb://srt-cloud-data-governance
          order: 7
@ -65,6 +71,7 @@ spring:
            - Path=/data-governance/**
          filters:
            - StripPrefix=1
+
        - id: srt-cloud-data-assets
          uri: lb://srt-cloud-data-assets
          order: 8
@ -72,19 +79,29 @@ spring:
            - Path=/data-assets/**
          filters:
            - StripPrefix=1
+
        - id: openapi
          uri: http://localhost:${server.port}
          predicates:
            - Path=/v3/api-docs/**
          filters:
            - RewritePath=/v3/api-docs/(?<path>.*), /$\{path}/v3/api-docs
+
+        - id: srt-cloud-datax  # New Gateway
+          uri: lb://srt-cloud-datax  # Update with the correct URI for your new service
+          predicates:
+            - Path=/srt-cloud-datax/**  # Adjust the path as needed
+          filters:
+            - StripPrefix=1
+
+
    nacos:
      discovery:
        server-addr: 101.34.77.101:8848
        # 命名空间，默认：public
        namespace: c5d32e76-b83c-4254-8176-1c6a2cee8e3b
        service: ${spring.application.name}
-        group: srt2.0
+        group: srt2.1

 springdoc:
  swagger-ui:
--- a/srt-cloud-module/pom.xml
+++ b/srt-cloud-module/pom.xml
@ -11,6 +11,7 @@
 	<modules>
 	    <module>srt-cloud-quartz</module>
 		<module>srt-cloud-message</module>
+		<module>srt-cloud-datax</module>
    </modules>


--- a/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/StuApp.java
+++ b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/StuApp.java
@ -16,5 +16,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 public class StuApp {
    public static void main(String[] args) {
        SpringApplication.run(StuApp.class);
+        System.out.println("Hello world!");
    }
 }
--- a/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/controllor/StuController.java
+++ b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/controllor/StuController.java
@ -7,7 +7,6 @@ import net.srt.datax.server.StuService;
 import net.srt.datax.vo.Stu;
 import net.srt.framework.common.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

 import java.util.List;
@ -18,7 +17,7 @@ import java.util.List;
 * @Author 栗永斌
 */
@RestController
-@RequestMapping("stu/platform")
+@RequestMapping("/stu/platform")
@Tag(name = "对学生进行操作")
@AllArgsConstructor
 public class StuController {
@ -28,35 +27,35 @@ public class StuController {


    @Operation(summary = "查询列表")
-    @PostMapping("stuList")
+    @PostMapping("/stuList")
    public Result<List<Stu>> stuList() {
        List<Stu> stuList = stuService.stuList();
        return Result.ok(stuList);
    }

    @Operation(summary = "新增")
-    @PostMapping("addStudent")
+    @PostMapping("/addStudent")
    public Result<Stu> add(@RequestBody Stu stu) {
        stuService.add(stu);
        return Result.ok();
    }

    @Operation(summary = "修改列表")
-    @PostMapping("updateStudent")
+    @PostMapping("/updateStudent")
    public Result<Stu> updateStudent(@RequestBody Stu stu) {
        stuService.updateStudent(stu);
        return Result.ok();
    }

    @Operation(summary = "删除列表")
-    @PostMapping("delStudent/{id}")
+    @PostMapping("/delStudent/{id}")
    public Result<String> delStudent(@PathVariable Long id) {
        stuService.delStudent(id);
        return Result.ok();
    }

    @Operation(summary = "回显")
-    @PostMapping("findById/{id}")
+    @PostMapping("/findById/{id}")
    public Result<Stu> findById(@PathVariable Integer id) {
        if (id!= null) {
            return Result.ok(stuService.findById(id));
--- a/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/StuService.java
+++ b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/StuService.java
@ -2,9 +2,6 @@ package net.srt.datax.server;

 import com.baomidou.mybatisplus.extension.service.IService;
 import net.srt.datax.vo.Stu;
-import net.srt.framework.common.utils.Result;
-import net.srt.framework.mybatis.service.BaseService;
-import org.bouncycastle.asn1.x509.IssuerSerial;

 import java.util.List;

--- a/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/impl/StuServiceImpl.java
+++ b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/impl/StuServiceImpl.java
@ -1,24 +1,14 @@
 package net.srt.datax.server.impl;

-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import lombok.AllArgsConstructor;
 import net.srt.datax.mapper.StuMapper;
 import net.srt.datax.server.StuService;
 import net.srt.datax.vo.Stu;
-import net.srt.framework.common.cache.bean.DataProjectCacheBean;
-import net.srt.framework.common.utils.Result;
 import net.srt.framework.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;

-import java.lang.annotation.Annotation;
-import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
 /**
 * @ClassName StuServiceImpl
 * @Description 描述
--- a/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/vo/Stu.java
+++ b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/vo/Stu.java
@ -1,12 +1,10 @@
 package net.srt.datax.vo;

+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;

-import javax.naming.directory.SearchControls;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
@ -23,6 +21,7 @@ public class Stu  {

    @Schema(description = "id", required = true)
    @NotNull(message = "id不能为空")
+    @TableId(value = "id")
    private Long id;

    @Schema(description = "库名", required = true)
@ -48,20 +47,12 @@ public class Stu  {
    @NotBlank(message = "创建人不能为空")
    private String createUser;

-    @Schema(description = "data同步", required = true)
-    @NotBlank(message = "不能为空")
-    private Integer dataSynchronization;
-
-    @Schema(description = "***", required = true)
-    @NotBlank(message = "***不能为空")
-    private Integer dataxEngine;
-
    @Schema(description = "修改时间", required = true)
    @NotBlank(message = "修改时间不能为空")
    private Date updateTime;

    @Schema(description = "修改人", required = true)
    @NotBlank(message = "修改人不能为空")
-    private String updateUser;
+    private Date updateUser;

 }
--- a/srt-cloud-module/srt-cloud-datax/src/main/resources/auth.yml
+++ b/srt-cloud-module/srt-cloud-datax/src/main/resources/auth.yml
@ -1,3 +1,4 @@
 auth:
  ignore_urls:
    - /datax/**
+    - /api/quartz/**
--- a/srt-cloud-module/srt-cloud-datax/src/main/resources/bootstrap.yml
+++ b/srt-cloud-module/srt-cloud-datax/src/main/resources/bootstrap.yml
@ -0,0 +1,34 @@
+server:
+  port: 8091
+
+spring:
+  application:
+    name: srt-cloud-datax
+  profiles:
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 101.34.77.101:8848
+        # 命名空间，默认：public
+        namespace: c5d32e76-b83c-4254-8176-1c6a2cee8e3b
+        service: ${spring.application.name}
+        group: srt2.1
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+        namespace: ${spring.cloud.nacos.discovery.namespace}
+        file-extension: yaml
+        # 指定配置
+        extension-configs:
+          - data-id: datasource.yaml
+            refresh: true
+# feign 配置
+feign:
+  client:
+    config:
+      default:
+        connectTimeout: 1200000
+        readTimeout: 1200000
+        loggerLevel: basic
+  okhttp:
+    enabled: true