From dc19916bcac0758d52e81923dfd940186fd9b9e7 Mon Sep 17 00:00:00 2001 From: Liu Wu <2780205363@qq.com> Date: Fri, 27 Sep 2024 22:30:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-common/cloud-common-saas/pom.xml | 6 +- .../many/datasource/ManyDataSource.java | 14 ++- .../many/datasource/init/InitDataSource.java | 59 ++++++++++ cloud-modules/cloud-data/pom.xml | 17 +++ .../java/com/muyu/data/DataApplication.java | 2 + .../muyu/data/controller/DataController.java | 30 +++++ .../main/java/com/muyu/data/domian/Event.java | 42 +++++++ .../java/com/muyu/data/mapper/DataMapper.java | 8 ++ .../muyu/data/remote/RemoteCarService.java | 23 ++++ .../muyu/data/remote/RemoteFenceService.java | 21 ++++ .../com/muyu/data/service/DataService.java | 4 + .../data/service/impl/DataServiceImpl.java | 9 ++ .../com/muyu/data/util/InitDataRedis.java | 57 ++++++++++ .../main/java/com/muyu/data/util/Receive.java | 43 +++++++ .../java/com/muyu/data/util/ReceiveTwo.java | 56 ++++++++++ .../domain/req/ElectroicFenceListReq.java | 2 + .../muyu/system/CloudSystemApplication.java | 4 +- .../service/impl/SysUserServiceImpl.java | 3 +- cloud-modules/cloud-saas/pom.xml | 105 ------------------ .../java/com/muyu/saas/SaasApplication.java | 19 ---- .../muyu/saas/controller/SaaSController.java | 64 ----------- .../java/com/muyu/saas/domain/Datasource.java | 26 ----- .../java/com/muyu/saas/mapper/SaaSMapper.java | 8 -- .../com/muyu/saas/service/SaasService.java | 8 -- .../saas/service/impl/SaasServiceImpl.java | 18 --- .../cloud-saas/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 -------------- .../src/main/resources/mapper/SaasMapper.xml | 8 -- cloud-modules/pom.xml | 3 +- 32 files changed, 392 insertions(+), 561 deletions(-) create mode 100644 cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/init/InitDataSource.java create mode 100644 cloud-modules/cloud-data/src/main/java/com/muyu/data/controller/DataController.java create mode 100644 cloud-modules/cloud-data/src/main/java/com/muyu/data/domian/Event.java create mode 100644 cloud-modules/cloud-data/src/main/java/com/muyu/data/mapper/DataMapper.java create mode 100644 cloud-modules/cloud-data/src/main/java/com/muyu/data/remote/RemoteCarService.java create mode 100644 cloud-modules/cloud-data/src/main/java/com/muyu/data/remote/RemoteFenceService.java create mode 100644 cloud-modules/cloud-data/src/main/java/com/muyu/data/service/DataService.java create mode 100644 cloud-modules/cloud-data/src/main/java/com/muyu/data/service/impl/DataServiceImpl.java create mode 100644 cloud-modules/cloud-data/src/main/java/com/muyu/data/util/InitDataRedis.java create mode 100644 cloud-modules/cloud-data/src/main/java/com/muyu/data/util/Receive.java create mode 100644 cloud-modules/cloud-data/src/main/java/com/muyu/data/util/ReceiveTwo.java delete mode 100644 cloud-modules/cloud-saas/pom.xml delete mode 100644 cloud-modules/cloud-saas/src/main/java/com/muyu/saas/SaasApplication.java delete mode 100644 cloud-modules/cloud-saas/src/main/java/com/muyu/saas/controller/SaaSController.java delete mode 100644 cloud-modules/cloud-saas/src/main/java/com/muyu/saas/domain/Datasource.java delete mode 100644 cloud-modules/cloud-saas/src/main/java/com/muyu/saas/mapper/SaaSMapper.java delete mode 100644 cloud-modules/cloud-saas/src/main/java/com/muyu/saas/service/SaasService.java delete mode 100644 cloud-modules/cloud-saas/src/main/java/com/muyu/saas/service/impl/SaasServiceImpl.java delete mode 100644 cloud-modules/cloud-saas/src/main/resources/banner.txt delete mode 100644 cloud-modules/cloud-saas/src/main/resources/bootstrap.yml delete mode 100644 cloud-modules/cloud-saas/src/main/resources/logback/dev.xml delete mode 100644 cloud-modules/cloud-saas/src/main/resources/logback/prod.xml delete mode 100644 cloud-modules/cloud-saas/src/main/resources/logback/test.xml delete mode 100644 cloud-modules/cloud-saas/src/main/resources/mapper/SaasMapper.xml diff --git a/cloud-common/cloud-common-saas/pom.xml b/cloud-common/cloud-common-saas/pom.xml index 41b57fd..10ef7ae 100644 --- a/cloud-common/cloud-common-saas/pom.xml +++ b/cloud-common/cloud-common-saas/pom.xml @@ -29,8 +29,10 @@ com.muyu cloud-common-security - - + + com.mysql + mysql-connector-j + diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java index 8ea974e..0f44ac6 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java @@ -6,17 +6,20 @@ import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; import com.muyu.cloud.common.many.datasource.constents.DatasourceContent; import com.muyu.cloud.common.many.datasource.domain.model.DataSourceInfo; import com.muyu.cloud.common.many.datasource.factory.DruidDataSourceFactory; +import com.muyu.cloud.common.many.datasource.init.InitDataSource; import com.muyu.cloud.common.many.datasource.role.DynamicDataSource; +import com.muyu.cloud.common.saas.domain.Datasource; import com.muyu.cloud.common.saas.domain.model.EntInfo; import com.muyu.cloud.common.saas.exception.SaaSException; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.SpringUtils; -import com.muyu.common.system.domain.Datasource; + import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.RemoteSaaSService; -import com.muyu.common.system.remote.RemoteUserService; + import lombok.extern.log4j.Log4j2; import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -38,9 +41,14 @@ import java.util.Map; @Component @AutoConfiguration(before = {MybatisPlusAutoConfiguration.class, MybatisAutoConfiguration.class}) public class ManyDataSource implements ApplicationRunner{ + + @Autowired + private InitDataSource initDataSource; + + private List dataSourceInfoList(){ RemoteSaaSService remoteSaaSService = SpringUtils.getBean(RemoteSaaSService.class); -Result> tableDataInfoResult = remoteSaaSService.findDatabaseList(); + Result> tableDataInfoResult = initDataSource.initDatasource(); if (tableDataInfoResult==null){ throw new SaaSException("saas远调数据源错误"); } diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/init/InitDataSource.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/init/InitDataSource.java new file mode 100644 index 0000000..10da596 --- /dev/null +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/init/InitDataSource.java @@ -0,0 +1,59 @@ +package com.muyu.cloud.common.many.datasource.init; + + +import com.muyu.cloud.common.saas.domain.Datasource; +import com.muyu.common.core.domain.Result; +import com.muyu.common.system.domain.Firm; +import lombok.extern.log4j.Log4j2; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Component; + +import java.sql.*; +import java.util.ArrayList; +import java.util.List; + +@Component +@Log4j2 +public class InitDataSource { + + public static final String USER="root"; + public static final String PASSWORD="Lw030106"; + + @Bean + @Primary + public Result> initDatasource(){ + ArrayList list = new ArrayList<>(); + + try { + DriverManager.registerDriver(new com.mysql.cj.jdbc.Driver()); + Connection connection= DriverManager.getConnection("jdbc:mysql://47.101.53.251:3306/datasource?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT&useSSL=false",USER,PASSWORD); + String sql="select * from `datasource` "; + + Statement stmt = connection.createStatement(); + ResultSet rs = stmt.executeQuery(sql); + + while (rs.next()){ + Datasource datasource = new Datasource(); + datasource.setId(rs.getInt("id")); + datasource.setFirmName(rs.getString("firm_name")); + datasource.setDatabaseName(rs.getString("database_name")); + list.add(datasource); + } + + } catch (SQLException e) { + throw new RuntimeException(e); + } + return Result.success(list); + }; + + + + + + + + + + +} diff --git a/cloud-modules/cloud-data/pom.xml b/cloud-modules/cloud-data/pom.xml index 1a7cdb5..83b9abc 100644 --- a/cloud-modules/cloud-data/pom.xml +++ b/cloud-modules/cloud-data/pom.xml @@ -86,6 +86,23 @@ com.muyu cloud-common-api-doc + + com.muyu + cloud-modules-car + 3.6.3 + + + com.muyu + cloud-modules-fence + 3.6.3 + compile + + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.1.0 + diff --git a/cloud-modules/cloud-data/src/main/java/com/muyu/data/DataApplication.java b/cloud-modules/cloud-data/src/main/java/com/muyu/data/DataApplication.java index 8a5c578..617e6ce 100644 --- a/cloud-modules/cloud-data/src/main/java/com/muyu/data/DataApplication.java +++ b/cloud-modules/cloud-data/src/main/java/com/muyu/data/DataApplication.java @@ -3,9 +3,11 @@ package com.muyu.data; import com.muyu.common.security.annotation.EnableMyFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication @EnableMyFeignClients +@EnableFeignClients public class DataApplication { public static void main(String[] args) { SpringApplication.run(DataApplication.class,args); diff --git a/cloud-modules/cloud-data/src/main/java/com/muyu/data/controller/DataController.java b/cloud-modules/cloud-data/src/main/java/com/muyu/data/controller/DataController.java new file mode 100644 index 0000000..0d35d20 --- /dev/null +++ b/cloud-modules/cloud-data/src/main/java/com/muyu/data/controller/DataController.java @@ -0,0 +1,30 @@ +package com.muyu.data.controller; + +import com.muyu.data.service.DataService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("data") +public class DataController { + + @Autowired + private DataService dataService; + + + + + + + + + + + + + + + +} diff --git a/cloud-modules/cloud-data/src/main/java/com/muyu/data/domian/Event.java b/cloud-modules/cloud-data/src/main/java/com/muyu/data/domian/Event.java new file mode 100644 index 0000000..73593fe --- /dev/null +++ b/cloud-modules/cloud-data/src/main/java/com/muyu/data/domian/Event.java @@ -0,0 +1,42 @@ +package com.muyu.data.domian; + + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import jakarta.validation.constraints.NotBlank; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = false) +@TableName("event") +public class Event { + + @TableId(value ="event_id" ) + @Excel(name = "事件id") + private Integer eventId; + + @Excel(name = "事件名称") + private String eventName; + + @Excel(name = "车辆vin") + private String carVin; + + private String createBy; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + + +} diff --git a/cloud-modules/cloud-data/src/main/java/com/muyu/data/mapper/DataMapper.java b/cloud-modules/cloud-data/src/main/java/com/muyu/data/mapper/DataMapper.java new file mode 100644 index 0000000..5c32786 --- /dev/null +++ b/cloud-modules/cloud-data/src/main/java/com/muyu/data/mapper/DataMapper.java @@ -0,0 +1,8 @@ +package com.muyu.data.mapper; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface DataMapper { + +} diff --git a/cloud-modules/cloud-data/src/main/java/com/muyu/data/remote/RemoteCarService.java b/cloud-modules/cloud-data/src/main/java/com/muyu/data/remote/RemoteCarService.java new file mode 100644 index 0000000..faf0da9 --- /dev/null +++ b/cloud-modules/cloud-data/src/main/java/com/muyu/data/remote/RemoteCarService.java @@ -0,0 +1,23 @@ +package com.muyu.data.remote; + +import com.muyu.common.core.domain.Result; +import com.muyu.domain.req.SysCarReq; +import com.muyu.domain.resp.SysCarVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +@FeignClient(name = "cloud-car") +public interface RemoteCarService { + + + @PostMapping("/car/selectSysCarVoList") + public Result> selectSysCarVoList( + @RequestBody SysCarReq sysCarReq); + + + + +} diff --git a/cloud-modules/cloud-data/src/main/java/com/muyu/data/remote/RemoteFenceService.java b/cloud-modules/cloud-data/src/main/java/com/muyu/data/remote/RemoteFenceService.java new file mode 100644 index 0000000..a31f991 --- /dev/null +++ b/cloud-modules/cloud-data/src/main/java/com/muyu/data/remote/RemoteFenceService.java @@ -0,0 +1,21 @@ +package com.muyu.data.remote; + +import com.muyu.common.core.domain.Result; +import com.muyu.fence.domain.req.ElectronicFenceGroupListReq; +import com.muyu.fence.domain.resp.GroupFenceListresp; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +@FeignClient(name = "cloud-fence") +public interface RemoteFenceService { + + @PostMapping("/fence/selectGroupList") + public Result> selectGroupList( + @RequestBody ElectronicFenceGroupListReq req); + + + +} diff --git a/cloud-modules/cloud-data/src/main/java/com/muyu/data/service/DataService.java b/cloud-modules/cloud-data/src/main/java/com/muyu/data/service/DataService.java new file mode 100644 index 0000000..81d0533 --- /dev/null +++ b/cloud-modules/cloud-data/src/main/java/com/muyu/data/service/DataService.java @@ -0,0 +1,4 @@ +package com.muyu.data.service; + +public interface DataService { +} diff --git a/cloud-modules/cloud-data/src/main/java/com/muyu/data/service/impl/DataServiceImpl.java b/cloud-modules/cloud-data/src/main/java/com/muyu/data/service/impl/DataServiceImpl.java new file mode 100644 index 0000000..7549a84 --- /dev/null +++ b/cloud-modules/cloud-data/src/main/java/com/muyu/data/service/impl/DataServiceImpl.java @@ -0,0 +1,9 @@ +package com.muyu.data.service.impl; + +import org.springframework.stereotype.Service; + +@Service +public class DataServiceImpl { + + +} diff --git a/cloud-modules/cloud-data/src/main/java/com/muyu/data/util/InitDataRedis.java b/cloud-modules/cloud-data/src/main/java/com/muyu/data/util/InitDataRedis.java new file mode 100644 index 0000000..0f6cc57 --- /dev/null +++ b/cloud-modules/cloud-data/src/main/java/com/muyu/data/util/InitDataRedis.java @@ -0,0 +1,57 @@ +package com.muyu.data.util; + +import com.muyu.common.core.domain.Result; +import com.muyu.data.remote.RemoteCarService; +import com.muyu.data.remote.RemoteFenceService; +import com.muyu.domain.resp.SysCarVo; +import com.muyu.fence.domain.resp.GroupFenceListresp; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; + +@Component +public class InitDataRedis implements ApplicationRunner { + + + @Resource + private RedisTemplate redisTemplate; + @Autowired + private RemoteCarService remoteCarService; + @Autowired + private RemoteFenceService remoteFenceService; + + @Override + public void run(ApplicationArguments args) throws Exception { + + //查询数控库中的车辆列表基本信息 + Result> sysCarVoListResult = remoteCarService.selectSysCarVoList(null); + List sysCarVoList = sysCarVoListResult.getData(); + //将全部信息存入redis中 + for (SysCarVo sysCarVo : sysCarVoList) { + String carVin = sysCarVo.getCarVin(); + redisTemplate.opsForValue().set("four:car:"+carVin,sysCarVo); + } + + //查询车辆围栏组列表信息 + Result> groupListResult = remoteFenceService.selectGroupList(null); + List groupFenceList = groupListResult.getData(); + //将去全部信息存入redis中 + for (GroupFenceListresp groupFenceListresp : groupFenceList) { + Long id = groupFenceListresp.getId(); + redisTemplate.opsForValue().set("four:fenceGroup:"+id,groupFenceListresp); + } + + + + + + + + + } +} diff --git a/cloud-modules/cloud-data/src/main/java/com/muyu/data/util/Receive.java b/cloud-modules/cloud-data/src/main/java/com/muyu/data/util/Receive.java new file mode 100644 index 0000000..69e01cf --- /dev/null +++ b/cloud-modules/cloud-data/src/main/java/com/muyu/data/util/Receive.java @@ -0,0 +1,43 @@ +package com.muyu.data.util; + + +import org.eclipse.paho.client.mqttv3.MqttClient; +import org.eclipse.paho.client.mqttv3.MqttConnectOptions; +import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; + +public class Receive { + + public static MqttClient mqttClient= null; + private static MemoryPersistence memoryPersistence=null; + private static MqttConnectOptions mqttConnectOptions=null; + + private static String ClientName=""; + + private static String IP=""; + + public static void main(String[] args) { + + } + + public static void start(String clientId){ + //初始化连接设置对象 + mqttConnectOptions = new MqttConnectOptions(); + //设置是否情 + + + } + + + + + + + + + + + + + + +} diff --git a/cloud-modules/cloud-data/src/main/java/com/muyu/data/util/ReceiveTwo.java b/cloud-modules/cloud-data/src/main/java/com/muyu/data/util/ReceiveTwo.java new file mode 100644 index 0000000..d7d89bf --- /dev/null +++ b/cloud-modules/cloud-data/src/main/java/com/muyu/data/util/ReceiveTwo.java @@ -0,0 +1,56 @@ +package com.muyu.data.util; + +import org.eclipse.paho.client.mqttv3.*; + +public class ReceiveTwo { + + public static void main(String[] args) { + String topic = "vehicle"; + String broker = "tcp://47.101.53.251:1883"; + String clientId="lxy"; + + try { + MqttClient mqttClient= new MqttClient(broker,clientId); + MqttConnectOptions connectOptions=new MqttConnectOptions(); + connectOptions.setCleanSession(true); + System.out.println("Connecting to broker：" + broker); + mqttClient.connect(connectOptions); + + System.out.println("已连接"); + + mqttClient.setCallback(new MqttCallback(){ + + + @Override + public void connectionLost(Throwable throwable) { + System.out.println("Connect lost!"); + } + + @Override + public void messageArrived(String s, MqttMessage mqttMessage) throws Exception { + System.out.println("Message arrived. topic:"+topic); + } + + @Override + public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) { + + } + }); + + mqttClient.subscribe(topic); + System.out.println("Subscribed to topic " + topic); + } catch (MqttException e) { + System.out.println("reason "+e.getReasonCode()); + System.out.println("msg " +e.getMessage()); + System.out.println("loc " +e.getLocalizedMessage()); + System.out.println("cause "+e.getCause()); + System.out.println("excep "+e); + e.printStackTrace(); + } + + + } + + + +} diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceListReq.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceListReq.java index cbfbf85..c593c32 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceListReq.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/domain/req/ElectroicFenceListReq.java @@ -20,6 +20,8 @@ import java.util.Date; @NoArgsConstructor public class ElectroicFenceListReq { + + /** * 围栏名称 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java index bcc52f2..d2db648 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java @@ -18,7 +18,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @EnableMyFeignClients @SpringBootApplication public class CloudSystemApplication { - public static void main (String[] args) { - SpringApplication.run(CloudSystemApplication.class, args); + public static void main(String[] args) { + SpringApplication.run(CloudSystemApplication.class, args); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java index b111cf0..6b8fbd0 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -96,7 +96,7 @@ public class SysUserServiceImpl extends ServiceImpl impl /** * 通过用户名查询用户 * - * @param userName 用户名 + * @param * * @return 用户对象信息 */ @@ -105,7 +105,6 @@ public class SysUserServiceImpl extends ServiceImpl impl String databaseName = firm.getDatabaseName(); String userName = firm.getUserName(); - String user="root"; String password="Lw030106"; SysUser sysUser=new SysUser(); diff --git a/cloud-modules/cloud-saas/pom.xml b/cloud-modules/cloud-saas/pom.xml deleted file mode 100644 index be2c706..0000000 --- a/cloud-modules/cloud-saas/pom.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - com.muyu - cloud-modules - 3.6.3 - - - 4.0.0 - - cloud-saas - - - cloud-saas - - - - - - - org.springframework.cloud - spring-cloud-starter-bootstrap - 4.1.2 - - - - - - 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 - - - - - com.mysql - mysql-connector-j - - - - - com.muyu - cloud-common-datasource - - - - - com.muyu - cloud-common-datascope - - - - - com.muyu - cloud-common-log - - - - - com.muyu - cloud-common-api-doc - - - - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - diff --git a/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/SaasApplication.java b/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/SaasApplication.java deleted file mode 100644 index bd05b75..0000000 --- a/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/SaasApplication.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.muyu.saas; - -import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; - -@SpringBootApplication -@EnableMyFeignClients -@MapperScan(value = "com.muyu.saas.mapper") -public class SaasApplication { - - public static void main(String[] args) { - SpringApplication.run(SaasApplication.class,args); - } - -} diff --git a/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/controller/SaaSController.java b/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/controller/SaaSController.java deleted file mode 100644 index e7816f3..0000000 --- a/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/controller/SaaSController.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.muyu.saas.controller; - -import com.muyu.common.core.domain.Result; -import com.muyu.saas.domain.Datasource; -import com.muyu.saas.service.SaasService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("saas") -public class SaaSController { - - @Autowired - private SaasService saasService; - - /** - * 数据源查询 - * @return - */ - @GetMapping("findDatabaseList") - public Result> findDatabaseList(){ - List list=saasService.list(); - return Result.success(list); - }; - - /** - * 数据源添加 - * @param datasource - * @return - */ - @PostMapping("addDatasource") - public Result addDatasource(@RequestBody Datasource datasource){ - saasService.save(datasource); - return Result.success("添加成功"); - }; - - - @PostMapping("updDatasource") - public Result updDatasource(@RequestBody Datasource datasource){ - saasService.updateById(datasource); - return Result.success("修改成功"); - } - - /** - * 删除成功 - * @param id - * @return - */ - @PostMapping("delDatasource/{id}") - public Result delDatasource(@PathVariable("id") Integer id){ - saasService.removeById(id); - return Result.success("删除成功"); - } - - - - - - - -} diff --git a/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/domain/Datasource.java b/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/domain/Datasource.java deleted file mode 100644 index 7a5d3cd..0000000 --- a/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/domain/Datasource.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.muyu.saas.domain; - - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@TableName(value = "datasource", autoResultMap = true) -public class Datasource { - - @TableId(value = "id",type = IdType.AUTO) - private Integer id; - - public String firmName; - - public String databaseName; - - - -} diff --git a/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/mapper/SaaSMapper.java b/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/mapper/SaaSMapper.java deleted file mode 100644 index d02f958..0000000 --- a/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/mapper/SaaSMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.muyu.saas.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.saas.domain.Datasource; - -public interface SaaSMapper extends BaseMapper { - -} diff --git a/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/service/SaasService.java b/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/service/SaasService.java deleted file mode 100644 index 237f876..0000000 --- a/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/service/SaasService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.muyu.saas.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.saas.domain.Datasource; - -public interface SaasService extends IService { - -} diff --git a/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/service/impl/SaasServiceImpl.java b/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/service/impl/SaasServiceImpl.java deleted file mode 100644 index 500c492..0000000 --- a/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/service/impl/SaasServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.muyu.saas.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.saas.domain.Datasource; -import com.muyu.saas.mapper.SaaSMapper; -import com.muyu.saas.service.SaasService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class SaasServiceImpl extends ServiceImpl implements SaasService { - - @Autowired - private SaaSMapper saaSMapper; - - - -} diff --git a/cloud-modules/cloud-saas/src/main/resources/banner.txt b/cloud-modules/cloud-saas/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/cloud-modules/cloud-saas/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-saas/src/main/resources/bootstrap.yml b/cloud-modules/cloud-saas/src/main/resources/bootstrap.yml deleted file mode 100644 index 73bf9aa..0000000 --- a/cloud-modules/cloud-saas/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,56 +0,0 @@ -# Tomcat -server: - port: 9523 - -# nacos线上地址 -nacos: - addr: 47.101.53.251:8848 - user-name: nacos - password: nacos - namespace: four - -# Spring -spring: - application: - # 应用名称 - name: cloud-saas - 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-modules/cloud-saas/src/main/resources/logback/dev.xml b/cloud-modules/cloud-saas/src/main/resources/logback/dev.xml deleted file mode 100644 index 0ea8333..0000000 --- a/cloud-modules/cloud-saas/src/main/resources/logback/dev.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${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-modules/cloud-saas/src/main/resources/logback/prod.xml b/cloud-modules/cloud-saas/src/main/resources/logback/prod.xml deleted file mode 100644 index a8f7c06..0000000 --- a/cloud-modules/cloud-saas/src/main/resources/logback/prod.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${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-modules/cloud-saas/src/main/resources/logback/test.xml b/cloud-modules/cloud-saas/src/main/resources/logback/test.xml deleted file mode 100644 index a8f7c06..0000000 --- a/cloud-modules/cloud-saas/src/main/resources/logback/test.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${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-modules/cloud-saas/src/main/resources/mapper/SaasMapper.xml b/cloud-modules/cloud-saas/src/main/resources/mapper/SaasMapper.xml deleted file mode 100644 index 8f575e6..0000000 --- a/cloud-modules/cloud-saas/src/main/resources/mapper/SaasMapper.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index c49bd52..d0e5426 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -18,8 +18,7 @@ cloud-modules-wechat cloud-modules-breakdown cloud-modules-warn - cloud-saas - cloud-data + cloud-data cloud-modules