fix SAAS

zhongzheng-framework/src/main/java/com/zhongzheng/framework/mybatisplus/CustomTenantLineHandler.java

@@ -1,7 +1,13 @@
 package com.zhongzheng.framework.mybatisplus;
 
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpStatus;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.ServletUtils;
+import lombok.SneakyThrows;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;
 import org.apache.commons.compress.utils.Lists;
@@ -33,6 +39,7 @@ public class CustomTenantLineHandler implements TenantLineHandler {
         add("super_sys_user_role");
         add("tables");
         add("columns");
+        add("sys_logininfor");
     }};
 
     /**
@@ -40,9 +47,18 @@ public class CustomTenantLineHandler implements TenantLineHandler {
      *
      * @return
      */
+    @SneakyThrows
     @Override
     public Expression getTenantId() {
-        return new LongValue(ServletUtils.getRequest().getHeader("TenantId"));
+        String TenantId = ServletUtils.getRequest().getHeader("TenantId");
+        if(!StrUtil.isNotBlank(TenantId)){
+            int code = HttpStatus.HTTP_UNAVAILABLE;
+            String msg = "企业非法访问";
+            ServletUtils.renderString( ServletUtils.getResponse(), JSON.toJSONString(AjaxResult.error(code, msg)));
+            ServletUtils.getResponse().getWriter().flush();
+            ServletUtils.getResponse().getWriter().close();
+        }
+        return new LongValue(TenantId);
     }
 
     /**

zhongzheng-framework/src/main/java/com/zhongzheng/framework/security/filter/JwtAuthenticationTokenFilter.java

@@ -1,7 +1,11 @@
 package com.zhongzheng.framework.security.filter;
 
 import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpStatus;
 import com.zhongzheng.common.core.domain.model.SuperLoginUser;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.SuperTokenService;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.common.core.domain.model.LoginUser;

zhongzheng-framework/src/main/java/com/zhongzheng/framework/security/handle/AuthenticationEntryPointImpl.java

@@ -4,7 +4,9 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpStatus;
 import com.alibaba.fastjson.JSON;
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.ServletUtils;
+import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.stereotype.Component;

zhongzheng-saas-admin/src/main/java/com/zhongzheng/controller/system/SuperSysLoginController.java

@@ -25,7 +25,6 @@ import java.util.*;
  * @author zhongzheng
  */
 @Api(tags ="登录用户操作管理")
-@ApiSupport(order = 2)
 @RestController
 public class SuperSysLoginController
 {

zhongzheng-saas-admin/src/main/java/com/zhongzheng/controller/system/SysTenantController.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.controller.system;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.system.bo.SysTenantAddBo;
+import com.zhongzheng.modules.system.bo.SysTenantEditBo;
+import com.zhongzheng.modules.system.bo.SysTenantQueryBo;
+import com.zhongzheng.modules.system.service.ISysTenantService;
+import com.zhongzheng.modules.system.vo.SysTenantVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 系统商户Controller
+ *
+ * @author hjl
+ * @date 2021-08-03
+ */
+@Api(value = "系统商户控制器", tags = {"系统商户管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/tenant")
+public class SysTenantController extends BaseController {
+
+    private final ISysTenantService iSysTenantService;
+
+    /**
+     * 查询系统商户列表
+     */
+    @ApiOperation("查询系统商户列表")
+    @PreAuthorize("@ss.hasPermi('system:tenant:list')")
+    @GetMapping("/list")
+    public TableDataInfo<SysTenantVo> list(SysTenantQueryBo bo) {
+        startPage();
+        List<SysTenantVo> list = iSysTenantService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出系统商户列表
+     */
+   /* @ApiOperation("导出系统商户列表")
+    @PreAuthorize("@ss.hasPermi('system:tenant:export')")
+    @Log(title = "系统商户", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<SysTenantVo> export(SysTenantQueryBo bo) {
+        List<SysTenantVo> list = iSysTenantService.queryList(bo);
+        ExcelUtil<SysTenantVo> util = new ExcelUtil<SysTenantVo>(SysTenantVo.class);
+        return util.exportExcel(list, "系统商户");
+    }*/
+
+    /**
+     * 获取系统商户详细信息
+     */
+    @ApiOperation("获取系统商户详细信息")
+    @PreAuthorize("@ss.hasPermi('system:tenant:query')")
+    @GetMapping("/{tenantId}")
+    public AjaxResult<SysTenantVo> getInfo(@PathVariable("tenantId" ) Long tenantId) {
+        return AjaxResult.success(iSysTenantService.queryById(tenantId));
+    }
+
+    /**
+     * 新增系统商户
+     */
+    @ApiOperation("新增系统商户")
+    @PreAuthorize("@ss.hasPermi('system:tenant:add')")
+    @Log(title = "系统商户", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody SysTenantAddBo bo) {
+        return toAjax(iSysTenantService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改系统商户
+     */
+    @ApiOperation("修改系统商户")
+    @PreAuthorize("@ss.hasPermi('system:tenant:edit')")
+    @Log(title = "系统商户", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody SysTenantEditBo bo) {
+        return toAjax(iSysTenantService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除系统商户
+     */
+   /* @ApiOperation("删除系统商户")
+    @PreAuthorize("@ss.hasPermi('system:tenant:remove')")
+    @Log(title = "系统商户" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{tenantIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] tenantIds) {
+        return toAjax(iSysTenantService.deleteWithValidByIds(Arrays.asList(tenantIds), true) ? 1 : 0);
+    }*/
+}

zhongzheng-saas-admin/src/main/java/com/zhongzheng/core/config/SwaggerConfig.java

@@ -115,9 +115,9 @@ public class SwaggerConfig
         // 用ApiInfoBuilder进行定制
         return new ApiInfoBuilder()
                 // 设置标题
-                .title("标题：中正云证书管理系统接口文档")
+                .title("标题：中正SAAS管理系统接口文档")
                 // 描述
-                .description("描述：用于中正证书管理系统接口文档")
+                .description("描述：用于中正SAAS管理系统接口文档")
                 // 作者信息
                 .contact(new Contact(ruoyiConfig.getName(), null, null))
                 // 版本

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/bo/SysTenantAddBo.java

@@ -0,0 +1,33 @@
+package com.zhongzheng.modules.system.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 系统商户添加对象 sys_tenant
+ *
+ * @author hjl
+ * @date 2021-08-03
+ */
+@Data
+@ApiModel("系统商户添加对象")
+public class SysTenantAddBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** 0 失效 1启用 */
+    @ApiModelProperty("0 失效 1启用")
+    private Integer status;
+    /** 名称 */
+    @ApiModelProperty("名称")
+    private String tenantName;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/bo/SysTenantEditBo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.system.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 系统商户编辑对象 sys_tenant
+ *
+ * @author hjl
+ * @date 2021-08-03
+ */
+@Data
+@ApiModel("系统商户编辑对象")
+public class SysTenantEditBo {
+
+
+    /** 租户ID */
+    @ApiModelProperty("租户ID")
+    private Long tenantId;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+    /** 0 失效 1启用 */
+    @ApiModelProperty("0 失效 1启用")
+    private Integer status;
+
+    /** 名称 */
+    @ApiModelProperty("名称")
+    private String tenantName;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/bo/SysTenantQueryBo.java

@@ -0,0 +1,46 @@
+package com.zhongzheng.modules.system.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 系统商户分页查询对象 sys_tenant
+ *
+ * @author hjl
+ * @date 2021-08-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("系统商户分页查询对象")
+public class SysTenantQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 0 失效 1启用 */
+	@ApiModelProperty("0 失效 1启用")
+	private Integer status;
+	/** 名称 */
+	@ApiModelProperty("名称")
+	private String tenantName;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/domain/SysTenant.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 系统商户对象 sys_tenant
+ *
+ * @author hjl
+ * @date 2021-08-03
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_tenant")
+public class SysTenant implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** 租户ID */
+    @TableId(value = "tenant_id")
+    private Long tenantId;
+
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+    /** 0 失效 1启用 */
+    private Integer status;
+
+    /** 名称 */
+    private String tenantName;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/mapper/SysTenantMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.system.domain.SysTenant;
+
+/**
+ * 系统商户Mapper接口
+ *
+ * @author hjl
+ * @date 2021-08-03
+ */
+public interface SysTenantMapper extends BaseMapper<SysTenant> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/ISysTenantService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.system.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.system.bo.SysTenantAddBo;
+import com.zhongzheng.modules.system.bo.SysTenantEditBo;
+import com.zhongzheng.modules.system.bo.SysTenantQueryBo;
+import com.zhongzheng.modules.system.domain.SysTenant;
+import com.zhongzheng.modules.system.vo.SysTenantVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 系统商户Service接口
+ *
+ * @author hjl
+ * @date 2021-08-03
+ */
+public interface ISysTenantService extends IService<SysTenant> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	SysTenantVo queryById(Long tenantId);
+
+	/**
+	 * 查询列表
+	 */
+	List<SysTenantVo> queryList(SysTenantQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入系统商户
+	 * @param bo 系统商户新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(SysTenantAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改系统商户
+	 * @param bo 系统商户编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(SysTenantEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysTenantServiceImpl.java

@@ -0,0 +1,104 @@
+package com.zhongzheng.modules.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.SnowflakeIdUtils;
+import com.zhongzheng.modules.system.bo.SysTenantAddBo;
+import com.zhongzheng.modules.system.bo.SysTenantEditBo;
+import com.zhongzheng.modules.system.bo.SysTenantQueryBo;
+import com.zhongzheng.modules.system.domain.SysTenant;
+import com.zhongzheng.modules.system.mapper.SysTenantMapper;
+import com.zhongzheng.modules.system.service.ISysTenantService;
+import com.zhongzheng.modules.system.vo.SysTenantVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 系统商户Service业务层处理
+ *
+ * @author hjl
+ * @date 2021-08-03
+ */
+@Service
+public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant> implements ISysTenantService {
+
+    @Override
+    public SysTenantVo queryById(Long tenantId){
+        SysTenant db = this.baseMapper.selectById(tenantId);
+        return BeanUtil.toBean(db, SysTenantVo.class);
+    }
+
+    @Override
+    public List<SysTenantVo> queryList(SysTenantQueryBo bo) {
+        LambdaQueryWrapper<SysTenant> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getStatus() != null, SysTenant::getStatus, bo.getStatus());
+        lqw.like(StrUtil.isNotBlank(bo.getTenantName()), SysTenant::getTenantName, bo.getTenantName());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<SysTenantVo> entity2Vo(Collection<SysTenant> collection) {
+        List<SysTenantVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, SysTenantVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<SysTenant> page = (Page<SysTenant>)collection;
+            Page<SysTenantVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(SysTenantAddBo bo) {
+        SysTenant add = BeanUtil.toBean(bo, SysTenant.class);
+        //雪花算法产生账号ID
+        SnowflakeIdUtils idWorker = new SnowflakeIdUtils(3, 1);
+        add.setTenantId(idWorker.nextId());
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(SysTenantEditBo bo) {
+        SysTenant update = BeanUtil.toBean(bo, SysTenant.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(SysTenant entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/vo/SysTenantVo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.system.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 系统商户视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-08-03
+ */
+@Data
+@ApiModel("系统商户视图对象")
+public class SysTenantVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 租户ID */
+	@ApiModelProperty("租户ID")
+	private Long tenantId;
+
+	/** 0 失效 1启用 */
+	@Excel(name = "0 失效 1启用")
+	@ApiModelProperty("0 失效 1启用")
+	private Integer status;
+	/** 名称 */
+	@Excel(name = "名称")
+	@ApiModelProperty("名称")
+	private String tenantName;
+
+}

zhongzheng-system/src/main/resources/mapper/modules/system/SysTenantMapper.xml

@@ -0,0 +1,16 @@
+<?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.zhongzheng.system.mapper.SysTenantMapper">
+
+    <resultMap type="com.zhongzheng.system.domain.SysTenant" id="SysTenantResult">
+        <result property="tenantId" column="tenant_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="tenantName" column="tenant_name"/>
+    </resultMap>
+
+
+</mapper>