diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index a2a37e1..8581ac4 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -4,10 +4,10 @@ server: # nacos线上地址 nacos: - addr: 47.116.173.119:8848 + addr: 106.15.136.7:8848 user-name: nacos password: nacos - namespace: six + namespace: xzr # Spring spring: application: diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java index 5039bc0..11bb283 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java @@ -5,7 +5,7 @@ package com.muyu.common.core.exception; * * @author muyu */ -public final class ServiceException extends RuntimeException { +public class ServiceException extends RuntimeException { private static final long serialVersionUID = 1L; /** diff --git a/cloud-common/cloud-common-saas/pom.xml b/cloud-common/cloud-common-saas/pom.xml new file mode 100644 index 0000000..dc6beec --- /dev/null +++ b/cloud-common/cloud-common-saas/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + com.muyu + cloud-common + 3.6.3 + + + cloud-common-saas + SaaS公共依赖 + + + 17 + 17 + UTF-8 + + + + + + com.muyu + cloud-common-datasource + + + + + com.muyu + cloud-common-security + + + \ No newline at end of file diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/ManyDataSource.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/ManyDataSource.java new file mode 100644 index 0000000..1c72866 --- /dev/null +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/ManyDataSource.java @@ -0,0 +1,129 @@ +package com.muyu.common.many.datasource; + +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.fastjson2.JSON; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.SpringUtils; +import com.muyu.common.many.datasource.constents.DatasourceContent; +import com.muyu.common.many.datasource.domain.model.DataSourceInfo; +import com.muyu.common.many.datasource.factory.DruidDataSourceFactory; +import com.muyu.common.many.datasource.role.DynamicDataSource; +import com.muyu.common.saas.domain.model.EntInfo; +import com.muyu.common.saas.exception.SaaSException; +import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.remote.RemoteUserService; +import lombok.extern.log4j.Log4j2; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Author: zi run + * @Date 2024/9/18 22:08 + * @Description 多数据源 + */ +@Log4j2 +@Component +public class ManyDataSource implements ApplicationRunner { + + @PostConstruct + public void init(){ + new Thread(() -> { + try { + Thread.sleep(10000); + } catch (InterruptedException ignored) {} + DruidDataSourceFactory druidDataSourceFactory = SpringUtils.getBean(DruidDataSourceFactory.class); + DynamicDataSource dynamicDataSource = SpringUtils.getBean(DynamicDataSource.class); + EntInfo entInfo = EntInfo.builder() + .entCode("ent_4588") + .ip("192.168.40.132") + .port(3308) + .build(); + DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild(entInfo.getEntCode(), entInfo.getIp(), entInfo.getPort()); + DruidDataSource druidDataSource = druidDataSourceFactory.create(dataSourceInfo); + dynamicDataSource.put(dataSourceInfo.getKey(), druidDataSource); + }).start(); + } + + + private List dataSourceInfoList(){ + RemoteUserService remoteUserService = SpringUtils.getBean(RemoteUserService.class); + Result> tableDataInfoResult = remoteUserService.companyList(); + if (tableDataInfoResult==null){ + throw new SaaSException("saas远调数据源错误"); + } + List data = tableDataInfoResult.getData(); + if (tableDataInfoResult.getCode() ==Result.SUCCESS && data !=null){ + List list = new ArrayList<>(); + for (SysUser row : data) { + list.add( + EntInfo.builder() + .entCode(row.getDatabaseName()) + .ip(DatasourceContent.IP) + .port(DatasourceContent.PORT) + .build() + ); + } + return list; + }else { + log.error("远调数据源错误,远调数据为：{}", JSON.toJSONString(data)); + return null; + } + } + + // private List dataPrimarySourceInfoList(){ +// List list = new ArrayList<>(); +// list.add( +// EntInfo.builder() +// .entCode() +// .ip(DatasourceContent.IP) +// .port(DatasourceContent.PORT) +// .build() +// ); +// return list; +// } + + @Bean + @Primary + public DynamicDataSource dynamicDataSource(DruidDataSourceFactory druidDataSourceFactory) { + + // 企业列表 企业CODE，端口，IP + + Map dataSourceMap = new HashMap<>(); + dataSourceInfoList() + .stream() + .map(entInfo -> DataSourceInfo.hostAndPortBuild(entInfo.getEntCode(), entInfo.getIp(), entInfo.getPort())) + .forEach(dataSourceInfo -> { + dataSourceMap.put(dataSourceInfo.getKey(), druidDataSourceFactory.create(dataSourceInfo)); + }); + //设置动态数据源 + DynamicDataSource dynamicDataSource = new DynamicDataSource(); +// dynamicDataSource.setDefaultTargetDataSource(masterDataSource()); + dynamicDataSource.setTargetDataSources(dataSourceMap); + //将数据源信息备份在defineTargetDataSources中 + dynamicDataSource.setDefineTargetDataSources(dataSourceMap); + return dynamicDataSource; + } + + @Override + public void run(ApplicationArguments args) throws Exception { + DruidDataSourceFactory druidDataSourceFactory = SpringUtils.getBean(DruidDataSourceFactory.class); + DynamicDataSource dynamicDataSource = SpringUtils.getBean(DynamicDataSource.class); + for (EntInfo entInfo : dataSourceInfoList()) { + DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild( + entInfo.getEntCode(), entInfo.getIp(), entInfo.getPort() + ); + DruidDataSource druidDataSource = druidDataSourceFactory.create(dataSourceInfo); + dynamicDataSource.put(dataSourceInfo.getKey(), druidDataSource); + log.info("存储数据连接池为：key:{}",dataSourceInfo.getKey()); + } + } +} diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/constents/DatasourceContent.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/constents/DatasourceContent.java new file mode 100644 index 0000000..44ee2f9 --- /dev/null +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/constents/DatasourceContent.java @@ -0,0 +1,20 @@ +package com.muyu.common.many.datasource.constents; + +/** + * @Author: zi run + * @Date 2024/9/18 22:06 + * @Description 数据源常量 + */ +public class DatasourceContent { + + public final static String DATASOURCE_URL = "jdbc:mysql://{}:{}/{}?useUnicode=true&" + + "characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"; + + public final static String USER_NAME = "root"; + + public final static String PASSWORD = "root"; + + public final static String IP = "127.0.0.1"; + + public final static Integer PORT = 3307; +} diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/domain/model/DataSourceInfo.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/domain/model/DataSourceInfo.java new file mode 100644 index 0000000..20b4226 --- /dev/null +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/domain/model/DataSourceInfo.java @@ -0,0 +1,50 @@ +package com.muyu.common.many.datasource.domain.model; + +import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.many.datasource.constents.DatasourceContent; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: zi run + * @Date 2024/9/18 22:01 + * @Description 数据源实体类 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DataSourceInfo { + + /** + * 键 + */ + private String key; + + /** + * 地址 + */ + private String url; + + /** + * 用户名 + */ + private String userName; + + /** + * 密码 + */ + private String password; + + + public static DataSourceInfo hostAndPortBuild(String key, String host, Integer port){ + return DataSourceInfo.builder() + .key(key) + .url(StringUtils.format(DatasourceContent.DATASOURCE_URL, host, port)) + .password(DatasourceContent.PASSWORD) + .userName(DatasourceContent.USER_NAME) + .build(); + } +} diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/factory/DruidDataSourceFactory.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/factory/DruidDataSourceFactory.java new file mode 100644 index 0000000..bf7832f --- /dev/null +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/factory/DruidDataSourceFactory.java @@ -0,0 +1,40 @@ +package com.muyu.common.many.datasource.factory; + +import com.alibaba.druid.pool.DruidDataSource; +import com.muyu.common.many.datasource.domain.model.DataSourceInfo; +import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Component; + +import java.sql.SQLException; + +/** + * @Author: zi run + * @Date 2024/9/18 22:08 + * @Description Druid工厂 + */ +@Log4j2 +@Component +public class DruidDataSourceFactory { + + /** + * 根据传递的数据源信息测试数据库连接 + * @param dataSourceInfo 数据源实体类 + * @return + */ + public DruidDataSource create(DataSourceInfo dataSourceInfo) { + DruidDataSource druidDataSource = new DruidDataSource(); + druidDataSource.setUrl(dataSourceInfo.getUrl()); + druidDataSource.setUsername(dataSourceInfo.getUserName()); + druidDataSource.setPassword(dataSourceInfo.getPassword()); + druidDataSource.setBreakAfterAcquireFailure(true); + druidDataSource.setConnectionErrorRetryAttempts(0); + try { + druidDataSource.getConnection(2000); + log.info("{} -> 数据源连接成功", dataSourceInfo.getKey()); + return druidDataSource; + } catch (SQLException sqlException) { + log.error("数据源 {} 连接失败,用户名：{}，密码 {}",dataSourceInfo.getUrl(),dataSourceInfo.getUserName(),dataSourceInfo.getPassword()); + return null; + } + } +} diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/holder/DynamicDataSourceHolder.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/holder/DynamicDataSourceHolder.java new file mode 100644 index 0000000..fbf522b --- /dev/null +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/holder/DynamicDataSourceHolder.java @@ -0,0 +1,43 @@ +package com.muyu.common.many.datasource.holder; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.util.Assert; + +/** + * @Author: zi run + * @Date 2024/9/18 22:08 + * @Description 数据源切换处理 + */ +@Slf4j +public class DynamicDataSourceHolder { + + /** + * 保存动态数据源名称 + */ + private static final ThreadLocal DYNAMIC_DATASOURCE_KEY = new ThreadLocal<>(); + + /** + * 设置/切换数据源，决定当前线程使用哪个数据源 + */ + public static void setDynamicDataSourceKey(String key){ + log.info("数据源切换为：{}",key); + DYNAMIC_DATASOURCE_KEY.set(key); + } + + /** + * 获取动态数据源名称，默认使用mater数据源 + */ + public static String getDynamicDataSourceKey(){ + String key = DYNAMIC_DATASOURCE_KEY.get(); + Assert.notNull(key, "请携带数据标识"); + return key; + } + + /** + * 移除当前数据源 + */ + public static void removeDynamicDataSourceKey(){ + log.info("移除数据源：{}",DYNAMIC_DATASOURCE_KEY.get()); + DYNAMIC_DATASOURCE_KEY.remove(); + } +} diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/role/DynamicDataSource.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/role/DynamicDataSource.java new file mode 100644 index 0000000..9a63b50 --- /dev/null +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/many/datasource/role/DynamicDataSource.java @@ -0,0 +1,57 @@ +package com.muyu.common.many.datasource.role; + +import com.alibaba.druid.pool.DruidDataSource; +import com.muyu.common.many.datasource.holder.DynamicDataSourceHolder; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; + +import java.util.Map; + +/** + * @Author: zi run + * @Date 2024/9/18 22:14 + * @Description 动态数据源 调用AddDefineDataSource组件的addDefineDynamicDataSource（）方法， + * 获取原来targetdatasources的map，并将新的数据源信息添加到map中，并替换targetdatasources中的map切换数据源时可以使用 + * @DataSource(value = "数据源名称")，或者DynamicDataSourceContextHolder.setContextKey("数据源名称") + */ +@EqualsAndHashCode(callSuper = true) +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DynamicDataSource extends AbstractRoutingDataSource { + + /** + * 备份所有数据源信息 备份的是个 指针 ！！！ + */ + private Map defineTargetDataSources; + + /** + * 判定键是否出站了 + * @param key 键 + * @return 存在结果 true存在 false不存在 + */ + public boolean hashKey(String key){ + return defineTargetDataSources.containsKey(key); + } + + /** + * 添加数据库 + * @param key 键 + * @param value 数据源 + */ + public void put(String key, DruidDataSource value) { + defineTargetDataSources.put(key, value); + this.afterPropertiesSet(); + } + + /** + * 决定当前线程使用哪个数据源 + */ + @Override + protected Object determineCurrentLookupKey() { + return DynamicDataSourceHolder.getDynamicDataSourceKey(); + } +} diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/saas/constants/SaaSConstant.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/saas/constants/SaaSConstant.java new file mode 100644 index 0000000..aa08900 --- /dev/null +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/saas/constants/SaaSConstant.java @@ -0,0 +1,29 @@ +package com.muyu.common.saas.constants; + +/** + * @Author: zi run + * @Date 2024/9/18 21:22 + * @Description SAAS常量 + */ +public class SaaSConstant { + + /** + * Saas键名 + */ + public static final String SAAS_KEY = "ent-code"; + + /** + * SaaS异常提示 + */ + public static final String SAAS_EXCEPTION_MSG = "SaaS非法访问"; + + /** + * 白名单地址 + */ + public static final String[] EXCLUDE_URLS = {"/login", "/logout", "/refresh"}; + + /** + * 拦截器优先级 + */ + public static final Integer INTERCEPTOR_ORDER = 10; +} diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/saas/domain/model/EntInfo.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/saas/domain/model/EntInfo.java new file mode 100644 index 0000000..3427f49 --- /dev/null +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/saas/domain/model/EntInfo.java @@ -0,0 +1,24 @@ +package com.muyu.common.saas.domain.model; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: zi run + * @Date 2024/9/19 14:24 + * @Description 企业信息 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class EntInfo { + + private String entCode; + + private String ip; + + private Integer port; +} diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/saas/exception/SaaSException.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/saas/exception/SaaSException.java new file mode 100644 index 0000000..bf74366 --- /dev/null +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/saas/exception/SaaSException.java @@ -0,0 +1,23 @@ +package com.muyu.common.saas.exception; + +import com.muyu.common.core.exception.ServiceException; + +/** + * @Author: zi run + * @Date 2024/9/18 21:28 + * @Description SaaS异常类 + */ +public class SaaSException extends ServiceException { + + public SaaSException (String message, Integer code) { + super(message, code); + } + + public SaaSException (String message) { + super(message); + } + + public SaaSException () { + super(); + } +} diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/saas/interceptor/SaaSInterceptor.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/saas/interceptor/SaaSInterceptor.java new file mode 100644 index 0000000..a5cdb31 --- /dev/null +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/saas/interceptor/SaaSInterceptor.java @@ -0,0 +1,61 @@ +package com.muyu.common.saas.interceptor; + +import com.muyu.common.core.utils.ServletUtils; +import com.muyu.common.core.utils.SpringUtils; +import com.muyu.common.many.datasource.holder.DynamicDataSourceHolder; +import com.muyu.common.many.datasource.role.DynamicDataSource; +import com.muyu.common.saas.constants.SaaSConstant; +import com.muyu.common.saas.exception.SaaSException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.AsyncHandlerInterceptor; + +/** + * @Author: zi run + * @Date 2024/9/18 21:14 + * @Description SAAS拦截器 + */ +public class SaaSInterceptor implements AsyncHandlerInterceptor { + + /** + * 执行之前触发 + * @param request servlet请求 + * @param response servlet响应 + * @param handler 处理器 + * @return 是否放行 + * @throws Exception 最大异常 + */ + @Override + public boolean preHandle(HttpServletRequest request, + HttpServletResponse response, Object handler) throws Exception { + if(! (handler instanceof HandlerMethod)) { + return true; + } + + String SaaSKey = ServletUtils.getHeader(request, SaaSConstant.SAAS_KEY); + if(SaaSKey == null) { + throw new SaaSException(SaaSConstant.SAAS_EXCEPTION_MSG); + } else { + DynamicDataSource dynamicDataSource = SpringUtils.getBean(DynamicDataSource.class); + if (!dynamicDataSource.hashKey(SaaSKey)){ + throw new SaaSException(SaaSConstant.SAAS_EXCEPTION_MSG); + } + } + DynamicDataSourceHolder.setDynamicDataSourceKey(SaaSKey); + return true; + } + + /** + * 执行之后触发 + * @param request servlet请求 + * @param response servlet响应 + * @param handler 处理器 + * @throws Exception 最大异常 + */ + @Override + public void afterConcurrentHandlingStarted(HttpServletRequest request, + HttpServletResponse response, Object handler) throws Exception { + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + } +} diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/saas/interceptor/WebMvcSaaSConfig.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/saas/interceptor/WebMvcSaaSConfig.java new file mode 100644 index 0000000..c14bb70 --- /dev/null +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/common/saas/interceptor/WebMvcSaaSConfig.java @@ -0,0 +1,33 @@ +package com.muyu.common.saas.interceptor; + +import com.muyu.common.saas.constants.SaaSConstant; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * @Author: zi run + * @Date 2024/9/18 21:07 + * @Description 拦截器配置 + */ +public class WebMvcSaaSConfig implements WebMvcConfigurer { + + /** + * 添加拦截器 + * @param registry 注册器 + */ + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(getHeaderInterceptor()) + .excludePathPatterns(SaaSConstant.EXCLUDE_URLS) + .order(SaaSConstant.INTERCEPTOR_ORDER); + + } + + /** + * 自定义请求头拦截器 + * @return SAAS拦截器对象 + */ + public SaaSInterceptor getHeaderInterceptor() { + return new SaaSInterceptor(); + } +} diff --git a/cloud-common/cloud-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-common/cloud-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..ea575f4 --- /dev/null +++ b/cloud-common/cloud-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.common.saas.interceptor.WebMvcSaaSConfig \ No newline at end of file diff --git a/cloud-common/pom.xml b/cloud-common/pom.xml index d00dfc6..a7a40be 100644 --- a/cloud-common/pom.xml +++ b/cloud-common/pom.xml @@ -20,6 +20,7 @@ cloud-common-system cloud-common-xxl cloud-common-rabbit + cloud-common-saas cloud-common diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java b/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java index 879d887..978a3b4 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java +++ b/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java @@ -50,7 +50,7 @@ public class ValidateCodeServiceImpl implements ValidateCodeService { CaptchaCodeResp.CaptchaCodeRespBuilder respBuilder = CaptchaCodeResp.builder() .captchaEnabled(captchaEnabled); if (!captchaEnabled) { - return Result.success(respBuilder); + return Result.success(respBuilder.build()); } // 保存验证码信息 diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index 75f452e..ae3ee7b 100644 --- a/cloud-gateway/src/main/resources/bootstrap.yml +++ b/cloud-gateway/src/main/resources/bootstrap.yml @@ -4,10 +4,10 @@ server: # nacos线上地址 nacos: - addr: 47.116.173.119:8848 + addr: 106.15.136.7:8848 user-name: nacos password: nacos - namespace: six + namespace: xzr # Spring spring: diff --git a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml index dd7b4e1..b6ae6e2 100644 --- a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml @@ -4,10 +4,10 @@ server: # nacos线上地址 nacos: - addr: 47.116.173.119:8848 + addr: 106.15.136.7:8848 user-name: nacos password: nacos - namespace: six + namespace: xzr # Spring spring: diff --git a/cloud-modules/cloud-modules-gen/pom.xml b/cloud-modules/cloud-modules-gen/pom.xml index c5de3a6..32c6fa3 100644 --- a/cloud-modules/cloud-modules-gen/pom.xml +++ b/cloud-modules/cloud-modules-gen/pom.xml @@ -65,12 +65,6 @@ cloud-common-api-doc - - - com.muyu - cloud-common-xxl - - diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml index 855f0a7..435f3f0 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml @@ -4,15 +4,13 @@ server: # nacos线上地址 nacos: - addr: 47.116.173.119:8848 + addr: 106.15.136.7:8848 user-name: nacos password: nacos - namespace: six + namespace: xzr # Spring spring: - main: - allow-bean-definition-overriding: true application: # 应用名称 name: cloud-gen @@ -47,5 +45,3 @@ spring: - 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} diff --git a/cloud-modules/cloud-modules-system/pom.xml b/cloud-modules/cloud-modules-system/pom.xml index 4116679..17087c2 100644 --- a/cloud-modules/cloud-modules-system/pom.xml +++ b/cloud-modules/cloud-modules-system/pom.xml @@ -71,16 +71,6 @@ cloud-common-api-doc - - - com.muyu - cloud-common-xxl - - - - com.muyu - cloud-common-rabbit - diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java deleted file mode 100644 index 791711f..0000000 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.muyu.system.rabbit; - -import com.alibaba.fastjson2.JSONObject; -import com.muyu.system.domain.SysConfig; -import jakarta.annotation.PostConstruct; -import lombok.extern.log4j.Log4j2; -import org.springframework.amqp.core.Queue; -import org.springframework.amqp.rabbit.annotation.RabbitHandler; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Log4j2 -@RestController -@RequestMapping("/rabbit/test") -public class RabbitTest { - - @Autowired - private RabbitTemplate rabbitTemplate; - - @Bean - public Queue initQueue(){ - return new Queue("rabbit.test.init"); - } - - @RabbitListener(queues = "rabbit.test.init") - public void msg(SysConfig sysConfig){ - log.info("消息队列：[{}], 消息内容：[{}]", "rabbit.test.init", JSONObject.toJSONString(sysConfig)); - } - - @PostConstruct - public void init(){ - new Thread(() -> { - try { - Thread.sleep(5000); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - SysConfig sysConfig = SysConfig.builder() - .configId(1L) - .configKey("ceshi-key") - .configName("测试名称") - .configType("测试类型") - .configValue("测试值") - .build(); - rabbitTemplate.convertAndSend("rabbit.test.init",sysConfig); - }).start(); - } - -} diff --git a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml index b7eb15e..025763b 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -4,19 +4,12 @@ server: # nacos线上地址 nacos: - addr: 47.116.173.119:8848 + addr: 106.15.136.7:8848 user-name: nacos password: nacos - namespace: six -# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all -# Spring + namespace: xzr + spring: - amqp: - deserialization: - trust: - all: true - main: - allow-bean-definition-overriding: true application: # 应用名称 name: cloud-system @@ -51,10 +44,6 @@ spring: - 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-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml index 6620cec..1b52b6b 100644 --- a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml +++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml @@ -4,10 +4,10 @@ server: # nacos线上地址 nacos: - addr: 47.116.173.119:8848 + addr: 106.15.136.7:8848 user-name: nacos password: nacos - namespace: six + namespace: xzr # Spring spring: