add tenant demo

service-backend/service-backend-biz/pom.xml

@@ -92,11 +92,11 @@
             <version>0.0.1</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.usky</groupId>
-            <artifactId>usky-module-demo-api</artifactId>
-            <version>0.0.1</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.usky</groupId>-->
+<!--            <artifactId>usky-module-demo-api</artifactId>-->
+<!--            <version>0.0.1</version>-->
+<!--        </dependency>-->
 
     </dependencies>
 

service-backend/service-backend-biz/src/main/java/com/usky/backend/BackendApplication.java

@@ -0,0 +1,27 @@
+package com.usky.backend;
+
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+
+/**
+ * 系统模块
+ * 
+ * @author ruoyi
+ */
+
+
+@EnableFeignClients(basePackages = "com.usky")
+@MapperScan(value = "com.usky.backend.mapper")
+@ComponentScan("com.usky")
+@SpringBootApplication
+public class BackendApplication
+{
+    public static void main(String[] args)
+    {
+        SpringApplication.run(BackendApplication.class, args);
+    }
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/MybatisGeneratorUtils.java → service-backend/service-backend-biz/src/main/java/com/usky/backend/MybatisGeneratorUtils.java

@@ -1,4 +1,4 @@
-package com.usky.backend.controller;//package com.usky.backend.controller;//package com.usky.dm.controller.web.business;//package com.usky.dm.controller.web;
+package com.usky.backend;//package com.usky.backend.controller;//package com.usky.dm.controller.web.business;//package com.usky.dm.controller.web;
 
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
@@ -43,16 +43,16 @@ public class MybatisGeneratorUtils {
         //2、数据源配置
         //修改数据源
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://47.111.81.118:3306/dm?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setUrl("jdbc:mysql://usky-cloud-mysql:3306/usky-cloud?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
         dsc.setDriverName("com.mysql.jdbc.Driver");
-        dsc.setUsername("root");
-        dsc.setPassword("Yt2021");
+        dsc.setUsername("usky");
+        dsc.setPassword("Yt#75Usky");
         mpg.setDataSource(dsc);
 
         // 3、包配置
         PackageConfig pc = new PackageConfig();
         pc.setParent("com.usky.backend");
-        pc.setController("controller.web");
+        pc.setController("controller");
         pc.setEntity("domain");
         pc.setMapper("mapper");
         pc.setService("service");
@@ -71,6 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
+//        strategy.setInclude("sys_tenant");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         strategy.setInclude("sys_config");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 

service-backend/service-backend-biz/src/main/java/com/usky/backend/RuoYiSystemApplication.java

@@ -1,37 +0,0 @@
-package com.usky.backend;
-
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.ComponentScan;
-
-/**
- * 系统模块
- * 
- * @author ruoyi
- */
-
-
-@EnableFeignClients(basePackages = "com.usky")
-@MapperScan(value = "com.usky.backend.mapper")
-@ComponentScan("com.usky")
-@SpringBootApplication
-public class RuoYiSystemApplication
-{
-    public static void main(String[] args)
-    {
-        SpringApplication.run(RuoYiSystemApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  永天测试模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
-    }
-}

service-backend/service-backend-biz/src/main/java/com/usky/backend/constant/SysConfigLoginEnum.java

@@ -0,0 +1,25 @@
+package com.usky.backend.constant;
+
+
+public enum SysConfigLoginEnum {
+
+	CONFIG_LOGIN_TITLE("tenant.login.title", "登录标题"),
+	CONFIG_LOGIN_LOGO("config.login.logo", "登录页logo"),
+	CONFIG_LOGIN_BACK_URL("config.login.backUrl", "登录页背景地址"),
+	CONFIG_LOGIN_FOOTER("config.login.footer", "登录页底部名称"),
+	CONFIG_LOGIN_ICON("config.login.icon", "标签页图标");
+
+	private String configKey;
+	private String configName;
+
+	SysConfigLoginEnum(String configKey,  String configName) {
+		this.configKey = configKey;
+		this.configName = configName;
+	}
+
+	public String getConfigKey() {
+		return configKey;
+	}
+
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/SysConfigController.java

@@ -0,0 +1,21 @@
+package com.usky.backend.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 参数配置表 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-29
+ */
+@Controller
+@RequestMapping("/sysConfig")
+public class SysConfigController {
+
+}
+

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/SysTenantController.java

@@ -0,0 +1,51 @@
+package com.usky.backend.controller;
+
+import com.usky.backend.domain.vo.SysConfigLoginVo;
+import com.usky.backend.domain.vo.SysConfigTenantVo;
+import com.usky.backend.service.SysTenantService;
+import com.usky.common.core.bean.ApiResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
+
+
+/**
+ * <p>
+ * 租户信息表 前端控制器
+ * </p>
+ *
+ * @since 2022-04-29
+ */
+@Controller
+@RequestMapping("/sysTenant")
+public class SysTenantController {
+
+    @Autowired
+    private SysTenantService sysTenantService;
+
+    /**
+     *  登录页面配置
+     * @param domain
+     * @return
+     */
+    @GetMapping("/getLoginConfig")
+    public ApiResult<SysConfigLoginVo> getLoginConfig(@RequestParam("domain") String domain) {
+        SysConfigLoginVo config = sysTenantService.getConfig(domain);
+        return ApiResult.success(config);
+    }
+
+    /**
+     *  通过租户ID获取配置
+     */
+    @GetMapping("/getTenantConfig")
+    public ApiResult<SysConfigTenantVo> getTenantConfig() {
+        Integer tenantId = 1; //TODO 通过
+        SysConfigTenantVo config = sysTenantService.getSysConfig(tenantId);
+        return ApiResult.success(config);
+    }
+
+
+}
+

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/TestController.java

@@ -1,8 +0,0 @@
-package com.usky.backend.controller;//package com.usky.backend.controller;
-//
-//
-//import org.springframework.web.bind.annotation.RestController;
-//
-//@RestController
-//public class TestController {
-//}

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/web/SysUserController.java

@@ -1,13 +1,8 @@
 package com.usky.backend.controller.web;
 
 
-import com.usky.common.core.bean.ApiResult;
-import com.usky.backend.domain.SysUser;
 import com.usky.backend.service.SysUserService;
-import com.usky.demo.RemoteUserService;
-import com.usky.demo.domain.SysUserVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -31,19 +26,19 @@ public class SysUserController {
     private SysUserService sysUserService;
 
 
-    @Autowired
-    private RemoteUserService remoteUserService;
-
-    public ApiResult<List<SysUser>> list(){
-        return ApiResult.success(sysUserService.list());
-    }
-
-
-    @GetMapping("feginTest")
-    public ApiResult<List<SysUserVO>> feginTest() {
-        ApiResult<List<SysUserVO>> test = remoteUserService.getByUserName("test");
-        List<SysUserVO> data = test.getData();
-        return test;
-    }
+//    @Autowired
+//    private RemoteUserService remoteUserService;
+//
+//    public ApiResult<List<SysUser>> list(){
+//        return ApiResult.success(sysUserService.list());
+//    }
+//
+//
+//    @GetMapping("feginTest")
+//    public ApiResult<List<SysUserVO>> feginTest() {
+//        ApiResult<List<SysUserVO>> test = remoteUserService.getByUserName("test");
+//        List<SysUserVO> data = test.getData();
+//        return test;
+//    }
 }
 

service-backend/service-backend-biz/src/main/java/com/usky/backend/domain/SysConfig.java

@@ -0,0 +1,83 @@
+package com.usky.backend.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 参数配置表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysConfig implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 参数主键
+     */
+    @TableId(value = "config_id", type = IdType.AUTO)
+    private Integer configId;
+
+    /**
+     * 参数名称
+     */
+    private String configName;
+
+    /**
+     * 参数键名
+     */
+    private String configKey;
+
+    /**
+     * 参数键值
+     */
+    private String configValue;
+
+    /**
+     * 系统内置（Y是 N否）
+     */
+    private String configType;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/domain/SysTenant.java

@@ -0,0 +1,108 @@
+package com.usky.backend.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 租户信息表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysTenant implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 租户ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 租户编号
+     */
+    private String tenantCode;
+
+    /**
+     * 租户名称
+     */
+    private String tenantName;
+
+    /**
+     * 租户负责人
+     */
+    private String tenantManager;
+
+    /**
+     * 租户类型（0 试用租户  1 正式租户）
+     */
+    private String tenantType;
+
+    /**
+     * 租户站点域名
+     */
+    private String domain;
+
+    /**
+     * 租户邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String phoneNumber;
+
+    /**
+     * 联系地址
+     */
+    private String address;
+
+    /**
+     * 有效期限
+     */
+    private String tenantTerm;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 租户状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/domain/vo/SysConfigLoginVo.java

@@ -0,0 +1,20 @@
+package com.usky.backend.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class SysConfigLoginVo implements Serializable {
+
+
+    private String domain;
+    private Integer tenantId;
+    private String loginTitle;
+    private String loginLogo;
+    private String loginBackImg;
+    private String loginFooter;
+    private String loginType;
+    private String loginIcon;
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/domain/vo/SysConfigTenantVo.java

@@ -0,0 +1,29 @@
+package com.usky.backend.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class SysConfigTenantVo implements Serializable {
+
+    private String domain;
+    private Integer tenantId;
+//    private String loginTitle;
+//    private String loginLogo;
+//    private String loginBackImg;
+//    private String loginFooter;
+//    private String loginType;
+//    private String loginIcon;
+    private String middleLogo;
+    private String middleBackUrl;
+    private String middleTitle;
+    private String middleFooter;
+    private String homeLogo;
+    private String homePageUrl;
+    private String homeLayout;
+    private String homeStyle;
+
+
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/mapper/SysConfigMapper.java

@@ -0,0 +1,16 @@
+package com.usky.backend.mapper;
+
+import com.usky.backend.domain.SysConfig;
+import com.usky.common.mvc.base.CrudMapper;
+
+/**
+ * <p>
+ * 参数配置表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-29
+ */
+public interface SysConfigMapper extends CrudMapper<SysConfig> {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/mapper/SysTenantMapper.java

@@ -0,0 +1,16 @@
+package com.usky.backend.mapper;
+
+import com.usky.backend.domain.SysTenant;
+import com.usky.common.mvc.base.CrudMapper;
+
+/**
+ * <p>
+ * 租户信息表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-29
+ */
+public interface SysTenantMapper extends CrudMapper<SysTenant> {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/SysConfigService.java

@@ -0,0 +1,16 @@
+package com.usky.backend.service;
+
+import com.usky.backend.domain.SysConfig;
+import com.usky.common.mvc.base.CrudService;
+
+/**
+ * <p>
+ * 参数配置表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-29
+ */
+public interface SysConfigService extends CrudService<SysConfig> {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/SysTenantService.java

@@ -0,0 +1,23 @@
+package com.usky.backend.service;
+
+import com.usky.backend.domain.SysTenant;
+import com.usky.backend.domain.vo.SysConfigLoginVo;
+import com.usky.backend.domain.vo.SysConfigTenantVo;
+import com.usky.common.mvc.base.CrudService;
+
+/**
+ * <p>
+ * 租户信息表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-29
+ */
+public interface SysTenantService extends CrudService<SysTenant> {
+
+
+    SysConfigLoginVo getConfig(String domain);
+
+    SysConfigTenantVo getSysConfig(Integer tenantId);
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/SysConfigServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.backend.service.impl;
+
+import com.usky.backend.domain.SysConfig;
+import com.usky.backend.mapper.SysConfigMapper;
+import com.usky.backend.service.SysConfigService;
+import com.usky.common.mvc.base.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 参数配置表 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-29
+ */
+@Service
+public class SysConfigServiceImpl extends AbstractCrudService<SysConfigMapper, SysConfig> implements SysConfigService {
+
+}

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/SysTenantServiceImpl.java

@@ -0,0 +1,72 @@
+package com.usky.backend.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.backend.constant.SysConfigLoginEnum;
+import com.usky.backend.domain.SysConfig;
+import com.usky.backend.domain.SysTenant;
+import com.usky.backend.domain.vo.SysConfigLoginVo;
+import com.usky.backend.domain.vo.SysConfigTenantVo;
+import com.usky.backend.mapper.SysConfigMapper;
+import com.usky.backend.mapper.SysTenantMapper;
+import com.usky.backend.service.SysTenantService;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.mvc.base.AbstractCrudService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 租户信息表 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-04-29
+ */
+@Service
+public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, SysTenant> implements SysTenantService {
+
+    @Autowired
+    private SysConfigMapper sysConfigMapper;
+
+
+    public SysConfigLoginVo getConfig( String domain) {
+        SysConfigLoginVo sysConfigLoginVo = new SysConfigLoginVo();
+        LambdaQueryWrapper<SysTenant> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(SysTenant::getDomain,domain.trim());
+        SysTenant sysTenant = this.getOne(queryWrapper);
+        if (null == sysTenant) {
+           return sysConfigLoginVo;
+        }
+        Integer tenantId = sysTenant.getId();
+        LambdaQueryWrapper<SysConfig> configWrapper = Wrappers.lambdaQuery();
+        configWrapper.eq(SysConfig::getTenantId,tenantId);
+        List<SysConfig> sysConfigs = sysConfigMapper.selectList(configWrapper);
+//        sysConfigs.stream().forEach(sysConfig -> {
+//            String configKey = sysConfig.getConfigKey();
+//            switch (configKey) {
+//                case SysConfigLoginEnum.CONFIG_LOGIN_BACK_URL.getConfigKey():
+//                     sysConfigLoginVo.setLoginTitle(sysConfig.getConfigValue());
+//                    break;
+//                case SysConfigLoginEnum.CONFIG_LOGIN_LOGO.getConfigKey():
+//                     sysConfigLoginVo.setLoginLogo(sysConfig.getConfigValue());
+//                    break;
+//                default:
+//            }
+//        });
+        return sysConfigLoginVo;
+    }
+
+    public SysConfigTenantVo getSysConfig(Integer tenantId) {
+        SysConfigTenantVo sysConfigLoginVo = new SysConfigTenantVo();
+        LambdaQueryWrapper<SysConfig> configWrapper = Wrappers.lambdaQuery();
+        configWrapper.eq(SysConfig::getTenantId,tenantId);
+        List<SysConfig> sysConfigs = sysConfigMapper.selectList(configWrapper);
+        return sysConfigLoginVo;
+    }
+
+}

service-backend/service-backend-biz/src/main/resources/mapper.backend/SysConfigMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.backend.mapper.SysConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.backend.domain.SysConfig">
+        <id column="config_id" property="configId" />
+        <result column="config_name" property="configName" />
+        <result column="config_key" property="configKey" />
+        <result column="config_value" property="configValue" />
+        <result column="config_type" property="configType" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="remark" property="remark" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>

service-backend/service-backend-biz/src/main/resources/mapper.backend/SysTenantMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.backend.mapper.SysTenantMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.backend.domain.SysTenant">
+        <id column="id" property="id" />
+        <result column="tenant_code" property="tenantCode" />
+        <result column="tenant_name" property="tenantName" />
+        <result column="tenant_manager" property="tenantManager" />
+        <result column="tenant_type" property="tenantType" />
+        <result column="domain" property="domain" />
+        <result column="email" property="email" />
+        <result column="phone_number" property="phoneNumber" />
+        <result column="address" property="address" />
+        <result column="tenant_term" property="tenantTerm" />
+        <result column="remark" property="remark" />
+        <result column="status" property="status" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+</mapper>