diff --git a/muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Slave.java b/muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Slave.java index 9663cd4..97d118d 100644 --- a/muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Slave.java +++ b/muyu-common/muyu-common-datasource/src/main/java/com/muyu/common/datasource/annotation/Slave.java @@ -1,6 +1,6 @@ package com.muyu.common.datasource.annotation; +import com.muyu.common.datasource.annotation; -import com.baomidou.dynamic.datasource.annotation.DS; import java.lang.annotation.*; diff --git a/muyu-common/muyu-common-system/pom.xml b/muyu-common/muyu-common-system/pom.xml index 9a49091..62d92e3 100644 --- a/muyu-common/muyu-common-system/pom.xml +++ b/muyu-common/muyu-common-system/pom.xml @@ -18,17 +18,12 @@ + com.muyu muyu-common-core - - com.muyu - muyu-networking-common - 3.6.3 - compile - diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/EntInfo.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/EntInfo.java new file mode 100644 index 0000000..b4d35d6 --- /dev/null +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/EntInfo.java @@ -0,0 +1,33 @@ +package com.muyu.common.system.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @ClassDescription: + * @JdkVersion: 17 + * @Author: zhangxu + * @Created: 2024/6/10 20:40 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@TableName("etn_info") +public class EntInfo { + @TableId(type = IdType.AUTO) + private Long id; + + private String entCode; + + private String ip; + + private Long port; + + +} diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java index f9bfe99..229d0c9 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java @@ -3,11 +3,12 @@ package com.muyu.common.system.remote; import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.constant.ServiceNameConstants; import com.muyu.common.core.domain.Result; +import com.muyu.common.system.domain.EntInfo; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory; import com.muyu.common.system.domain.LoginUser; -import com.muyu.domain.datasources.EntInfo; +//import com.muyu.domain.datasources.EntInfo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java index 92cfe8a..a9f6c8d 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -1,11 +1,12 @@ package com.muyu.common.system.remote.factory; import com.muyu.common.core.domain.Result; +import com.muyu.common.system.domain.EntInfo; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.remote.RemoteUserService; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.LoginUser; -import com.muyu.domain.datasources.EntInfo; +//import com.muyu.domain.datasources.EntInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -36,6 +37,8 @@ public class RemoteUserFallbackFactory implements FallbackFactory> list() { return Result.error("获取失败"); diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/MuYuJobApplication.java b/muyu-modules/muyu-job/src/main/java/com/muyu/job/MuYuJobApplication.java index d8fba9b..3fc7bc8 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/MuYuJobApplication.java +++ b/muyu-modules/muyu-job/src/main/java/com/muyu/job/MuYuJobApplication.java @@ -14,9 +14,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableCustomConfig @EnableCustomSwagger2 @EnableMyFeignClients -@SpringBootApplication() +@SpringBootApplication public class MuYuJobApplication { public static void main (String[] args) { SpringApplication.run(MuYuJobApplication.class, args); } } + diff --git a/muyu-modules/muyu-networking/muyu-networking-common/pom.xml b/muyu-modules/muyu-networking/muyu-networking-common/pom.xml index 23ff409..7a9159e 100644 --- a/muyu-modules/muyu-networking/muyu-networking-common/pom.xml +++ b/muyu-modules/muyu-networking/muyu-networking-common/pom.xml @@ -53,6 +53,8 @@ spring-boot-starter-actuator + + io.springfox diff --git a/muyu-modules/muyu-networking/muyu-networking-service/pom.xml b/muyu-modules/muyu-networking/muyu-networking-service/pom.xml index c1990a9..23cebb3 100644 --- a/muyu-modules/muyu-networking/muyu-networking-service/pom.xml +++ b/muyu-modules/muyu-networking/muyu-networking-service/pom.xml @@ -104,10 +104,16 @@ - + + com.muyu + muyu-common-datasource + - + + com.muyu + muyu-common-datascope + diff --git a/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/impl/EnterpriseServiceImpl.java b/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/impl/EnterpriseServiceImpl.java index c92f7a7..c7ec793 100644 --- a/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/impl/EnterpriseServiceImpl.java +++ b/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/service/impl/EnterpriseServiceImpl.java @@ -7,6 +7,7 @@ package com.muyu.networking.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -23,10 +24,19 @@ import com.muyu.domain.datasources.Datasource; import com.muyu.networking.mapper.EnterpriseMapper; import com.muyu.networking.service.EnterpriseService; +import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.HashMap; import java.util.IllegalFormatCodePointException; import java.util.List; import java.util.UUID; @@ -40,6 +50,7 @@ import java.util.UUID; */ @Service @DS("networking") +@Log4j2 public class EnterpriseServiceImpl extends ServiceImpl implements EnterpriseService { @@ -121,7 +132,13 @@ public class EnterpriseServiceImpl extends ServiceImpl0){ + initialize(enterprise); + }else { + log.info("修改失败"); + } + return i; } /** @@ -156,6 +173,58 @@ public class EnterpriseServiceImpl extends ServiceImpl hashMap = new HashMap<>(); + String contactPhone = enterprise.getContactPhone(); + String phone=contactPhone.substring(contactPhone.length()-4); + String entId ="ent_id"+enterprise.getId(); + hashMap.put("entId",entId); + long port=3306+enterprise.getId(); + hashMap.put("mysqlPort",String.valueOf(port)); + //创建连接与设置连接参数 + URL url = null; + try { + url = new URL(postUrl); + HttpURLConnection httpConn = (HttpURLConnection) url.openConnection(); + httpConn.setRequestMethod("POST"); + httpConn.setRequestProperty("Charset","UTF-8"); + //POST 请求JSON 数据，必须设置 + httpConn.setRequestProperty("Content-Type","application/json"); + //默认代开是ture + httpConn.setDoOutput(true); + //从HTTPUrLConnection 获取输入流 + OutputStream outputStream = httpConn.getOutputStream(); + outputStream.write(JSON.toJSONString(hashMap).getBytes()); + outputStream.flush(); + //发起Http调用 + if (httpConn.getResponseCode()!= 200){ + throw new RuntimeException("请求失败"); + } + BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(httpConn.getInputStream())); + String s = bufferedReader.readLine(); + log.info("从服务端返回结果{}",s); + httpConn.disconnect(); + } catch (Exception e) { + throw new RuntimeException(e); + } + + + } + + + + + + + + + + + + + //public void DockerMySQLExample() throws IOException { // //配置docker 客户端配置 diff --git a/muyu-modules/muyu-networking/muyu-networking-service/src/main/resources/bootstrap.yml b/muyu-modules/muyu-networking/muyu-networking-service/src/main/resources/bootstrap.yml index 8a23355..0c3a504 100644 --- a/muyu-modules/muyu-networking/muyu-networking-service/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-networking/muyu-networking-service/src/main/resources/bootstrap.yml @@ -19,12 +19,12 @@ spring: config: # 配置中心地址 server-addr: 122.152.211.1:8848 + namespace: networking # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: networking logging: level: diff --git a/muyu-modules/muyu-system/pom.xml b/muyu-modules/muyu-system/pom.xml index be58498..12c6932 100644 --- a/muyu-modules/muyu-system/pom.xml +++ b/muyu-modules/muyu-system/pom.xml @@ -72,6 +72,13 @@ muyu-common-log + + + com.baomidou + dynamic-datasource-spring-boot-starter + ${dynamic-ds.version} + + com.muyu diff --git a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml index e6ef260..ea347d1 100644 --- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml @@ -19,12 +19,12 @@ spring: config: # 配置中心地址 server-addr: 122.152.211.1:8848 + namespace: networking # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: networking logging: level: com.muyu.system.mapper: DEBUG diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-common/pom.xml b/muyu-modules/muyu-vehicle/muyu-vehicle-common/pom.xml index a7b7538..5850628 100644 --- a/muyu-modules/muyu-vehicle/muyu-vehicle-common/pom.xml +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-common/pom.xml @@ -5,9 +5,9 @@ 4.0.0 com.muyu - muyu + muyu-vehicle 3.6.3 - ../../../pom.xml + muyu-vehicle-common diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/pom.xml b/muyu-modules/muyu-vehicle/muyu-vehicle-service/pom.xml index 687ab42..24e10a5 100644 --- a/muyu-modules/muyu-vehicle/muyu-vehicle-service/pom.xml +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/pom.xml @@ -5,9 +5,9 @@ 4.0.0 com.muyu - muyu + muyu-vehicle 3.6.3 - ../../../pom.xml + muyu-vehicle-service @@ -76,16 +76,7 @@ - - com.muyu - muyu-common-datasource - - - - com.muyu - muyu-common-datascope - @@ -104,6 +95,12 @@ org.springframework.cloud spring-cloud-starter-openfeign + + + com.baomidou + dynamic-datasource-spring-boot-starter + ${dynamic-ds.version} + diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/myDatasource/ManyDataSource.java b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/myDatasource/ManyDataSource.java index cfbecc3..9e44453 100644 --- a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/myDatasource/ManyDataSource.java +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/myDatasource/ManyDataSource.java @@ -6,8 +6,9 @@ import com.alibaba.fastjson.JSON; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.SpringUtils; +import com.muyu.common.system.domain.EntInfo; import com.muyu.common.system.remote.RemoteUserService; -import com.muyu.domain.datasources.EntInfo; + import com.muyu.vehicle.myDatasource.domain.DataSourceInfo; import com.muyu.vehicle.myDatasource.domain.EnterpriseInfo; import com.muyu.vehicle.myDatasource.factory.DruidDataSourceFactory; diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/myDatasource/aspect/DataSourceAsp.java b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/myDatasource/aspect/DataSourceAsp.java index d515d17..f4fc156 100644 --- a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/myDatasource/aspect/DataSourceAsp.java +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/myDatasource/aspect/DataSourceAsp.java @@ -23,7 +23,7 @@ public class DataSourceAsp { @Autowired private RemoteUserService remoteUserService; - @Pointcut("execution(public * com.car.client.controller.*Controller.*(..))") + @Pointcut("execution(public * com.muyu.vehicle.controller.*(..))") public void pointcut() { } diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/myDatasource/constants/DatasourceConstant.java b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/myDatasource/constants/DatasourceConstant.java index 343d7f5..9c67c20 100644 --- a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/myDatasource/constants/DatasourceConstant.java +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/myDatasource/constants/DatasourceConstant.java @@ -12,7 +12,7 @@ public class DatasourceConstant { public final static String USER_NAME = "root"; - public final static String PASSWORD = "sal75-z"; + public final static String PASSWORD = "122.152.211.1"; } diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/bootstrap.yml b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/bootstrap.yml index 005143e..e52e3f1 100644 --- a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/bootstrap.yml @@ -14,7 +14,9 @@ spring: simple: prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条 publisher-confirm-type: correlated #确认消息已发送到交换机(Exchange) - publisher-returns: true #确认消息已发送到队列(Queue) + publisher-returns: true #确认消息已发送到队列(Queue) + main: + allow-circular-references: true application: # 应用名称 name: muyu-vehicle diff --git a/muyu-modules/muyu-vehicle/pom.xml b/muyu-modules/muyu-vehicle/pom.xml index 842a6d8..cc96c9c 100644 --- a/muyu-modules/muyu-vehicle/pom.xml +++ b/muyu-modules/muyu-vehicle/pom.xml @@ -5,12 +5,16 @@ 4.0.0 com.muyu - muyu + muyu-modules 3.6.3 - ../../pom.xml muyu-vehicle + pom + + muyu-vehicle-common + muyu-vehicle-service + 17 @@ -18,4 +22,5 @@ UTF-8 +