From 0b798a1c1a1f3b3d74f9bfb2c5ffdf87d7dcf709 Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Thu, 14 Dec 2023 18:35:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E6=94=B6?= =?UTF-8?q?=E5=B0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- srt-cloud-module/pom.xml | 1 + srt-cloud-module/srt-cloud-datax/.gitignore | 38 ++++ srt-cloud-module/srt-cloud-datax/pom.xml | 209 ++++++++++++++++++ .../src/main/java/net/srt/StuApp.java | 21 ++ .../srt/datax/controllor/StuController.java | 61 +++++ .../java/net/srt/datax/mapper/StuMapper.java | 17 ++ .../java/net/srt/datax/server/StuService.java | 26 +++ .../srt/datax/server/impl/StuServiceImpl.java | 50 +++++ .../src/main/java/net/srt/datax/vo/Stu.java | 67 ++++++ .../src/main/resources/auth.yml | 3 + .../src/main/resources/log4j2.xml | 48 ++++ 11 files changed, 541 insertions(+) create mode 100644 srt-cloud-module/srt-cloud-datax/.gitignore create mode 100644 srt-cloud-module/srt-cloud-datax/pom.xml create mode 100644 srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/StuApp.java create mode 100644 srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/controllor/StuController.java create mode 100644 srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/mapper/StuMapper.java create mode 100644 srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/StuService.java create mode 100644 srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/impl/StuServiceImpl.java create mode 100644 srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/vo/Stu.java create mode 100644 srt-cloud-module/srt-cloud-datax/src/main/resources/auth.yml create mode 100644 srt-cloud-module/srt-cloud-datax/src/main/resources/log4j2.xml diff --git a/srt-cloud-module/pom.xml b/srt-cloud-module/pom.xml index 74c7954..c6c276c 100644 --- a/srt-cloud-module/pom.xml +++ b/srt-cloud-module/pom.xml @@ -11,6 +11,7 @@ srt-cloud-quartz srt-cloud-message + srt-cloud-datax diff --git a/srt-cloud-module/srt-cloud-datax/.gitignore b/srt-cloud-module/srt-cloud-datax/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/srt-cloud-module/srt-cloud-datax/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/srt-cloud-module/srt-cloud-datax/pom.xml b/srt-cloud-module/srt-cloud-datax/pom.xml new file mode 100644 index 0000000..e824e65 --- /dev/null +++ b/srt-cloud-module/srt-cloud-datax/pom.xml @@ -0,0 +1,209 @@ + + + 4.0.0 + + net.srt + srt-cloud-module + 2.0.0 + + + srt-cloud-datax + + + 8 + 8 + UTF-8 + + + + + net.srt + srt-cloud-api + 2.0.0 + + + + net.srt + srt-cloud-data-lineage + 2.0.0 + + + + org.springframework.boot + spring-boot-starter-log4j2 + + + net.srt + srt-cloud-dbswitch + 2.0.0 + + + spring-boot-starter-logging + org.springframework.boot + + + + + net.srt + srt-cloud-mybatis + 2.0.0 + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + com.github.xiaoymin + knife4j-springdoc-ui + + + org.quartz-scheduler + quartz + + + + + + + + + org.codehaus.mojo + appassembler-maven-plugin + 2.1.0 + + + + + generate-jsw-scripts + package + + generate-daemons + + + + + + + flat + + src/main/resources + true + + true + + conf + + lib + + bin + UTF-8 + logs + + + + ${project.artifactId} + net.srt.QuartzApplication + + jsw + + + + jsw + + linux-x86-32 + linux-x86-64 + windows-x86-32 + windows-x86-64 + + + + configuration.directory.in.classpath.first + conf + + + wrapper.ping.timeout + 120 + + + set.default.REPO_DIR + lib + + + wrapper.logfile + logs/wrapper.log + + + + + + + + + -server + -Dfile.encoding=utf-8 + -Xms128m + -Xmx2048m + -XX:+PrintGCDetails + -XX:+PrintGCDateStamps + -Xloggc:logs/gc.log + + + + + + + net.srt.QuartzApplication + ${project.artifactId} + + + + + + + + maven-assembly-plugin + + + ${project.parent.parent.basedir}/assembly/assembly-win.xml + ${project.parent.parent.basedir}/assembly/assembly-linux.xml + + + + + make-assembly + package + + single + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + diff --git 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 new file mode 100644 index 0000000..8a5227e --- /dev/null +++ b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/StuApp.java @@ -0,0 +1,21 @@ +package net.srt; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * @ClassName StuApp + * @Description 描述 + * @Author 栗永斌 + */ +@EnableFeignClients +@EnableDiscoveryClient +@SpringBootApplication +public class StuApp { + public static void main(String[] args) { + SpringApplication.run(StuApp.class); + System.out.println("Hello world!"); + } +} diff --git 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 new file mode 100644 index 0000000..336b3cc --- /dev/null +++ b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/controllor/StuController.java @@ -0,0 +1,61 @@ +package net.srt.datax.controllor; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +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.web.bind.annotation.*; + +import java.util.List; + +/** + * @ClassName StuController + * @Description 描述 + * @Author 栗永斌 + */ +@RestController +@Tag(name = "对学生进行操作") +@RequestMapping("/datax") +public class StuController { + @Autowired + private StuService service; + + @Operation(summary = "查询列表") + @PostMapping("stuList") + public Result> stuList() { + List list = service.stuList(); + return Result.ok(list); + } + + @Operation(summary = "新增") + @PostMapping("addStudent") + public Result add(@RequestBody Stu stu) { + service.add(stu); + return Result.ok(); + } + + @Operation(summary = "修改列表") + @PostMapping("updateStudent") + public Result updateStudent(@RequestBody Stu stu) { + service.upd(stu); + return Result.ok(); + } + + @Operation(summary = "删除列表") + @PostMapping("delStudent/{id}") + public Result delStudent(@PathVariable Integer id) { + service.del(id); + return Result.ok(); + } + + @Operation(summary = "回显") + @PostMapping("findById/{id}") + public Result findById(@PathVariable Integer id) { + Stu stu = service.findById(id); + return Result.ok(stu); + } + + +} diff --git a/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/mapper/StuMapper.java b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/mapper/StuMapper.java new file mode 100644 index 0000000..d5d935a --- /dev/null +++ b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/mapper/StuMapper.java @@ -0,0 +1,17 @@ +package net.srt.datax.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.srt.datax.vo.Stu; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @ClassName StuMapper + * @Description 描述 + * @Author 栗永斌 + */ +@Mapper +public interface StuMapper extends BaseMapper { + +} diff --git 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 new file mode 100644 index 0000000..bbfe22e --- /dev/null +++ b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/StuService.java @@ -0,0 +1,26 @@ +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 java.util.List; + +/** + * @ClassName StuService + * @Description 描述 + * @Author 栗永斌 + */ +public interface StuService extends IService { + + + List stuList(); + + void add(Stu stu); + + void upd(Stu stu); + + void del(Integer id); + + Stu findById(Integer id); +} diff --git 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 new file mode 100644 index 0000000..8092fec --- /dev/null +++ b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/server/impl/StuServiceImpl.java @@ -0,0 +1,50 @@ +package net.srt.datax.server.impl; + +import net.srt.datax.mapper.StuMapper; +import net.srt.datax.server.StuService; +import net.srt.datax.vo.Stu; +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 java.lang.annotation.Annotation; +import java.util.List; + +/** + * @ClassName StuServiceImpl + * @Description 描述 + * @Author 栗永斌 + */ +@Service +public class StuServiceImpl extends BaseServiceImpl implements StuService { + @Autowired + private StuMapper stuMapper; + + @Override + public List stuList() { + List stuList = stuMapper.selectList(null); + return stuList; + } + + @Override + public void add(Stu stu) { + stuMapper.insert(stu); + } + + @Override + public void upd(Stu stu) { + stuMapper.updateById(stu); + } + + @Override + public void del(Integer id) { + stuMapper.deleteById(id); + } + + @Override + public Stu findById(Integer id) { + return stuMapper.selectById(id); + } + +} diff --git 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 new file mode 100644 index 0000000..3a44c47 --- /dev/null +++ b/srt-cloud-module/srt-cloud-datax/src/main/java/net/srt/datax/vo/Stu.java @@ -0,0 +1,67 @@ +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.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * @ClassName StuDAO + * @Description 描述 + * @Author 栗永斌 + */ +@Data +@Schema(description = "字典数据") +@TableName("data_datax") +public class Stu { + + @Schema(description = "id", required = true) + @NotNull(message = "id不能为空") + @TableId(value = "id") + private Long id; + + @Schema(description = "库名", required = true) + @NotNull(message = "库名不能为空") + private String name; + + @Schema(description = "ip", required = true) + @NotNull(message = "ip不能为空") + private String ip; + + @Schema(description = "端口", required = true) + @NotNull(message = "端口不能为空") + private String port; + + @Schema(description = "状态") + private Integer status; + + + @Schema(description = "创建时间", required = true) + @NotBlank(message = "创建时间不能为空") + private Date createTime; + + @Schema(description = "创建人", required = true) + @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 Date updateUser; + +} diff --git a/srt-cloud-module/srt-cloud-datax/src/main/resources/auth.yml b/srt-cloud-module/srt-cloud-datax/src/main/resources/auth.yml new file mode 100644 index 0000000..a9d7717 --- /dev/null +++ b/srt-cloud-module/srt-cloud-datax/src/main/resources/auth.yml @@ -0,0 +1,3 @@ +auth: + ignore_urls: + - /api/quartz/** diff --git a/srt-cloud-module/srt-cloud-datax/src/main/resources/log4j2.xml b/srt-cloud-module/srt-cloud-datax/src/main/resources/log4j2.xml new file mode 100644 index 0000000..9ce5480 --- /dev/null +++ b/srt-cloud-module/srt-cloud-datax/src/main/resources/log4j2.xml @@ -0,0 +1,48 @@ + + + + + ./logs/ + srt-cloud-quartz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 09d608215c19151b3cfd62a4b93b2d06da14ee1a Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Thu, 14 Dec 2023 18:58:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E6=94=B6?= =?UTF-8?q?=E5=B0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yml | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 srt-cloud-module/srt-cloud-datax/src/main/resources/bootstrap.yml diff --git a/srt-cloud-module/srt-cloud-datax/src/main/resources/bootstrap.yml b/srt-cloud-module/srt-cloud-datax/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..86696ad --- /dev/null +++ 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 From f4aec38b54a9cdb80be90c4cba9fdfebf320f39f Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Thu, 14 Dec 2023 18:58:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BD=91=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/srt-cloud-gateway/src/main/resources/bootstrap.yml b/srt-cloud-gateway/src/main/resources/bootstrap.yml index 4edd54b..70f6904 100644 --- 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}/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: