From d941f3c8d030aafc424597d3818675920d57462e Mon Sep 17 00:00:00 2001 From: 2812875475 <2812875475@qq.com> Date: Sun, 21 Apr 2024 10:47:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-auth/src/main/resources/bootstrap.yml | 2 +- .../com/muyu/common/core/utils/ObjUtils.java | 65 ++++++++++ .../muyu-detabase-common/pom.xml | 22 ++++ .../muyu-detabase-server/pom.xml | 118 ++++++++++++++++++ .../detabase/MuYuDetabaseApplication.java | 25 ++++ .../detabase/domain/req/DatabaseConnect.java | 46 +++++++ .../detabase/domain/req/DatabaseList.java | 22 ++++ .../src/main/resources/banner.txt | 2 + .../src/main/resources/bootstrap.yml | 30 +++++ .../src/main/resources/logback.xml | 74 +++++++++++ .../mapper/detabase/SysDataSourceMapper.xml | 35 ++++++ muyu-modules/muyu-detabase/pom.xml | 25 ++++ .../mapper/system/SysNoticeMapper.xml | 1 + muyu-modules/pom.xml | 1 + pom.xml | 17 +++ 15 files changed, 484 insertions(+), 1 deletion(-) create mode 100644 muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ObjUtils.java create mode 100644 muyu-modules/muyu-detabase/muyu-detabase-common/pom.xml create mode 100644 muyu-modules/muyu-detabase/muyu-detabase-server/pom.xml create mode 100644 muyu-modules/muyu-detabase/muyu-detabase-server/src/main/java/com/muyu/detabase/MuYuDetabaseApplication.java create mode 100644 muyu-modules/muyu-detabase/muyu-detabase-server/src/main/java/com/muyu/detabase/domain/req/DatabaseConnect.java create mode 100644 muyu-modules/muyu-detabase/muyu-detabase-server/src/main/java/com/muyu/detabase/domain/req/DatabaseList.java create mode 100644 muyu-modules/muyu-detabase/muyu-detabase-server/src/main/resources/banner.txt create mode 100644 muyu-modules/muyu-detabase/muyu-detabase-server/src/main/resources/bootstrap.yml create mode 100644 muyu-modules/muyu-detabase/muyu-detabase-server/src/main/resources/logback.xml create mode 100644 muyu-modules/muyu-detabase/muyu-detabase-server/src/main/resources/mapper/detabase/SysDataSourceMapper.xml create mode 100644 muyu-modules/muyu-detabase/pom.xml diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/muyu-auth/src/main/resources/bootstrap.yml index a834d6c..3df7e38 100644 --- a/muyu-auth/src/main/resources/bootstrap.yml +++ b/muyu-auth/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9215 + port: 9218 # Spring spring: diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ObjUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ObjUtils.java new file mode 100644 index 0000000..35f459c --- /dev/null +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ObjUtils.java @@ -0,0 +1,65 @@ +package com.muyu.common.core.utils; + +import org.apache.commons.lang3.ObjectUtils; + +import java.math.BigDecimal; + +/** + * @author DongZl + * @description: 对象工具类 + * @Date 2023-10-9 下午 04:56 + */ +public class ObjUtils { + + /** + * 兼容 + * CharSequence: 如果长度为零，则认为为空。 + * Array: 如果长度为零，则认为为空。 + * Collection: 如果元素为零，则认为为空。 + * Map: 如果键值映射为零，则认为为空。 + * @param o 对象 + * @return 如果对象具有受支持的类型并且为空或null，则为true，否则为false + */ + public static boolean notNull(Object o){ + return ObjectUtils.isNotEmpty(o); + } + + /** + * 判断long类型不为0 + * @param val 值 + * @return 返回值不为0 + */ + public static boolean notNull(Long val){ + return ObjectUtils.isNotEmpty(val) && val != 0; + } + + /** + * 判断Integer类型不为0 + * @param val 值 + * @return 返回值不为0 + */ + public static boolean notNull(Integer val){ + return ObjectUtils.isNotEmpty(val) && val != 0; + } + /** + * 判断BigDecimal类型不为0 + * @param val 值 + * @return 返回值不为0 + */ + public static boolean notNull(BigDecimal val){ + return ObjectUtils.isNotEmpty(val) && val.doubleValue() == 0.00; + } + /** + * 判断BigDecimal类型不为0 + * @param val 值 + * @return 返回值不为0 + */ + public static boolean notChildNull(Object[] val){ + for (Object o : val) { + if (!notNull(o)){ + return false; + } + } + return true; + } +} diff --git a/muyu-modules/muyu-detabase/muyu-detabase-common/pom.xml b/muyu-modules/muyu-detabase/muyu-detabase-common/pom.xml new file mode 100644 index 0000000..6cb285e --- /dev/null +++ b/muyu-modules/muyu-detabase/muyu-detabase-common/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + com.muyu + muyu-detabase + 3.6.3 + + + muyu-detabase-common + + + + + com.muyu + muyu-common-core + + + + diff --git a/muyu-modules/muyu-detabase/muyu-detabase-server/pom.xml b/muyu-modules/muyu-detabase/muyu-detabase-server/pom.xml new file mode 100644 index 0000000..d3a6fda --- /dev/null +++ b/muyu-modules/muyu-detabase/muyu-detabase-server/pom.xml @@ -0,0 +1,118 @@ + + + 4.0.0 + + com.muyu + muyu-detabase + 3.6.3 + + + muyu-detabase-server + + + 17 + 17 + UTF-8 + + + + com.muyu + muyu-detabase-common + + + + com.muyu + muyu-common-core + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + muyu-common-datasource + + + + + com.muyu + muyu-common-datascope + + + + + com.muyu + muyu-common-log + + + + + com.muyu + muyu-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + diff --git a/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/java/com/muyu/detabase/MuYuDetabaseApplication.java b/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/java/com/muyu/detabase/MuYuDetabaseApplication.java new file mode 100644 index 0000000..140584a --- /dev/null +++ b/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/java/com/muyu/detabase/MuYuDetabaseApplication.java @@ -0,0 +1,25 @@ +package com.muyu.detabase; + +import com.muyu.common.security.annotation.EnableCustomConfig; +import com.muyu.common.security.annotation.EnableMyFeignClients; +import com.muyu.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableAsync; + +/** + * @author DongZl + * @description: 商品启动类 + * @Date 2024-2-26 下午 04:07 + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +@EnableAsync +public class MuYuDetabaseApplication { + public static void main (String[] args) { + SpringApplication.run(MuYuDetabaseApplication.class, args); + } + +} diff --git a/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/java/com/muyu/detabase/domain/req/DatabaseConnect.java b/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/java/com/muyu/detabase/domain/req/DatabaseConnect.java new file mode 100644 index 0000000..a50c807 --- /dev/null +++ b/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/java/com/muyu/detabase/domain/req/DatabaseConnect.java @@ -0,0 +1,46 @@ +package com.muyu.detabase.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 数据库信息 + * @author WangLei + * @Date 2024/4/20 020 13:35 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class DatabaseConnect { + /** + * 地址 + */ + private String host; + /** + * 端口 + */ + private String port; + /** + * 用户名 + */ + private String username; + /** + * 密码 + */ + private String password; + /** + * 连接参数 + */ + private String connectionParam; + /** + * 数据库名称 + */ + private String databaseName; + /** + * 数据接入类型 + */ + private String type; +} diff --git a/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/java/com/muyu/detabase/domain/req/DatabaseList.java b/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/java/com/muyu/detabase/domain/req/DatabaseList.java new file mode 100644 index 0000000..08c836d --- /dev/null +++ b/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/java/com/muyu/detabase/domain/req/DatabaseList.java @@ -0,0 +1,22 @@ +package com.muyu.detabase.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 数据库表信息 + * + * @author WangLei + * @Date 2024/4/21 021 9:22 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class DatabaseList { + private String database; + + +} diff --git a/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/resources/banner.txt b/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/muyu-modules/muyu-detabase/muyu-detabase-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/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..c7e8d5e --- /dev/null +++ b/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/resources/bootstrap.yml @@ -0,0 +1,30 @@ +# Tomcat +server: + port: 9215 + +# Spring +spring: + application: + # 应用名称 + name: muyu-detabase + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 43.142.149.172:8848 + namespace: test + config: + # 配置中心地址 + server-addr: 43.142.149.172:8848 + namespace: test + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.system.mapper: DEBUG diff --git a/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/resources/logback.xml b/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/resources/logback.xml new file mode 100644 index 0000000..aa340cd --- /dev/null +++ b/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/resources/logback.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/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/resources/mapper/detabase/SysDataSourceMapper.xml b/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/resources/mapper/detabase/SysDataSourceMapper.xml new file mode 100644 index 0000000..ba4b8e3 --- /dev/null +++ b/muyu-modules/muyu-detabase/muyu-detabase-server/src/main/resources/mapper/detabase/SysDataSourceMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, name, system_name, host,port,username,password, type, database_name, connectionParam, init_num, max_num, max_wait_time, max_wait_size, remark, create_by, create_time, update_by, update_time from sys_data_source + + + diff --git a/muyu-modules/muyu-detabase/pom.xml b/muyu-modules/muyu-detabase/pom.xml new file mode 100644 index 0000000..9d6686a --- /dev/null +++ b/muyu-modules/muyu-detabase/pom.xml @@ -0,0 +1,25 @@ + + + 4.0.0 + + com.muyu + muyu-modules + 3.6.3 + + + muyu-detabase + pom + + muyu-detabase-common + muyu-detabase-server + + + + 17 + 17 + UTF-8 + + + diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysNoticeMapper.xml index a24a289..87f9e1e 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -57,6 +57,7 @@ select * from sys_user