From fce189d87f7a2f571918cc22506188169a7f06ca Mon Sep 17 00:00:00 2001 From: Liu Wu <2780205363@qq.com> Date: Mon, 23 Sep 2024 23:24:46 +0800 Subject: [PATCH] =?UTF-8?q?saas=E6=A8=A1=E5=9D=97=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/cloud/car/CarApplication.java | 25 -------- .../cloud/car/controller/CarController.java | 30 --------- .../com/muyu/cloud/car/mapper/CarMapper.java | 20 ------ .../muyu/cloud/car/service/CarService.java | 19 ------ .../car/service/impl/CarServiceImpl.java | 28 -------- .../src/main/resources/bootstrap.yml | 58 ----------------- .../{cloud-car => cloud-saas}/pom.xml | 28 ++++---- .../java/com/muyu/saas/SaasApplication.java | 19 ++++++ .../muyu/saas/controller/SaaSController.java | 64 +++++++++++++++++++ .../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 ++++++ .../src/main/resources/banner.txt | 0 .../src/main/resources/logback/dev.xml | 2 +- .../src/main/resources/logback/prod.xml | 2 +- .../src/main/resources/logback/test.xml | 2 +- .../src/main/resources/mapper/SaasMapper.xml} | 6 +- cloud-modules/pom.xml | 2 +- 19 files changed, 152 insertions(+), 213 deletions(-) delete mode 100644 cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/CarApplication.java delete mode 100644 cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/controller/CarController.java delete mode 100644 cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/mapper/CarMapper.java delete mode 100644 cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/service/CarService.java delete mode 100644 cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/service/impl/CarServiceImpl.java delete mode 100644 cloud-modules/cloud-car/src/main/resources/bootstrap.yml rename cloud-modules/{cloud-car => cloud-saas}/pom.xml (85%) create mode 100644 cloud-modules/cloud-saas/src/main/java/com/muyu/saas/SaasApplication.java create mode 100644 cloud-modules/cloud-saas/src/main/java/com/muyu/saas/controller/SaaSController.java rename cloud-modules/{cloud-car/src/main/java/com/muyu/cloud/car/domain/User.java => cloud-saas/src/main/java/com/muyu/saas/domain/Datasource.java} (51%) create mode 100644 cloud-modules/cloud-saas/src/main/java/com/muyu/saas/mapper/SaaSMapper.java create mode 100644 cloud-modules/cloud-saas/src/main/java/com/muyu/saas/service/SaasService.java create mode 100644 cloud-modules/cloud-saas/src/main/java/com/muyu/saas/service/impl/SaasServiceImpl.java rename cloud-modules/{cloud-car => cloud-saas}/src/main/resources/banner.txt (100%) rename cloud-modules/{cloud-car => cloud-saas}/src/main/resources/logback/dev.xml (98%) rename cloud-modules/{cloud-car => cloud-saas}/src/main/resources/logback/prod.xml (98%) rename cloud-modules/{cloud-car => cloud-saas}/src/main/resources/logback/test.xml (98%) rename cloud-modules/{cloud-car/src/main/resources/mapper/car/CarMapper.xml => cloud-saas/src/main/resources/mapper/SaasMapper.xml} (50%) diff --git a/cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/CarApplication.java b/cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/CarApplication.java deleted file mode 100644 index 0f333df..0000000 --- a/cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/CarApplication.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.muyu.cloud.car; - -import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure; -import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; - -@EnableCustomConfig -//@EnableCustomSwagger2 -@EnableMyFeignClients -@SpringBootApplication( - exclude = { - DataSourceAutoConfiguration.class, - DruidDataSourceAutoConfigure.class, - DynamicDataSourceAutoConfiguration.class - } -) -public class CarApplication { - public static void main(String[] args) { - SpringApplication.run(CarApplication.class, args); - } -} diff --git a/cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/controller/CarController.java b/cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/controller/CarController.java deleted file mode 100644 index 941a794..0000000 --- a/cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/controller/CarController.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.muyu.cloud.car.controller; - -import com.muyu.cloud.car.domain.User; -import com.muyu.cloud.car.service.CarService; -import com.muyu.common.core.web.controller.BaseController; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @Author WangXin - * @Data 2024/9/19 - * @Description 车控制层 - * @Version 1.0.0 - */ -@RestController -@RequestMapping("/test") -public class CarController extends BaseController { - - @Resource - private CarService carService; - - @GetMapping("/sel") - public List sel() { - return carService.list(); - } -} diff --git a/cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/mapper/CarMapper.java b/cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/mapper/CarMapper.java deleted file mode 100644 index 15ff31e..0000000 --- a/cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/mapper/CarMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.muyu.cloud.car.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.cloud.car.domain.User; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @Author WangXin - * @Data 2024/9/19 - * @Description - * @Version 1.0.0 - */ -public interface CarMapper extends BaseMapper { - - List selectMyList(); - - -} diff --git a/cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/service/CarService.java b/cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/service/CarService.java deleted file mode 100644 index 21f47ce..0000000 --- a/cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/service/CarService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.muyu.cloud.car.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.cloud.car.domain.User; - -import java.util.List; - -/** - * @Author WangXin - * @Data 2024/9/19 - * @Description - * @Version 1.0.0 - */ -public interface CarService extends IService { - - List selectList(); - - -} diff --git a/cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/service/impl/CarServiceImpl.java b/cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/service/impl/CarServiceImpl.java deleted file mode 100644 index 3d7446e..0000000 --- a/cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/service/impl/CarServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.muyu.cloud.car.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.cloud.car.domain.User; -import com.muyu.cloud.car.mapper.CarMapper; -import com.muyu.cloud.car.service.CarService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.List; - -/** - * @Author WangXin - * @Data 2024/9/19 - * @Description - * @Version 1.0.0 - */ -@Service -public class CarServiceImpl extends ServiceImpl implements CarService { - - @Resource - private CarMapper carMapper; - - @Override - public List selectList() { - return carMapper.selectMyList(); - } -} diff --git a/cloud-modules/cloud-car/src/main/resources/bootstrap.yml b/cloud-modules/cloud-car/src/main/resources/bootstrap.yml deleted file mode 100644 index e99b9c3..0000000 --- a/cloud-modules/cloud-car/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,58 +0,0 @@ -# Tomcat -server: - port: 49701 - -# nacos线上地址 -nacos: - addr: 47.101.53.251:8848 - user-name: nacos - password: nacos - namespace: four -# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all -# Spring -spring: - amqp: - deserialization: - trust: - all: true - main: - allow-bean-definition-overriding: true - 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} - - -logging: - level: - com.muyu.cloud.mapper: DEBUG diff --git a/cloud-modules/cloud-car/pom.xml b/cloud-modules/cloud-saas/pom.xml similarity index 85% rename from cloud-modules/cloud-car/pom.xml rename to cloud-modules/cloud-saas/pom.xml index 35cb0d7..be2c706 100644 --- a/cloud-modules/cloud-car/pom.xml +++ b/cloud-modules/cloud-saas/pom.xml @@ -1,28 +1,31 @@ - - 4.0.0 com.muyu cloud-modules 3.6.3 - cloud-car + 4.0.0 - - 17 - 17 - UTF-8 - + cloud-saas + + + cloud-saas + + - com.muyu - cloud-common-saas + org.springframework.cloud + spring-cloud-starter-bootstrap + 4.1.2 + + com.alibaba.cloud @@ -77,6 +80,9 @@ cloud-common-api-doc + + + 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 new file mode 100644 index 0000000..bd05b75 --- /dev/null +++ b/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/SaasApplication.java @@ -0,0 +1,19 @@ +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 new file mode 100644 index 0000000..e7816f3 --- /dev/null +++ b/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/controller/SaaSController.java @@ -0,0 +1,64 @@ +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-car/src/main/java/com/muyu/cloud/car/domain/User.java b/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/domain/Datasource.java similarity index 51% rename from cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/domain/User.java rename to cloud-modules/cloud-saas/src/main/java/com/muyu/saas/domain/Datasource.java index e8ae3cf..7a5d3cd 100644 --- a/cloud-modules/cloud-car/src/main/java/com/muyu/cloud/car/domain/User.java +++ b/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/domain/Datasource.java @@ -1,28 +1,26 @@ -package com.muyu.cloud.car.domain; +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.Builder; import lombok.Data; import lombok.NoArgsConstructor; -/** - * @Author WangXin - * @Data 2024/9/19 - * @Description - * @Version 1.0.0 - */ -@TableName("user") @Data -@Builder @AllArgsConstructor @NoArgsConstructor -public class User { +@TableName(value = "datasource", autoResultMap = true) +public class Datasource { + + @TableId(value = "id",type = IdType.AUTO) + private Integer id; + + public String firmName; + + public String databaseName; + - @TableId(type = IdType.AUTO) - private Integer userId; - private String userName; } 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 new file mode 100644 index 0000000..d02f958 --- /dev/null +++ b/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/mapper/SaaSMapper.java @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000..237f876 --- /dev/null +++ b/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/service/SaasService.java @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000..500c492 --- /dev/null +++ b/cloud-modules/cloud-saas/src/main/java/com/muyu/saas/service/impl/SaasServiceImpl.java @@ -0,0 +1,18 @@ +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-car/src/main/resources/banner.txt b/cloud-modules/cloud-saas/src/main/resources/banner.txt similarity index 100% rename from cloud-modules/cloud-car/src/main/resources/banner.txt rename to cloud-modules/cloud-saas/src/main/resources/banner.txt diff --git a/cloud-modules/cloud-car/src/main/resources/logback/dev.xml b/cloud-modules/cloud-saas/src/main/resources/logback/dev.xml similarity index 98% rename from cloud-modules/cloud-car/src/main/resources/logback/dev.xml rename to cloud-modules/cloud-saas/src/main/resources/logback/dev.xml index 621579c..0ea8333 100644 --- a/cloud-modules/cloud-car/src/main/resources/logback/dev.xml +++ b/cloud-modules/cloud-saas/src/main/resources/logback/dev.xml @@ -1,7 +1,7 @@ - + diff --git a/cloud-modules/cloud-car/src/main/resources/logback/prod.xml b/cloud-modules/cloud-saas/src/main/resources/logback/prod.xml similarity index 98% rename from cloud-modules/cloud-car/src/main/resources/logback/prod.xml rename to cloud-modules/cloud-saas/src/main/resources/logback/prod.xml index 2419bf9..a8f7c06 100644 --- a/cloud-modules/cloud-car/src/main/resources/logback/prod.xml +++ b/cloud-modules/cloud-saas/src/main/resources/logback/prod.xml @@ -1,7 +1,7 @@ - + diff --git a/cloud-modules/cloud-car/src/main/resources/logback/test.xml b/cloud-modules/cloud-saas/src/main/resources/logback/test.xml similarity index 98% rename from cloud-modules/cloud-car/src/main/resources/logback/test.xml rename to cloud-modules/cloud-saas/src/main/resources/logback/test.xml index 2419bf9..a8f7c06 100644 --- a/cloud-modules/cloud-car/src/main/resources/logback/test.xml +++ b/cloud-modules/cloud-saas/src/main/resources/logback/test.xml @@ -1,7 +1,7 @@ - + diff --git a/cloud-modules/cloud-car/src/main/resources/mapper/car/CarMapper.xml b/cloud-modules/cloud-saas/src/main/resources/mapper/SaasMapper.xml similarity index 50% rename from cloud-modules/cloud-car/src/main/resources/mapper/car/CarMapper.xml rename to cloud-modules/cloud-saas/src/main/resources/mapper/SaasMapper.xml index 06f84c1..8f575e6 100644 --- a/cloud-modules/cloud-car/src/main/resources/mapper/car/CarMapper.xml +++ b/cloud-modules/cloud-saas/src/main/resources/mapper/SaasMapper.xml @@ -2,9 +2,7 @@ - + + - diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index 11fa2cc..c917d3a 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -18,8 +18,8 @@ cloud-modules-car cloud-modules-wechat cloud-modules-breakdown - cloud-car cloud-modules-warn + cloud-saas cloud-modules