From 66df925400cc689912933f7a0b29867ff525ed5d Mon Sep 17 00:00:00 2001 From: zzh <2441574824@qq.com> Date: Wed, 21 Aug 2024 13:53:27 +0800 Subject: [PATCH] 0821 --- .../src/main/java/com/muyu/Main.java | 13 --- .../muyu/etl/common/domain/DataSources.java | 45 +++++++++++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/banner.txt | 2 + .../src/main/resources/bootstrap.yml | 56 +++++++++++++ .../src/main/resources/logback/dev.xml | 74 +++++++++++++++++ .../src/main/resources/logback/prod.xml | 81 +++++++++++++++++++ .../src/main/resources/logback/test.xml | 81 +++++++++++++++++++ 8 files changed, 340 insertions(+), 13 deletions(-) delete mode 100644 cloud-etl-common/src/main/java/com/muyu/Main.java create mode 100644 cloud-etl-common/src/main/java/com/muyu/etl/common/domain/DataSources.java create mode 100644 cloud-etl-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 cloud-etl-server/src/main/resources/banner.txt create mode 100644 cloud-etl-server/src/main/resources/bootstrap.yml create mode 100644 cloud-etl-server/src/main/resources/logback/dev.xml create mode 100644 cloud-etl-server/src/main/resources/logback/prod.xml create mode 100644 cloud-etl-server/src/main/resources/logback/test.xml diff --git a/cloud-etl-common/src/main/java/com/muyu/Main.java b/cloud-etl-common/src/main/java/com/muyu/Main.java deleted file mode 100644 index d48e658..0000000 --- a/cloud-etl-common/src/main/java/com/muyu/Main.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.muyu; - -/** - * @Author：zhangzhihao - * @name：${NAME} - * @Date：2024/8/20 18:28 - * 不准抄代码，添加注释，清楚每一行代码意思 - */ -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/cloud-etl-common/src/main/java/com/muyu/etl/common/domain/DataSources.java b/cloud-etl-common/src/main/java/com/muyu/etl/common/domain/DataSources.java new file mode 100644 index 0000000..8678d00 --- /dev/null +++ b/cloud-etl-common/src/main/java/com/muyu/etl/common/domain/DataSources.java @@ -0,0 +1,45 @@ +package com.muyu.etl.common.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import java.util.Date; + +/** + * 数据来源表; + * @author : http://www.chiner.pro + * @date : 2024-8-21 + */ +@Data +@AllArgsConstructor +@TableName(value="data_sources") +public class DataSources extends BaseEntity { + /** id */ + @TableId + private Integer id ; + /** 数据来源类型 */ + private String type ; + /** 数据来源名称 */ + private String name ; + /** 数据来源地址 */ + private String url ; + /** 来源地址端口号 */ + private String port ; + /** 存放数据库名称 */ + private String databaseName ; + /** 数据库登录名 */ + private String userName ; + /** 数据库登录密码 */ + private String userPwd ; + /** 字符集编码 */ + private String param ; + /** 状态 1启用 2禁用 */ + private String status ; + /** 注释 */ + private String remark ; + + + +} diff --git a/cloud-etl-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-etl-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..c9bfb16 --- /dev/null +++ b/cloud-etl-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.pay.server.MySpringApplicationRunListener diff --git a/cloud-etl-server/src/main/resources/banner.txt b/cloud-etl-server/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/cloud-etl-server/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/cloud-etl-server/src/main/resources/bootstrap.yml b/cloud-etl-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..6182ce2 --- /dev/null +++ b/cloud-etl-server/src/main/resources/bootstrap.yml @@ -0,0 +1,56 @@ +# Tomcat +server: + port: 9701 + +# nacos线上地址 +nacos: + addr: 12.2.0.252:8848 + user-name: nacos + password: nacos + namespace: muyu-cloud + +# Spring +spring: + main: + allow-bean-definition-overriding: true + application: + # 应用名称 + name: cloud-etl + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + username: ${nacos.user-name} + # nacos密码 + password: ${nacos.password} + # 命名空间 + namespace: ${nacos.namespace} + config: + # 服务注册地址 + server-addr: ${nacos.addr} + # nacos用户名 + username: ${nacos.user-name} + # nacos密码 + password: ${nacos.password} + # 命名空间 + namespace: ${nacos.namespace} + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + # 系统共享配置 + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # 系统环境Config共享配置 + - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # xxl-job 配置文件 + - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # rabbit 配置文件 + - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.system.mapper: DEBUG diff --git a/cloud-etl-server/src/main/resources/logback/dev.xml b/cloud-etl-server/src/main/resources/logback/dev.xml new file mode 100644 index 0000000..a0e16b0 --- /dev/null +++ b/cloud-etl-server/src/main/resources/logback/dev.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/cloud-etl-server/src/main/resources/logback/prod.xml b/cloud-etl-server/src/main/resources/logback/prod.xml new file mode 100644 index 0000000..afd0098 --- /dev/null +++ b/cloud-etl-server/src/main/resources/logback/prod.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + + diff --git a/cloud-etl-server/src/main/resources/logback/test.xml b/cloud-etl-server/src/main/resources/logback/test.xml new file mode 100644 index 0000000..afd0098 --- /dev/null +++ b/cloud-etl-server/src/main/resources/logback/test.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + +