Merge remote-tracking branch 'origin/upgrade' into upgrade

refactor(工程): 调整工程代码结构
2025-04-11 19:33:52 +08:00 · 2025-04-11 19:30:06 +08:00 · 2025-04-11 19:28:20 +08:00 · 2025-04-11 19:22:49 +08:00 · 2025-04-11 14:39:54 +08:00
805 changed files with 2782 additions and 54644 deletions
--- a/ff-base/pom.xml
+++ b/ff-base/pom.xml
@ -1,207 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <artifactId>ff</artifactId>
        <groupId>com.ff</groupId>
        <version>0.0.1</version>
    </parent>
    <groupId>com.ff</groupId>
    <artifactId>ff-base</artifactId>
    <version>0.0.1</version>
    <name>ff-base</name>
    <description>ff-base</description>
    <dependencies>
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>com.dtflys.forest</groupId>
            <artifactId>forest-spring-boot-starter</artifactId>
            <version>1.6.3</version>
        </dependency>
        <!-- SpringBoot的依赖配置-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-dependencies</artifactId>
            <version>2.5.15</version>
            <type>pom</type>
            <scope>import</scope>
        </dependency>
        <!-- SpringBoot Web容器 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <!-- SpringBoot 拦截器 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-aop</artifactId>
        </dependency>
        <!-- 阿里数据库连接池 -->
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>druid-spring-boot-starter</artifactId>
        </dependency>
        <!-- 验证码 -->
        <dependency>
            <groupId>pro.fessional</groupId>
            <artifactId>kaptcha</artifactId>
        </dependency>
        <!-- 获取系统信息 -->
        <dependency>
            <groupId>com.github.oshi</groupId>
            <artifactId>oshi-core</artifactId>
        </dependency>
        <!-- Spring框架基本的核心工具 -->
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-context-support</artifactId>
        </dependency>
        <!-- SpringWeb模块 -->
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-web</artifactId>
        </dependency>
        <!-- spring security 安全认证 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-security</artifactId>
        </dependency>
        <!-- pagehelper 分页插件 -->
        <dependency>
            <groupId>com.github.pagehelper</groupId>
            <artifactId>pagehelper-spring-boot-starter</artifactId>
        </dependency>
        <!-- 自定义验证注解 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-validation</artifactId>
        </dependency>
        <!--常用工具类 -->
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
        </dependency>
        <!-- JSON工具类 -->
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
        </dependency>
        <!-- 阿里JSON解析器 -->
        <dependency>
            <groupId>com.alibaba.fastjson2</groupId>
            <artifactId>fastjson2</artifactId>
        </dependency>
        <!-- io常用工具类 -->
        <dependency>
            <groupId>commons-io</groupId>
            <artifactId>commons-io</artifactId>
        </dependency>
        <!-- excel工具 -->
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-ooxml</artifactId>
        </dependency>
        <!--http-->
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpclient</artifactId>
        </dependency>
        <dependency>
            <groupId>com.squareup.okhttp3</groupId>
            <artifactId>okhttp</artifactId>
        </dependency>
        <!-- yml解析器 -->
        <dependency>
            <groupId>org.yaml</groupId>
            <artifactId>snakeyaml</artifactId>
        </dependency>
        <!-- Token生成与解析-->
        <dependency>
            <groupId>io.jsonwebtoken</groupId>
            <artifactId>jjwt</artifactId>
        </dependency>
        <!-- Jaxb -->
        <dependency>
            <groupId>javax.xml.bind</groupId>
            <artifactId>jaxb-api</artifactId>
        </dependency>
        <!-- redis 缓存操作 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>
        <!-- pool 对象池 -->
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-pool2</artifactId>
        </dependency>
        <!-- 解析客户端操作系统、浏览器等 -->
        <dependency>
            <groupId>eu.bitwalker</groupId>
            <artifactId>UserAgentUtils</artifactId>
        </dependency>
        <!-- servlet包 -->
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>
        </dependency>
       <!-- 二维码生成 -->
        <dependency>
            <groupId>com.google.zxing</groupId>
            <artifactId>core</artifactId>
        </dependency>
        <dependency>
            <groupId>com.google.zxing</groupId>
            <artifactId>javase</artifactId>
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
        </plugins>
    </build>
 </project>
--- a/ff-base/src/main/java/com/ff/base/system/domain/SysLogininfor.java
+++ b/ff-base/src/main/java/com/ff/base/system/domain/SysLogininfor.java
@ -1,146 +0,0 @@
 package com.ff.base.system.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.annotation.Excel.ColumnType;
 import com.ff.base.core.domain.BaseEntity;
 /**
 * 系统访问记录表 sys_logininfor
 *
 * @author ff
 */
 public class SysLogininfor extends BaseEntity
 {
    private static final long serialVersionUID = 1L;
    /** ID */
    @Excel(name = "序号", cellType = ColumnType.NUMERIC)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long infoId;
    /** 用户账号 */
    @Excel(name = "用户账号")
    private String userName;
    /** 登录状态 0成功 1失败 */
    @Excel(name = "登录状态", readConverterExp = "0=成功,1=失败")
    private String status;
    /** 登录IP地址 */
    @Excel(name = "登录地址")
    private String ipaddr;
    /** 登录地点 */
    @Excel(name = "登录地点")
    private String loginLocation;
    /** 浏览器类型 */
    @Excel(name = "浏览器")
    private String browser;
    /** 操作系统 */
    @Excel(name = "操作系统")
    private String os;
    /** 提示消息 */
    @Excel(name = "提示消息")
    private String msg;
    /** 访问时间 */
    @JsonSerialize(using = ToStringSerializer.class)
    @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Long loginTime;
    public Long getInfoId()
    {
        return infoId;
    }
    public void setInfoId(Long infoId)
    {
        this.infoId = infoId;
    }
    public String getUserName()
    {
        return userName;
    }
    public void setUserName(String userName)
    {
        this.userName = userName;
    }
    public String getStatus()
    {
        return status;
    }
    public void setStatus(String status)
    {
        this.status = status;
    }
    public String getIpaddr()
    {
        return ipaddr;
    }
    public void setIpaddr(String ipaddr)
    {
        this.ipaddr = ipaddr;
    }
    public String getLoginLocation()
    {
        return loginLocation;
    }
    public void setLoginLocation(String loginLocation)
    {
        this.loginLocation = loginLocation;
    }
    public String getBrowser()
    {
        return browser;
    }
    public void setBrowser(String browser)
    {
        this.browser = browser;
    }
    public String getOs()
    {
        return os;
    }
    public void setOs(String os)
    {
        this.os = os;
    }
    public String getMsg()
    {
        return msg;
    }
    public void setMsg(String msg)
    {
        this.msg = msg;
    }
    public Long getLoginTime()
    {
        return loginTime;
    }
    public void setLoginTime(Long loginTime)
    {
        this.loginTime = loginTime;
    }
 }
--- a/ff-base/src/main/java/com/ff/base/system/domain/SysMenu.java
+++ b/ff-base/src/main/java/com/ff/base/system/domain/SysMenu.java
@ -1,279 +0,0 @@
 package com.ff.base.system.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.List;
 /**
 * 菜单权限表 sys_menu
 *
 * @author ff
 */
 public class SysMenu extends BaseEntity
 {
    private static final long serialVersionUID = 1L;
    /** 菜单ID */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long menuId;
    /** 菜单名称 */
    private String menuName;
    /** 父菜单名称 */
    private String parentName;
    /** 父菜单ID */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long parentId;
    /** 显示顺序 */
    private Integer orderNum;
    /** 路由地址 */
    private String path;
    /** 组件路径 */
    private String component;
    /** 路由参数 */
    private String query;
    /** 路由名称，默认和路由地址相同的驼峰格式（注意：因为vue3版本的router会删除名称相同路由，为避免名字的冲突，特殊情况可以自定义） */
    private String routeName;
    /** 是否为外链（0是 1否） */
    private String isFrame;
    /** 是否缓存（0缓存 1不缓存） */
    private String isCache;
    /** 类型（M目录 C菜单 F按钮） */
    private String menuType;
    /** 显示状态（0显示 1隐藏） */
    private String visible;
    /** 菜单状态（0正常 1停用） */
    private String status;
    /** 权限字符串 */
    private String perms;
    /** 菜单图标 */
    private String icon;
    /** 子菜单 */
    private List<SysMenu> children = new ArrayList<SysMenu>();
    @JsonSerialize(using = ToStringSerializer.class)
    public Long getMenuId()
    {
        return menuId;
    }
    public void setMenuId(Long menuId)
    {
        this.menuId = menuId;
    }
    @NotBlank(message = "菜单名称不能为空")
    @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
    public String getMenuName()
    {
        return menuName;
    }
    public void setMenuName(String menuName)
    {
        this.menuName = menuName;
    }
    public String getParentName()
    {
        return parentName;
    }
    public void setParentName(String parentName)
    {
        this.parentName = parentName;
    }
    public Long getParentId()
    {
        return parentId;
    }
    public void setParentId(Long parentId)
    {
        this.parentId = parentId;
    }
    @NotNull(message = "显示顺序不能为空")
    public Integer getOrderNum()
    {
        return orderNum;
    }
    public void setOrderNum(Integer orderNum)
    {
        this.orderNum = orderNum;
    }
    @Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
    public String getPath()
    {
        return path;
    }
    public void setPath(String path)
    {
        this.path = path;
    }
    @Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
    public String getComponent()
    {
        return component;
    }
    public void setComponent(String component)
    {
        this.component = component;
    }
    public String getQuery()
    {
        return query;
    }
    public void setQuery(String query)
    {
        this.query = query;
    }
    public String getRouteName()
    {
        return routeName;
    }
    public void setRouteName(String routeName)
    {
        this.routeName = routeName;
    }
    public String getIsFrame()
    {
        return isFrame;
    }
    public void setIsFrame(String isFrame)
    {
        this.isFrame = isFrame;
    }
    public String getIsCache()
    {
        return isCache;
    }
    public void setIsCache(String isCache)
    {
        this.isCache = isCache;
    }
    @NotBlank(message = "菜单类型不能为空")
    public String getMenuType()
    {
        return menuType;
    }
    public void setMenuType(String menuType)
    {
        this.menuType = menuType;
    }
    public String getVisible()
    {
        return visible;
    }
    public void setVisible(String visible)
    {
        this.visible = visible;
    }
    public String getStatus()
    {
        return status;
    }
    public void setStatus(String status)
    {
        this.status = status;
    }
    @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
    public String getPerms()
    {
        return perms;
    }
    public void setPerms(String perms)
    {
        this.perms = perms;
    }
    public String getIcon()
    {
        return icon;
    }
    public void setIcon(String icon)
    {
        this.icon = icon;
    }
    public List<SysMenu> getChildren()
    {
        return children;
    }
    public void setChildren(List<SysMenu> children)
    {
        this.children = children;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("menuId", getMenuId())
            .append("menuName", getMenuName())
            .append("parentId", getParentId())
            .append("orderNum", getOrderNum())
            .append("path", getPath())
            .append("component", getComponent())
            .append("query", getQuery())
            .append("routeName", getRouteName())
            .append("isFrame", getIsFrame())
            .append("IsCache", getIsCache())
            .append("menuType", getMenuType())
            .append("visible", getVisible())
            .append("status ", getStatus())
            .append("perms", getPerms())
            .append("icon", getIcon())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("remark", getRemark())
            .toString();
    }
 }
--- a/ff-base/src/main/java/com/ff/base/system/domain/SysOperLog.java
+++ b/ff-base/src/main/java/com/ff/base/system/domain/SysOperLog.java
@ -1,270 +0,0 @@
 package com.ff.base.system.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.annotation.Excel.ColumnType;
 import com.ff.base.core.domain.BaseEntity;
 /**
 * 操作日志记录表 oper_log
 *
 * @author ff
 */
 public class SysOperLog extends BaseEntity
 {
    private static final long serialVersionUID = 1L;
    /** 日志主键 */
    @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long operId;
    /** 操作模块 */
    @Excel(name = "操作模块")
    private String title;
    /** 业务类型（0其它 1新增 2修改 3删除） */
    @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
    private Integer businessType;
    /** 业务类型数组 */
    private Integer[] businessTypes;
    /** 请求方法 */
    @Excel(name = "请求方法")
    private String method;
    /** 请求方式 */
    @Excel(name = "请求方式")
    private String requestMethod;
    /** 操作类别（0其它 1后台用户 2手机端用户） */
    @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
    private Integer operatorType;
    /** 操作人员 */
    @Excel(name = "操作人员")
    private String operName;
    /** 部门名称 */
    @Excel(name = "部门名称")
    private String deptName;
    /** 请求url */
    @Excel(name = "请求地址")
    private String operUrl;
    /** 操作地址 */
    @Excel(name = "操作地址")
    private String operIp;
    /** 操作地点 */
    @Excel(name = "操作地点")
    private String operLocation;
    /** 请求参数 */
    @Excel(name = "请求参数")
    private String operParam;
    /** 返回参数 */
    @Excel(name = "返回参数")
    private String jsonResult;
    /** 操作状态（0正常 1异常） */
    @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
    private Integer status;
    /** 错误消息 */
    @Excel(name = "错误消息")
    private String errorMsg;
    /** 操作时间 */
    @JsonSerialize(using = ToStringSerializer.class)
    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Long operTime;
    /** 消耗时间 */
    @Excel(name = "消耗时间", suffix = "毫秒")
    private Long costTime;
    public Long getOperId()
    {
        return operId;
    }
    public void setOperId(Long operId)
    {
        this.operId = operId;
    }
    public String getTitle()
    {
        return title;
    }
    public void setTitle(String title)
    {
        this.title = title;
    }
    public Integer getBusinessType()
    {
        return businessType;
    }
    public void setBusinessType(Integer businessType)
    {
        this.businessType = businessType;
    }
    public Integer[] getBusinessTypes()
    {
        return businessTypes;
    }
    public void setBusinessTypes(Integer[] businessTypes)
    {
        this.businessTypes = businessTypes;
    }
    public String getMethod()
    {
        return method;
    }
    public void setMethod(String method)
    {
        this.method = method;
    }
    public String getRequestMethod()
    {
        return requestMethod;
    }
    public void setRequestMethod(String requestMethod)
    {
        this.requestMethod = requestMethod;
    }
    public Integer getOperatorType()
    {
        return operatorType;
    }
    public void setOperatorType(Integer operatorType)
    {
        this.operatorType = operatorType;
    }
    public String getOperName()
    {
        return operName;
    }
    public void setOperName(String operName)
    {
        this.operName = operName;
    }
    public String getDeptName()
    {
        return deptName;
    }
    public void setDeptName(String deptName)
    {
        this.deptName = deptName;
    }
    public String getOperUrl()
    {
        return operUrl;
    }
    public void setOperUrl(String operUrl)
    {
        this.operUrl = operUrl;
    }
    public String getOperIp()
    {
        return operIp;
    }
    public void setOperIp(String operIp)
    {
        this.operIp = operIp;
    }
    public String getOperLocation()
    {
        return operLocation;
    }
    public void setOperLocation(String operLocation)
    {
        this.operLocation = operLocation;
    }
    public String getOperParam()
    {
        return operParam;
    }
    public void setOperParam(String operParam)
    {
        this.operParam = operParam;
    }
    public String getJsonResult()
    {
        return jsonResult;
    }
    public void setJsonResult(String jsonResult)
    {
        this.jsonResult = jsonResult;
    }
    public Integer getStatus()
    {
        return status;
    }
    public void setStatus(Integer status)
    {
        this.status = status;
    }
    public String getErrorMsg()
    {
        return errorMsg;
    }
    public void setErrorMsg(String errorMsg)
    {
        this.errorMsg = errorMsg;
    }
    public Long getOperTime()
    {
        return operTime;
    }
    public void setOperTime(Long operTime)
    {
        this.operTime = operTime;
    }
    public Long getCostTime()
    {
        return costTime;
    }
    public void setCostTime(Long costTime)
    {
        this.costTime = costTime;
    }
 }
--- a/ff-base/src/main/java/com/ff/base/system/domain/SysRole.java
+++ b/ff-base/src/main/java/com/ff/base/system/domain/SysRole.java
@ -1,245 +0,0 @@
 package com.ff.base.system.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.annotation.Excel.ColumnType;
 import com.ff.base.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.Set;
 /**
 * 角色表 sys_role
 *
 * @author ff
 */
 public class SysRole extends BaseEntity
 {
    private static final long serialVersionUID = 1L;
    /** 角色ID */
    @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long roleId;
    /** 角色名称 */
    @Excel(name = "角色名称")
    private String roleName;
    /** 角色权限 */
    @Excel(name = "角色权限")
    private String roleKey;
    /** 角色排序 */
    @Excel(name = "角色排序")
    private Integer roleSort;
    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
    private String dataScope;
    /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
    private boolean menuCheckStrictly;
    /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */
    private boolean deptCheckStrictly;
    /** 角色状态（0正常 1停用） */
    @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
    private String status;
    /** 删除标志（0代表存在 2代表删除） */
    private String delFlag;
    /** 用户是否存在此角色标识 默认不存在 */
    private boolean flag = false;
    /** 菜单组 */
    private Long[] menuIds;
    /** 部门组（数据权限） */
    private Long[] deptIds;
    /** 角色菜单权限 */
    private Set<String> permissions;
    public SysRole()
    {
    }
    public SysRole(Long roleId)
    {
        this.roleId = roleId;
    }
    @JsonSerialize(using = ToStringSerializer.class)
    public Long getRoleId()
    {
        return roleId;
    }
    public void setRoleId(Long roleId)
    {
        this.roleId = roleId;
    }
    public boolean isAdmin()
    {
        return isAdmin(this.roleId);
    }
    public static boolean isAdmin(Long roleId)
    {
        return roleId != null && 1L == roleId;
    }
    @NotBlank(message = "角色名称不能为空")
    @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
    public String getRoleName()
    {
        return roleName;
    }
    public void setRoleName(String roleName)
    {
        this.roleName = roleName;
    }
    @NotBlank(message = "权限字符不能为空")
    @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
    public String getRoleKey()
    {
        return roleKey;
    }
    public void setRoleKey(String roleKey)
    {
        this.roleKey = roleKey;
    }
    @NotNull(message = "显示顺序不能为空")
    public Integer getRoleSort()
    {
        return roleSort;
    }
    public void setRoleSort(Integer roleSort)
    {
        this.roleSort = roleSort;
    }
    public String getDataScope()
    {
        return dataScope;
    }
    public void setDataScope(String dataScope)
    {
        this.dataScope = dataScope;
    }
    public boolean isMenuCheckStrictly()
    {
        return menuCheckStrictly;
    }
    public void setMenuCheckStrictly(boolean menuCheckStrictly)
    {
        this.menuCheckStrictly = menuCheckStrictly;
    }
    public boolean isDeptCheckStrictly()
    {
        return deptCheckStrictly;
    }
    public void setDeptCheckStrictly(boolean deptCheckStrictly)
    {
        this.deptCheckStrictly = deptCheckStrictly;
    }
    public String getStatus()
    {
        return status;
    }
    public void setStatus(String status)
    {
        this.status = status;
    }
    public String getDelFlag()
    {
        return delFlag;
    }
    public void setDelFlag(String delFlag)
    {
        this.delFlag = delFlag;
    }
    public boolean isFlag()
    {
        return flag;
    }
    public void setFlag(boolean flag)
    {
        this.flag = flag;
    }
    public Long[] getMenuIds()
    {
        return menuIds;
    }
    public void setMenuIds(Long[] menuIds)
    {
        this.menuIds = menuIds;
    }
    public Long[] getDeptIds()
    {
        return deptIds;
    }
    public void setDeptIds(Long[] deptIds)
    {
        this.deptIds = deptIds;
    }
    public Set<String> getPermissions()
    {
        return permissions;
    }
    public void setPermissions(Set<String> permissions)
    {
        this.permissions = permissions;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("roleId", getRoleId())
            .append("roleName", getRoleName())
            .append("roleKey", getRoleKey())
            .append("roleSort", getRoleSort())
            .append("dataScope", getDataScope())
            .append("menuCheckStrictly", isMenuCheckStrictly())
            .append("deptCheckStrictly", isDeptCheckStrictly())
            .append("status", getStatus())
            .append("delFlag", getDelFlag())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("remark", getRemark())
            .toString();
    }
 }
--- a/ff-base/src/main/java/com/ff/base/system/domain/SysUserOnline.java
+++ b/ff-base/src/main/java/com/ff/base/system/domain/SysUserOnline.java
@ -1,113 +0,0 @@
 package com.ff.base.system.domain;
 /**
 * 当前在线会话
 *
 * @author ff
 */
 public class SysUserOnline
 {
    /** 会话编号 */
    private String tokenId;
    /** 部门名称 */
    private String deptName;
    /** 用户名称 */
    private String userName;
    /** 登录IP地址 */
    private String ipaddr;
    /** 登录地址 */
    private String loginLocation;
    /** 浏览器类型 */
    private String browser;
    /** 操作系统 */
    private String os;
    /** 登录时间 */
    private Long loginTime;
    public String getTokenId()
    {
        return tokenId;
    }
    public void setTokenId(String tokenId)
    {
        this.tokenId = tokenId;
    }
    public String getDeptName()
    {
        return deptName;
    }
    public void setDeptName(String deptName)
    {
        this.deptName = deptName;
    }
    public String getUserName()
    {
        return userName;
    }
    public void setUserName(String userName)
    {
        this.userName = userName;
    }
    public String getIpaddr()
    {
        return ipaddr;
    }
    public void setIpaddr(String ipaddr)
    {
        this.ipaddr = ipaddr;
    }
    public String getLoginLocation()
    {
        return loginLocation;
    }
    public void setLoginLocation(String loginLocation)
    {
        this.loginLocation = loginLocation;
    }
    public String getBrowser()
    {
        return browser;
    }
    public void setBrowser(String browser)
    {
        this.browser = browser;
    }
    public String getOs()
    {
        return os;
    }
    public void setOs(String os)
    {
        this.os = os;
    }
    public Long getLoginTime()
    {
        return loginTime;
    }
    public void setLoginTime(Long loginTime)
    {
        this.loginTime = loginTime;
    }
 }
--- a/ff-base/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/SysConfigMapper.xml
@ -1,134 +0,0 @@
 <?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.ff.base.system.mapper.SysConfigMapper">
    <resultMap type="SysConfig" id="SysConfigResult">
    	<id     property="configId"      column="config_id"      />
        <result property="configName"    column="config_name"    />
        <result property="configKey"     column="config_key"     />
        <result property="configValue"   column="config_value"   />
        <result property="configType"    column="config_type"    />
        <result property="createBy"      column="create_by"      />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"      column="update_by"      />
        <result property="updateTime"    column="update_time"    />
    </resultMap>
    <sql id="selectConfigVo">
        select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark
 		from sys_config
    </sql>
    <!-- 查询条件 -->
 	<sql id="sqlwhereSearch">
 		<where>
 			<if test="configId !=null">
 				and config_id = #{configId}
 			</if>
 			<if test="configKey !=null and configKey != ''">
 				and config_key = #{configKey}
 			</if>
 		</where>
 	</sql>
    <select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult">
        <include refid="selectConfigVo"/>
        <include refid="sqlwhereSearch"/>
    </select>
    <select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
        <include refid="selectConfigVo"/>
        <where>
 			<if test="configName != null and configName != ''">
 				AND config_name like concat('%', #{configName}, '%')
 			</if>
 			<if test="configType != null and configType != ''">
 				AND config_type = #{configType}
 			</if>
 			<if test="configKey != null and configKey != ''">
 				AND config_key like concat('%', #{configKey}, '%')
 			</if>
 			<if test="params.beginTime != null "><!-- 开始时间检索 -->
                AND create_time &gt;= #{params.beginTime}
            </if>
 			<if test="params.endTime != null "><!-- 结束时间检索 -->
                AND create_time &lt;= #{params.endTime}
            </if>
 		</where>
    </select>
    <select id="selectConfigById" parameterType="Long" resultMap="SysConfigResult">
        <include refid="selectConfigVo"/>
        where config_id = #{configId}
    </select>
    <select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">
        <include refid="selectConfigVo"/>
        where config_key = #{configKey} limit 1
    </select>
    <insert id="insertConfig" parameterType="SysConfig">
        insert into sys_config (
        	<if test="configId != null  ">config_id,</if>
 			<if test="configName != null and configName != '' ">config_name,</if>
 			<if test="configKey != null and configKey != '' ">config_key,</if>
 			<if test="configValue != null and configValue != '' ">config_value,</if>
 			<if test="configType != null and configType != '' ">config_type,</if>
 			<if test="createBy != null and createBy != ''">create_by,</if>
 			<if test="remark != null and remark != ''">remark,</if>
 			create_time
        )values(
        	<if test="configId != null  ">#{configId},</if>
 			<if test="configName != null and configName != ''">#{configName},</if>
 			<if test="configKey != null and configKey != ''">#{configKey},</if>
 			<if test="configValue != null and configValue != ''">#{configValue},</if>
 			<if test="configType != null and configType != ''">#{configType},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
 			UNIX_TIMESTAMP() * 1000
 		)
    </insert>
    <update id="updateConfig" parameterType="SysConfig">
        update sys_config
        <set>
            <if test="configName != null and configName != ''">config_name = #{configName},</if>
            <if test="configKey != null and configKey != ''">config_key = #{configKey},</if>
            <if test="configValue != null and configValue != ''">config_value = #{configValue},</if>
            <if test="configType != null and configType != ''">config_type = #{configType},</if>
            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
            <if test="remark != null">remark = #{remark},</if>
 			update_time = UNIX_TIMESTAMP() * 1000
        </set>
        where config_id = #{configId}
    </update>
    <update id="updateConfigByKey" parameterType="SysConfig">
        update sys_config
        <set>
            <if test="configName != null and configName != ''">config_name = #{configName},</if>
            <if test="configValue != null and configValue != ''">config_value = #{configValue},</if>
            <if test="configType != null and configType != ''">config_type = #{configType},</if>
            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
            <if test="remark != null">remark = #{remark},</if>
            update_time = UNIX_TIMESTAMP() * 1000
        </set>
        where config_key = #{configKey}
    </update>
    <delete id="deleteConfigById" parameterType="Long">
        delete from sys_config where config_id = #{configId}
    </delete>
    <delete id="deleteConfigByIds" parameterType="Long">
        delete from sys_config where config_id in
        <foreach item="configId" collection="array" open="(" separator="," close=")">
        	#{configId}
        </foreach>
    </delete>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/SysDatasourceMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/SysDatasourceMapper.xml
@ -1,115 +0,0 @@
 <?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.ff.base.system.mapper.SysDatasourceMapper">
    <resultMap type="SysDatasource" id="SysDatasourceResult">
        <result property="id"    column="id"    />
        <result property="tenantId"    column="tenant_id"    />
        <result property="url"    column="url"    />
        <result property="username"    column="username"    />
        <result property="password"    column="password"    />
        <result property="driverClassName"    column="driver_class_name"    />
        <result property="status"    column="status"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="timeZone"    column="time_zone"    />
        <result property="timeZoneName"    column="time_zone_name"    />
    </resultMap>
    <sql id="selectSysDatasourceVo">
        select id, tenant_id, url,time_zone_name, username, password, driver_class_name, status, create_by, create_time, update_by, update_time, time_zone from sys_datasource
    </sql>
    <select id="selectSysDatasourceList" parameterType="SysDatasource" resultMap="SysDatasourceResult">
        <include refid="selectSysDatasourceVo"/>
        <where>
            <if test="tenantId != null  and tenantId != ''"> and tenant_id = #{tenantId}</if>
            <if test="url != null  and url != ''"> and url = #{url}</if>
            <if test="username != null  and username != ''"> and username like concat('%', #{username}, '%')</if>
            <if test="password != null  and password != ''"> and password = #{password}</if>
            <if test="driverClassName != null  and driverClassName != ''"> and driver_class_name like concat('%', #{driverClassName}, '%')</if>
            <if test="status != null  and status != ''"> and status = #{status}</if>
            <if test="timeZone != null  and timeZone != ''"> and time_zone = #{timeZone}</if>
            <if test="timeZoneName != null  and timeZoneName != ''"> and time_zone_name = #{timeZoneName}</if>
        </where>
    </select>
    <select id="selectSysDatasourceById" parameterType="Long" resultMap="SysDatasourceResult">
        <include refid="selectSysDatasourceVo"/>
        where id = #{id}
    </select>
    <select id="selectSysDatasourceByTenantId" parameterType="java.lang.String" resultMap="SysDatasourceResult">
        <include refid="selectSysDatasourceVo"/>
        where tenant_id = #{tenantId}
    </select>
    <insert id="insertSysDatasource" parameterType="SysDatasource">
        insert into sys_datasource
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="tenantId != null">tenant_id,</if>
            <if test="url != null">url,</if>
            <if test="username != null">username,</if>
            <if test="password != null">password,</if>
            <if test="driverClassName != null">driver_class_name,</if>
            <if test="status != null">status,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="timeZone != null">time_zone,</if>
            <if test="timeZoneName != null">time_zone_name,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="tenantId != null">#{tenantId},</if>
            <if test="url != null">#{url},</if>
            <if test="username != null">#{username},</if>
            <if test="password != null">#{password},</if>
            <if test="driverClassName != null">#{driverClassName},</if>
            <if test="status != null">#{status},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="timeZone != null">#{timeZone},</if>
            <if test="timeZoneName != null">#{timeZoneName},</if>
        </trim>
    </insert>
    <update id="updateSysDatasource" parameterType="SysDatasource">
        update sys_datasource
        <trim prefix="SET" suffixOverrides=",">
            <if test="tenantId != null">tenant_id = #{tenantId},</if>
            <if test="url != null">url = #{url},</if>
            <if test="username != null">username = #{username},</if>
            <if test="password != null">password = #{password},</if>
            <if test="driverClassName != null">driver_class_name = #{driverClassName},</if>
            <if test="status != null">status = #{status},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="timeZone != null">time_zone = #{timeZone},</if>
            <if test="timeZoneName != null">time_zone_name = #{timeZoneName},</if>
        </trim>
        where id = #{id}
    </update>
    <delete id="deleteSysDatasourceById" parameterType="Long">
        delete from sys_datasource where id = #{id}
    </delete>
    <delete id="deleteSysDatasourceByIds" parameterType="String">
        delete from sys_datasource where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/SysDeptMapper.xml
@ -1,159 +0,0 @@
 <?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.ff.base.system.mapper.SysDeptMapper">
 	<resultMap type="SysDept" id="SysDeptResult">
 		<id     property="deptId"     column="dept_id"     />
 		<result property="parentId"   column="parent_id"   />
 		<result property="ancestors"  column="ancestors"   />
 		<result property="deptName"   column="dept_name"   />
 		<result property="orderNum"   column="order_num"   />
 		<result property="leader"     column="leader"      />
 		<result property="phone"      column="phone"       />
 		<result property="email"      column="email"       />
 		<result property="status"     column="status"      />
 		<result property="delFlag"    column="del_flag"    />
 		<result property="parentName" column="parent_name" />
 		<result property="createBy"   column="create_by"   />
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
 	</resultMap>
 	<sql id="selectDeptVo">
        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
        from sys_dept d
    </sql>
 	<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
        <include refid="selectDeptVo"/>
        where d.del_flag = '0'
 		<if test="deptId != null and deptId != 0">
 			AND dept_id = #{deptId}
 		</if>
        <if test="parentId != null and parentId != 0">
 			AND parent_id = #{parentId}
 		</if>
 		<if test="deptName != null and deptName != ''">
 			AND dept_name like concat('%', #{deptName}, '%')
 		</if>
 		<if test="status != null and status != ''">
 			AND status = #{status}
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 		order by d.parent_id, d.order_num
    </select>
    <select id="selectDeptListByRoleId" resultType="Long">
 		select d.dept_id
 		from sys_dept d
            left join sys_role_dept rd on d.dept_id = rd.dept_id
        where rd.role_id = #{roleId}
            <if test="deptCheckStrictly">
              and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
            </if>
 		order by d.parent_id, d.order_num
 	</select>
    <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
 		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
 			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
 		from sys_dept d
 		where d.dept_id = #{deptId}
 	</select>
    <select id="checkDeptExistUser" parameterType="Long" resultType="int">
 		select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
 	</select>
 	<select id="hasChildByDeptId" parameterType="Long" resultType="int">
 		select count(1) from sys_dept
 		where del_flag = '0' and parent_id = #{deptId} limit 1
 	</select>
 	<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
 		select * from sys_dept where find_in_set(#{deptId}, ancestors)
 	</select>
 	<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
 		select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
 	</select>
 	<select id="checkDeptNameUnique" resultMap="SysDeptResult">
 	    <include refid="selectDeptVo"/>
 		where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
 	</select>
    <insert id="insertDept" parameterType="SysDept">
 		insert into sys_dept(
 			<if test="deptId != null and deptId != 0">dept_id,</if>
 			<if test="parentId != null and parentId != 0">parent_id,</if>
 			<if test="deptName != null and deptName != ''">dept_name,</if>
 			<if test="ancestors != null and ancestors != ''">ancestors,</if>
 			<if test="orderNum != null">order_num,</if>
 			<if test="leader != null and leader != ''">leader,</if>
 			<if test="phone != null and phone != ''">phone,</if>
 			<if test="email != null and email != ''">email,</if>
 			<if test="status != null">status,</if>
 			<if test="createBy != null and createBy != ''">create_by,</if>
 			create_time
 		)values(
 			<if test="deptId != null and deptId != 0">#{deptId},</if>
 			<if test="parentId != null and parentId != 0">#{parentId},</if>
 			<if test="deptName != null and deptName != ''">#{deptName},</if>
 			<if test="ancestors != null and ancestors != ''">#{ancestors},</if>
 			<if test="orderNum != null">#{orderNum},</if>
 			<if test="leader != null and leader != ''">#{leader},</if>
 			<if test="phone != null and phone != ''">#{phone},</if>
 			<if test="email != null and email != ''">#{email},</if>
 			<if test="status != null">#{status},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
 			UNIX_TIMESTAMP() * 1000
 		)
 	</insert>
 	<update id="updateDept" parameterType="SysDept">
 		update sys_dept
 		<set>
 			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
 			<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
 			<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
 			<if test="orderNum != null">order_num = #{orderNum},</if>
 			<if test="leader != null">leader = #{leader},</if>
 			<if test="phone != null">phone = #{phone},</if>
 			<if test="email != null">email = #{email},</if>
 			<if test="status != null and status != ''">status = #{status},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			update_time = UNIX_TIMESTAMP() * 1000
 		</set>
 		where dept_id = #{deptId}
 	</update>
 	<update id="updateDeptChildren" parameterType="java.util.List">
 	    update sys_dept set ancestors =
 	    <foreach collection="depts" item="item" index="index"
 	        separator=" " open="case dept_id" close="end">
 	        when #{item.deptId} then #{item.ancestors}
 	    </foreach>
 	    where dept_id in
 	    <foreach collection="depts" item="item" index="index"
 	        separator="," open="(" close=")">
 	        #{item.deptId}
 	    </foreach>
 	</update>
 	<update id="updateDeptStatusNormal" parameterType="Long">
 	    update sys_dept set status = '0' where dept_id in
 	    <foreach collection="array" item="deptId" open="(" separator="," close=")">
        	#{deptId}
        </foreach>
 	</update>
 	<delete id="deleteDeptById" parameterType="Long">
 		update sys_dept set del_flag = '2' where dept_id = #{deptId}
 	</delete>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/SysDictDataMapper.xml
@ -1,127 +0,0 @@
 <?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.ff.base.system.mapper.SysDictDataMapper">
 	<resultMap type="SysDictData" id="SysDictDataResult">
 		<id     property="dictCode"   column="dict_code"   />
 		<result property="dictSort"   column="dict_sort"   />
 		<result property="dictLabel"  column="dict_label"  />
 		<result property="dictValue"  column="dict_value"  />
 		<result property="dictType"   column="dict_type"   />
 		<result property="cssClass"   column="css_class"   />
 		<result property="listClass"  column="list_class"  />
 		<result property="isDefault"  column="is_default"  />
 		<result property="status"     column="status"      />
 		<result property="createBy"   column="create_by"   />
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
 		<result property="remark"     column="remark"       />
 	</resultMap>
 	<sql id="selectDictDataVo">
        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark
 		from sys_dict_data
    </sql>
 	<select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">
 	    <include refid="selectDictDataVo"/>
 		<where>
 		    <if test="dictType != null and dictType != ''">
 				AND dict_type = #{dictType}
 			</if>
 			<if test="dictLabel != null and dictLabel != ''">
 				AND dict_label like concat('%', #{dictLabel}, '%')
 			</if>
 			<if test="status != null and status != ''">
 				AND status = #{status}
 			</if>
 		</where>
 		order by dict_sort asc
 	</select>
 	<select id="selectDictDataByType" parameterType="String" resultMap="SysDictDataResult">
 		<include refid="selectDictDataVo"/>
 		where status = '0' and dict_type = #{dictType} order by dict_sort asc
 	</select>
 	<select id="selectDictLabel" resultType="String">
 		select dict_label from sys_dict_data
 		where dict_type = #{dictType} and dict_value = #{dictValue}
 	</select>
 	<select id="selectDictDataById" parameterType="Long" resultMap="SysDictDataResult">
 		<include refid="selectDictDataVo"/>
 		where dict_code = #{dictCode}
 	</select>
 	<select id="countDictDataByType" resultType="Integer">
 	    select count(1) from sys_dict_data where dict_type=#{dictType}
 	</select>
 	<delete id="deleteDictDataById" parameterType="Long">
 		delete from sys_dict_data where dict_code = #{dictCode}
 	</delete>
 	<delete id="deleteDictDataByIds" parameterType="Long">
 		delete from sys_dict_data where dict_code in
 		<foreach collection="array" item="dictCode" open="(" separator="," close=")">
 			#{dictCode}
        </foreach>
 	</delete>
 	<update id="updateDictData" parameterType="SysDictData">
 		update sys_dict_data
 		<set>
 			<if test="dictSort != null">dict_sort = #{dictSort},</if>
 			<if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if>
 			<if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>
 			<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
 			<if test="cssClass != null">css_class = #{cssClass},</if>
 			<if test="listClass != null">list_class = #{listClass},</if>
 			<if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if>
 			<if test="status != null">status = #{status},</if>
 			<if test="remark != null">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			update_time = UNIX_TIMESTAMP() * 1000
 		</set>
 		where dict_code = #{dictCode}
 	</update>
 	<update id="updateDictDataType" parameterType="String">
 		update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType}
 	</update>
 	<insert id="insertDictData" parameterType="SysDictData">
 		insert into sys_dict_data(
 		<if test="dictCode !=null">dict_code,</if>
 			<if test="dictSort != null">dict_sort,</if>
 			<if test="dictLabel != null and dictLabel != ''">dict_label,</if>
 			<if test="dictValue != null and dictValue != ''">dict_value,</if>
 			<if test="dictType != null and dictType != ''">dict_type,</if>
 			<if test="cssClass != null and cssClass != ''">css_class,</if>
 			<if test="listClass != null and listClass != ''">list_class,</if>
 			<if test="isDefault != null and isDefault != ''">is_default,</if>
 			<if test="status != null">status,</if>
 			<if test="remark != null and remark != ''">remark,</if>
 			<if test="createBy != null and createBy != ''">create_by,</if>
 			create_time
 		)values(
 			<if test="dictCode !=null">#{dictCode},</if>
 		    <if test="dictSort != null">#{dictSort},</if>
 		    <if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
 			<if test="dictValue != null and dictValue != ''">#{dictValue},</if>
 			<if test="dictType != null and dictType != ''">#{dictType},</if>
 			<if test="cssClass != null and cssClass != ''">#{cssClass},</if>
 			<if test="listClass != null and listClass != ''">#{listClass},</if>
 			<if test="isDefault != null and isDefault != ''">#{isDefault},</if>
 			<if test="status != null">#{status},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
 			UNIX_TIMESTAMP() * 1000
 		)
 	</insert>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/SysDictTypeMapper.xml
@ -1,109 +0,0 @@
 <?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.ff.base.system.mapper.SysDictTypeMapper">
 	<resultMap type="SysDictType" id="SysDictTypeResult">
 		<id     property="dictId"     column="dict_id"     />
 		<result property="dictName"   column="dict_name"   />
 		<result property="dictType"   column="dict_type"   />
 		<result property="status"     column="status"      />
 		<result property="createBy"   column="create_by"   />
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
 	</resultMap>
 	<sql id="selectDictTypeVo">
        select dict_id, dict_name, dict_type, status, create_by, create_time, remark
 		from sys_dict_type
    </sql>
 	<select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
 	    <include refid="selectDictTypeVo"/>
 		<where>
 		    <if test="dictName != null and dictName != ''">
 				AND dict_name like concat('%', #{dictName}, '%')
 			</if>
 			<if test="status != null and status != ''">
 				AND status = #{status}
 			</if>
 			<if test="dictType != null and dictType != ''">
 				AND dict_type like concat('%', #{dictType}, '%')
 			</if>
 			<if test="params.beginTime != null "><!-- 开始时间检索 -->
 				AND create_time &gt;= #{params.beginTime}
 			</if>
 			<if test="params.endTime != null "><!-- 结束时间检索 -->
 				AND create_time &lt;= #{params.endTime}
 			</if>
 	    </where>
 	</select>
 	<select id="selectDictTypeAll" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
 	</select>
 	<select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
 		where dict_id = #{dictId}
 	</select>
 	<select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
 		where dict_type = #{dictType}
 	</select>
 	<select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
 		where dict_type = #{dictType} limit 1
 	</select>
 	<delete id="deleteDictTypeById" parameterType="Long">
 		delete from sys_dict_type where dict_id = #{dictId}
 	</delete>
 	<delete id="deleteDictTypeByIds" parameterType="Long">
 		delete from sys_dict_type where dict_id in
 		<foreach collection="array" item="dictId" open="(" separator="," close=")">
 			#{dictId}
        </foreach>
 	</delete>
 	<update id="updateDictType" parameterType="SysDictType">
 		update sys_dict_type
 		<set>
 			<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
 			<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
 			<if test="status != null">status = #{status},</if>
 			<if test="remark != null">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			update_time = UNIX_TIMESTAMP() * 1000
 		</set>
 		where dict_id = #{dictId}
 	</update>
 	<insert id="insertDictType" parameterType="SysDictType">
 		insert into sys_dict_type(
 			<if test="dictId != null">dict_id,</if>
 			<if test="dictName != null and dictName != ''">dict_name,</if>
 			<if test="dictType != null and dictType != ''">dict_type,</if>
 			<if test="status != null">status,</if>
 			<if test="remark != null and remark != ''">remark,</if>
 			<if test="createBy != null and createBy != ''">create_by,</if>
 			create_time
 		)values(
 			 <if test="dictId != null">#{dictId},</if>
 			<if test="dictName != null and dictName != ''">#{dictName},</if>
 			<if test="dictType != null and dictType != ''">#{dictType},</if>
 			<if test="status != null">#{status},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
 			UNIX_TIMESTAMP() * 1000
 		)
 	</insert>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/SysLogininforMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/SysLogininforMapper.xml
@ -1,57 +0,0 @@
 <?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.ff.base.system.mapper.SysLogininforMapper">
 	<resultMap type="SysLogininfor" id="SysLogininforResult">
 		<id     property="infoId"        column="info_id"           />
 		<result property="userName"      column="user_name"         />
 		<result property="status"        column="status"            />
 		<result property="ipaddr"        column="ipaddr"            />
 		<result property="loginLocation" column="login_location"    />
 		<result property="browser"       column="browser"           />
 		<result property="os"            column="os"                />
 		<result property="msg"           column="msg"               />
 		<result property="loginTime"     column="login_time"        />
 	</resultMap>
 	<insert id="insertLogininfor" parameterType="SysLogininfor">
 		insert into sys_logininfor (info_id, user_name, status, ipaddr, login_location, browser, os, msg, login_time)
 		values (#{infoId},#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, UNIX_TIMESTAMP() * 1000)
 	</insert>
 	<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
 		select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
 		<where>
 			<if test="ipaddr != null and ipaddr != ''">
 				AND ipaddr like concat('%', #{ipaddr}, '%')
 			</if>
 			<if test="status != null and status != ''">
 				AND status = #{status}
 			</if>
 			<if test="userName != null and userName != ''">
 				AND user_name like concat('%', #{userName}, '%')
 			</if>
 			<if test="params.beginTime != null "><!-- 开始时间检索 -->
 				AND login_time &gt;= #{params.beginTime}
 			</if>
 			<if test="params.endTime != null "><!-- 结束时间检索 -->
 				AND login_time &lt;= #{params.endTime}
 			</if>
 		</where>
 		order by info_id desc
 	</select>
 	<delete id="deleteLogininforByIds" parameterType="Long">
 		delete from sys_logininfor where info_id in
 		<foreach collection="array" item="infoId" open="(" separator="," close=")">
 			#{infoId}
        </foreach>
 	</delete>
    <update id="cleanLogininfor">
        truncate table sys_logininfor
    </update>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/SysMenuMapper.xml
@ -1,210 +0,0 @@
 <?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.ff.base.system.mapper.SysMenuMapper">
 	<resultMap type="SysMenu" id="SysMenuResult">
 		<id     property="menuId"         column="menu_id"        />
 		<result property="menuName"       column="menu_name"      />
 		<result property="parentName"     column="parent_name"    />
 		<result property="parentId"       column="parent_id"      />
 		<result property="orderNum"       column="order_num"      />
 		<result property="path"           column="path"           />
 		<result property="component"      column="component"      />
 		<result property="query"          column="query"          />
 		<result property="routeName"      column="route_name"     />
 		<result property="isFrame"        column="is_frame"       />
 		<result property="isCache"        column="is_cache"       />
 		<result property="menuType"       column="menu_type"      />
 		<result property="visible"        column="visible"        />
 		<result property="status"         column="status"         />
 		<result property="perms"          column="perms"          />
 		<result property="icon"           column="icon"           />
 		<result property="createBy"       column="create_by"      />
 		<result property="createTime"     column="create_time"    />
 		<result property="updateTime"     column="update_time"    />
 		<result property="updateBy"       column="update_by"      />
 		<result property="remark"         column="remark"         />
 	</resultMap>
 	<sql id="selectMenuVo">
        select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
 		from sys_menu
    </sql>
    <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		<where>
 			<if test="menuName != null and menuName != ''">
 				AND menu_name like concat('%', #{menuName}, '%')
 			</if>
 			<if test="visible != null and visible != ''">
 				AND visible = #{visible}
 			</if>
 			<if test="status != null and status != ''">
 				AND status = #{status}
 			</if>
 		</where>
 		order by parent_id, order_num
 	</select>
 	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
 		order by m.parent_id, m.order_num
 	</select>
 	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
 		left join sys_role_menu rm on m.menu_id = rm.menu_id
 		left join sys_user_role ur on rm.role_id = ur.role_id
 		left join sys_role ro on ur.role_id = ro.role_id
 		where ur.user_id = #{params.userId}
 		<if test="menuName != null and menuName != ''">
            AND m.menu_name like concat('%', #{menuName}, '%')
 		</if>
 		<if test="visible != null and visible != ''">
            AND m.visible = #{visible}
 		</if>
 		<if test="status != null and status != ''">
            AND m.status = #{status}
 		</if>
 		order by m.parent_id, m.order_num
 	</select>
    <select id="selectMenuTreeByUserId"  resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
 			 left join sys_user_role ur on rm.role_id = ur.role_id
 			 left join sys_role ro on ur.role_id = ro.role_id
 		where  m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
 			and ro.role_id in
 		<foreach collection="roleIds" item="roleId" open="(" separator="," close=")">
 			#{roleId}
 		</foreach>
 		order by m.parent_id, m.order_num
 	</select>
 	<select id="selectMenuListByRoleId" resultType="Long">
 		select m.menu_id
 		from sys_menu m
            left join sys_role_menu rm on m.menu_id = rm.menu_id
        where rm.role_id = #{roleId}
            <if test="menuCheckStrictly">
              and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
            </if>
 		order by m.parent_id, m.order_num
 	</select>
 	<select id="selectMenuPerms" resultType="String">
 		select distinct m.perms
 		from sys_menu m
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
 			 left join sys_user_role ur on rm.role_id = ur.role_id
 	</select>
 	<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
 		select distinct m.perms
 		from sys_menu m
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
 			 left join sys_user_role ur on rm.role_id = ur.role_id
 			 left join sys_role r on r.role_id = ur.role_id
 		where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
 	</select>
 	<select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
 		select distinct m.perms
 		from sys_menu m
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
 		where m.status = '0' and rm.role_id = #{roleId}
 	</select>
 	<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		where menu_id = #{menuId}
 	</select>
 	<select id="hasChildByMenuId" resultType="Integer">
 	    select count(1) from sys_menu where parent_id = #{menuId}
 	</select>
 	<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
 		<include refid="selectMenuVo"/>
 		where menu_name=#{menuName} and parent_id = #{parentId} limit 1
 	</select>
 	<update id="updateMenu" parameterType="SysMenu">
 		update sys_menu
 		<set>
 			<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
 			<if test="parentId != null">parent_id = #{parentId},</if>
 			<if test="orderNum != null">order_num = #{orderNum},</if>
 			<if test="path != null and path != ''">path = #{path},</if>
 			<if test="component != null">component = #{component},</if>
 			<if test="query != null">`query` = #{query},</if>
 			<if test="routeName != null">route_name = #{routeName},</if>
 			<if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
 			<if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
 			<if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
 			<if test="visible != null">visible = #{visible},</if>
 			<if test="status != null">status = #{status},</if>
 			<if test="perms !=null">perms = #{perms},</if>
 			<if test="icon !=null and icon != ''">icon = #{icon},</if>
 			<if test="remark != null and remark != ''">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			update_time = UNIX_TIMESTAMP() * 1000
 		</set>
 		where menu_id = #{menuId}
 	</update>
 	<insert id="insertMenu" parameterType="SysMenu">
 		insert into sys_menu(
 		<if test="menuId != null and menuId != 0">menu_id,</if>
 		<if test="parentId != null and parentId != 0">parent_id,</if>
 		<if test="menuName != null and menuName != ''">menu_name,</if>
 		<if test="orderNum != null">order_num,</if>
 		<if test="path != null and path != ''">path,</if>
 		<if test="component != null and component != ''">component,</if>
 		<if test="query != null and query != ''">`query`,</if>
 		<if test="routeName != null">route_name,</if>
 		<if test="isFrame != null and isFrame != ''">is_frame,</if>
 		<if test="isCache != null and isCache != ''">is_cache,</if>
 		<if test="menuType != null and menuType != ''">menu_type,</if>
 		<if test="visible != null">visible,</if>
 		<if test="status != null">status,</if>
 		<if test="perms !=null and perms != ''">perms,</if>
 		<if test="icon != null and icon != ''">icon,</if>
 		<if test="remark != null and remark != ''">remark,</if>
 		<if test="createBy != null and createBy != ''">create_by,</if>
 		create_time
 		)values(
 		<if test="menuId != null and menuId != 0">#{menuId},</if>
 		<if test="parentId != null and parentId != 0">#{parentId},</if>
 		<if test="menuName != null and menuName != ''">#{menuName},</if>
 		<if test="orderNum != null">#{orderNum},</if>
 		<if test="path != null and path != ''">#{path},</if>
 		<if test="component != null and component != ''">#{component},</if>
 		<if test="query != null and query != ''">#{query},</if>
 		<if test="routeName != null">#{routeName},</if>
 		<if test="isFrame != null and isFrame != ''">#{isFrame},</if>
 		<if test="isCache != null and isCache != ''">#{isCache},</if>
 		<if test="menuType != null and menuType != ''">#{menuType},</if>
 		<if test="visible != null">#{visible},</if>
 		<if test="status != null">#{status},</if>
 		<if test="perms !=null and perms != ''">#{perms},</if>
 		<if test="icon != null and icon != ''">#{icon},</if>
 		<if test="remark != null and remark != ''">#{remark},</if>
 		<if test="createBy != null and createBy != ''">#{createBy},</if>
 		UNIX_TIMESTAMP() * 1000
 		)
 	</insert>
 	<delete id="deleteMenuById" parameterType="Long">
 	    delete from sys_menu where menu_id = #{menuId}
 	</delete>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/SysOperLogMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/SysOperLogMapper.xml
@ -1,87 +0,0 @@
 <?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.ff.base.system.mapper.SysOperLogMapper">
 	<resultMap type="SysOperLog" id="SysOperLogResult">
 		<id     property="operId"         column="oper_id"        />
 		<result property="title"          column="title"          />
 		<result property="businessType"   column="business_type"  />
 		<result property="method"         column="method"         />
 		<result property="requestMethod"  column="request_method" />
 		<result property="operatorType"   column="operator_type"  />
 		<result property="operName"       column="oper_name"      />
 		<result property="deptName"       column="dept_name"      />
 		<result property="operUrl"        column="oper_url"       />
 		<result property="operIp"         column="oper_ip"        />
 		<result property="operLocation"   column="oper_location"  />
 		<result property="operParam"      column="oper_param"     />
 		<result property="jsonResult"     column="json_result"    />
 		<result property="status"         column="status"         />
 		<result property="errorMsg"       column="error_msg"      />
 		<result property="operTime"       column="oper_time"      />
 		<result property="costTime"       column="cost_time"      />
 	</resultMap>
 	<sql id="selectOperLogVo">
        select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time
        from sys_oper_log
    </sql>
 	<insert id="insertOperlog" parameterType="SysOperLog">
 		insert into sys_oper_log(oper_Id,title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time)
        values (#{operId},#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, UNIX_TIMESTAMP() * 1000)
 	</insert>
 	<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
 		<include refid="selectOperLogVo"/>
 		<where>
 			<if test="operIp != null and operIp != ''">
 				AND oper_ip like concat('%', #{operIp}, '%')
 			</if>
 			<if test="title != null and title != ''">
 				AND title like concat('%', #{title}, '%')
 			</if>
 			<if test="businessType != null">
 				AND business_type = #{businessType}
 			</if>
 			<if test="businessTypes != null and businessTypes.length > 0">
 			    AND business_type in
 			    <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
 		 			#{businessType}
 		        </foreach>
 			</if>
 			<if test="status != null">
 				AND status = #{status}
 			</if>
 			<if test="operName != null and operName != ''">
 				AND oper_name like concat('%', #{operName}, '%')
 			</if>
 			<if test="params.beginTime != null "><!-- 开始时间检索 -->
 				AND oper_time &gt;= #{params.beginTime}
 			</if>
 			<if test="params.endTime != null "><!-- 结束时间检索 -->
 				AND oper_time &lt;= #{params.endTime}
 			</if>
 		</where>
 		order by oper_id desc
 	</select>
 	<delete id="deleteOperLogByIds" parameterType="Long">
 		delete from sys_oper_log where oper_id in
 		<foreach collection="array" item="operId" open="(" separator="," close=")">
 			#{operId}
        </foreach>
 	</delete>
 	<select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
 		<include refid="selectOperLogVo"/>
 		where oper_id = #{operId}
 	</select>
 	<update id="cleanOperLog">
        truncate table sys_oper_log
    </update>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/SysPostMapper.xml
@ -1,122 +0,0 @@
 <?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.ff.base.system.mapper.SysPostMapper">
 	<resultMap type="SysPost" id="SysPostResult">
 		<id     property="postId"        column="post_id"       />
 		<result property="postCode"      column="post_code"     />
 		<result property="postName"      column="post_name"     />
 		<result property="postSort"      column="post_sort"     />
 		<result property="status"        column="status"        />
 		<result property="createBy"      column="create_by"     />
 		<result property="createTime"    column="create_time"   />
 		<result property="updateBy"      column="update_by"     />
 		<result property="updateTime"    column="update_time"   />
 		<result property="remark"        column="remark"        />
 	</resultMap>
 	<sql id="selectPostVo">
        select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark
 		from sys_post
    </sql>
 	<select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
 	    <include refid="selectPostVo"/>
 		<where>
 			<if test="postCode != null and postCode != ''">
 				AND post_code like concat('%', #{postCode}, '%')
 			</if>
 			<if test="status != null and status != ''">
 				AND status = #{status}
 			</if>
 			<if test="postName != null and postName != ''">
 				AND post_name like concat('%', #{postName}, '%')
 			</if>
 		</where>
 	</select>
 	<select id="selectPostAll" resultMap="SysPostResult">
 		<include refid="selectPostVo"/>
 	</select>
 	<select id="selectPostById" parameterType="Long" resultMap="SysPostResult">
 		<include refid="selectPostVo"/>
 		where post_id = #{postId}
 	</select>
 	<select id="selectPostListByUserId" parameterType="Long" resultType="Long">
 		select p.post_id
        from sys_post p
 	        left join sys_user_post up on up.post_id = p.post_id
 	        left join sys_user u on u.user_id = up.user_id
 	    where u.user_id = #{userId}
 	</select>
 	<select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
 		select p.post_id, p.post_name, p.post_code
 		from sys_post p
 			 left join sys_user_post up on up.post_id = p.post_id
 			 left join sys_user u on u.user_id = up.user_id
 		where u.user_name = #{userName}
 	</select>
 	<select id="checkPostNameUnique" parameterType="String" resultMap="SysPostResult">
 		<include refid="selectPostVo"/>
 		 where post_name=#{postName} limit 1
 	</select>
 	<select id="checkPostCodeUnique" parameterType="String" resultMap="SysPostResult">
 		<include refid="selectPostVo"/>
 		 where post_code=#{postCode} limit 1
 	</select>
 	<update id="updatePost" parameterType="SysPost">
 		update sys_post
 		<set>
 			<if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
 			<if test="postName != null and postName != ''">post_name = #{postName},</if>
 			<if test="postSort != null">post_sort = #{postSort},</if>
 			<if test="status != null and status != ''">status = #{status},</if>
 			<if test="remark != null">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			update_time = UNIX_TIMESTAMP() * 1000
 		</set>
 		where post_id = #{postId}
 	</update>
 	<insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
 		insert into sys_post(
 			<if test="postId != null and postId != 0">post_id,</if>
 			<if test="postCode != null and postCode != ''">post_code,</if>
 			<if test="postName != null and postName != ''">post_name,</if>
 			<if test="postSort != null">post_sort,</if>
 			<if test="status != null and status != ''">status,</if>
 			<if test="remark != null and remark != ''">remark,</if>
 			<if test="createBy != null and createBy != ''">create_by,</if>
 			create_time
 		)values(
 			<if test="postId != null and postId != 0">#{postId},</if>
 			<if test="postCode != null and postCode != ''">#{postCode},</if>
 			<if test="postName != null and postName != ''">#{postName},</if>
 			<if test="postSort != null">#{postSort},</if>
 			<if test="status != null and status != ''">#{status},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
 			UNIX_TIMESTAMP() * 1000
 		)
 	</insert>
 	<delete id="deletePostById" parameterType="Long">
 		delete from sys_post where post_id = #{postId}
 	</delete>
 	<delete id="deletePostByIds" parameterType="Long">
 		delete from sys_post where post_id in
 		<foreach collection="array" item="postId" open="(" separator="," close=")">
 			#{postId}
        </foreach>
 	</delete>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/SysRoleDeptMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/SysRoleDeptMapper.xml
@ -1,34 +0,0 @@
 <?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.ff.base.system.mapper.SysRoleDeptMapper">
 	<resultMap type="SysRoleDept" id="SysRoleDeptResult">
 		<result property="roleId"     column="role_id"      />
 		<result property="deptId"     column="dept_id"      />
 	</resultMap>
 	<delete id="deleteRoleDeptByRoleId" parameterType="Long">
 		delete from sys_role_dept where role_id=#{roleId}
 	</delete>
 	<select id="selectCountRoleDeptByDeptId" resultType="Integer">
 	    select count(1) from sys_role_dept where dept_id=#{deptId}
 	</select>
 	<delete id="deleteRoleDept" parameterType="Long">
 		delete from sys_role_dept where role_id in
 		<foreach collection="array" item="roleId" open="(" separator="," close=")">
 			#{roleId}
        </foreach>
 	</delete>
 	<insert id="batchRoleDept">
 		insert into sys_role_dept(role_id, dept_id) values
 		<foreach item="item" index="index" collection="list" separator=",">
 			(#{item.roleId},#{item.deptId})
 		</foreach>
 	</insert>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/SysRoleMapper.xml
@ -1,171 +0,0 @@
 <?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.ff.base.system.mapper.SysRoleMapper">
 	<resultMap type="SysRole" id="SysRoleResult">
 		<id     property="roleId"             column="role_id"               />
 		<result property="roleName"           column="role_name"             />
 		<result property="roleKey"            column="role_key"              />
 		<result property="roleSort"           column="role_sort"             />
 		<result property="dataScope"          column="data_scope"            />
 		<result property="menuCheckStrictly"  column="menu_check_strictly"   />
 		<result property="deptCheckStrictly"  column="dept_check_strictly"   />
 		<result property="status"             column="status"                />
 		<result property="delFlag"            column="del_flag"              />
 		<result property="createBy"           column="create_by"             />
 		<result property="createTime"         column="create_time"           />
 		<result property="updateBy"           column="update_by"             />
 		<result property="updateTime"         column="update_time"           />
 		<result property="remark"             column="remark"                />
 	</resultMap>
 	<sql id="selectRoleVo">
 	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
            r.status, r.del_flag, r.create_time, r.remark
        from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.role_id
 	        left join sys_user u on u.user_id = ur.user_id
 	        left join sys_dept d on u.dept_id = d.dept_id
    </sql>
    <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 		where r.del_flag = '0'
 		<if test="roleId != null and roleId != 0">
 			AND r.role_id = #{roleId}
 		</if>
 		<if test="roleName != null and roleName != ''">
 			AND r.role_name like concat('%', #{roleName}, '%')
 		</if>
 		<if test="status != null and status != ''">
 			AND r.status = #{status}
 		</if>
 		<if test="roleKey != null and roleKey != ''">
 			AND r.role_key like concat('%', #{roleKey}, '%')
 		</if>
 		<if test="params.beginTime != null "><!-- 开始时间检索 -->
 			AND r.create_time &gt;= #{params.beginTime}
 		</if>
 		<if test="params.endTime != null "><!-- 结束时间检索 -->
 			AND r.create_time &lt;= #{params.endTime}
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 		order by r.role_sort
 	</select>
 	<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 		WHERE r.del_flag = '0' and ur.user_id = #{userId}
 	</select>
 	<select id="selectRoleAll" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 	</select>
 	<select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
 		select r.role_id
        from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.role_id
 	        left join sys_user u on u.user_id = ur.user_id
 	    where u.user_id = #{userId}
 	</select>
 	<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 		where r.role_id = #{roleId}
 	</select>
 	<select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 		WHERE r.del_flag = '0' and u.user_name = #{userName}
 	</select>
 	<select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 		 where r.role_name=#{roleName} and r.del_flag = '0' limit 1
 	</select>
 	<select id="selectRoleByRoleKey" parameterType="String" resultMap="SysRoleResult">
 		select role_id,
 			   role_name,
 			   role_key,
 			   role_sort,
 			   data_scope,
 			   status,
 			   del_flag,
 			   create_by,
 			   create_time,
 			   update_by,
 			   update_time,
 			   remark
 		from sys_role where   del_flag = '0'  and role_key=#{roleKey} limit 1
 	</select>
 	<select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 		 where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
 	</select>
 	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
 		insert into sys_role(
 			<if test="roleId != null and roleId != 0">role_id,</if>
 			<if test="roleName != null and roleName != ''">role_name,</if>
 			<if test="roleKey != null and roleKey != ''">role_key,</if>
 			<if test="roleSort != null">role_sort,</if>
 			<if test="dataScope != null and dataScope != ''">data_scope,</if>
 			<if test="menuCheckStrictly != null">menu_check_strictly,</if>
 			<if test="deptCheckStrictly != null">dept_check_strictly,</if>
 			<if test="status != null and status != ''">status,</if>
 			<if test="remark != null and remark != ''">remark,</if>
 			<if test="createBy != null and createBy != ''">create_by,</if>
 			create_time
 		)values(
 			<if test="roleId != null and roleId != 0">#{roleId},</if>
 			<if test="roleName != null and roleName != ''">#{roleName},</if>
 			<if test="roleKey != null and roleKey != ''">#{roleKey},</if>
 			<if test="roleSort != null">#{roleSort},</if>
 			<if test="dataScope != null and dataScope != ''">#{dataScope},</if>
 			<if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
 			<if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
 			<if test="status != null and status != ''">#{status},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
 			UNIX_TIMESTAMP() * 1000
 		)
 	</insert>
 	<update id="updateRole" parameterType="SysRole">
 		update sys_role
 		<set>
 			<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
 			<if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
 			<if test="roleSort != null">role_sort = #{roleSort},</if>
 			<if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
 			<if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>
 			<if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>
 			<if test="status != null and status != ''">status = #{status},</if>
 			<if test="remark != null">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			update_time = UNIX_TIMESTAMP() * 1000
 		</set>
 		where role_id = #{roleId}
 	</update>
 	<delete id="deleteRoleById" parameterType="Long">
 		update sys_role set del_flag = '2' where role_id = #{roleId}
 	</delete>
 	<delete id="deleteRoleByIds" parameterType="Long">
 	    update sys_role set del_flag = '2' where role_id in
 		<foreach collection="array" item="roleId" open="(" separator="," close=")">
 			#{roleId}
        </foreach>
 	</delete>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/SysRoleMenuMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/SysRoleMenuMapper.xml
@ -1,34 +0,0 @@
 <?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.ff.base.system.mapper.SysRoleMenuMapper">
 	<resultMap type="SysRoleMenu" id="SysRoleMenuResult">
 		<result property="roleId"     column="role_id"      />
 		<result property="menuId"     column="menu_id"      />
 	</resultMap>
 	<select id="checkMenuExistRole" resultType="Integer">
 	    select count(1) from sys_role_menu where menu_id = #{menuId}
 	</select>
 	<delete id="deleteRoleMenuByRoleId" parameterType="Long">
 		delete from sys_role_menu where role_id=#{roleId}
 	</delete>
 	<delete id="deleteRoleMenu" parameterType="Long">
 		delete from sys_role_menu where role_id in
 		<foreach collection="array" item="roleId" open="(" separator="," close=")">
 			#{roleId}
        </foreach>
 	</delete>
 	<insert id="batchRoleMenu">
 		insert into sys_role_menu(role_id, menu_id) values
 		<foreach item="item" index="index" collection="list" separator=",">
 			(#{item.roleId},#{item.menuId})
 		</foreach>
 	</insert>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/SysUserMapper.xml
@ -1,226 +0,0 @@
 <?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.ff.base.system.mapper.SysUserMapper">
    <resultMap type="SysUser" id="SysUserResult">
        <id     property="userId"       column="user_id"      />
        <result property="deptId"       column="dept_id"      />
        <result property="userName"     column="user_name"    />
        <result property="nickName"     column="nick_name"    />
 		<result property="realName"     column="real_name"    />
        <result property="email"        column="email"        />
        <result property="phonenumber"  column="phonenumber"  />
        <result property="sex"          column="sex"          />
        <result property="avatar"       column="avatar"       />
        <result property="password"     column="password"     />
        <result property="status"       column="status"       />
        <result property="delFlag"      column="del_flag"     />
        <result property="loginIp"      column="login_ip"     />
        <result property="loginDate"    column="login_date"   />
        <result property="createBy"     column="create_by"    />
        <result property="createTime"   column="create_time"  />
        <result property="updateBy"     column="update_by"    />
        <result property="updateTime"   column="update_time"  />
        <result property="remark"       column="remark"       />
        <result property="loginType"       column="login_type"       />
        <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
        <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
    </resultMap>
    <resultMap id="deptResult" type="SysDept">
        <id     property="deptId"    column="dept_id"     />
        <result property="parentId"  column="parent_id"   />
        <result property="deptName"  column="dept_name"   />
        <result property="ancestors" column="ancestors"   />
        <result property="orderNum"  column="order_num"   />
        <result property="leader"    column="leader"      />
        <result property="status"    column="dept_status" />
    </resultMap>
    <resultMap id="RoleResult" type="SysRole">
        <id     property="roleId"       column="role_id"        />
        <result property="roleName"     column="role_name"      />
        <result property="roleKey"      column="role_key"       />
        <result property="roleSort"     column="role_sort"      />
        <result property="dataScope"    column="data_scope"     />
        <result property="status"       column="role_status"    />
    </resultMap>
 	<sql id="selectUserVo">
        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
        from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
 		    left join sys_user_role ur on u.user_id = ur.user_id
 		    left join sys_role r on r.role_id = ur.role_id
    </sql>
    <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
 		</if>
 		<if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
 		<if test="status != null and status != ''">
 			AND u.status = #{status}
 		</if>
 		<if test="phonenumber != null and phonenumber != ''">
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>
 		<if test="params.beginTime != null "><!-- 开始时间检索 -->
 			AND u.create_time &gt;= #{params.beginTime}
 		</if>
 		<if test="params.endTime != null "><!-- 结束时间检索 -->
 			AND u.create_time &lt;= #{params.endTime}
 		</if>
 		<if test="deptId != null and deptId != 0">
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
 			 left join sys_role r on r.role_id = ur.role_id
 	    where u.del_flag = '0' and r.role_id = #{roleId}
 	    <if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
 		<if test="phonenumber != null and phonenumber != ''">
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
 			 left join sys_role r on r.role_id = ur.role_id
 	    where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
 	    and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
 	    <if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
 		<if test="phonenumber != null and phonenumber != ''">
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
 		where u.user_name = #{userName} and u.del_flag = '0'
 	</select>
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}
 	</select>
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
 	</select>
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
 	</select>
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
 		insert into sys_user(
 			<if test="userId != null and userId != 0">user_id,</if>
 			<if test="deptId != null and deptId != 0">dept_id,</if>
 			<if test="userName != null and userName != ''">user_name,</if>
 			<if test="nickName != null and nickName != ''">nick_name,</if>
 			<if test="email != null and email != ''">email,</if>
 			<if test="avatar != null and avatar != ''">avatar,</if>
 			<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
 			<if test="sex != null and sex != ''">sex,</if>
 			<if test="password != null and password != ''">password,</if>
 			<if test="status != null and status != ''">status,</if>
 			<if test="createBy != null and createBy != ''">create_by,</if>
 			<if test="remark != null and remark != ''">remark,</if>
 			create_time
 		)values(
 			<if test="userId != null and userId != ''">#{userId},</if>
 			<if test="deptId != null and deptId != ''">#{deptId},</if>
 			<if test="userName != null and userName != ''">#{userName},</if>
 			<if test="nickName != null and nickName != ''">#{nickName},</if>
 			<if test="email != null and email != ''">#{email},</if>
 			<if test="avatar != null and avatar != ''">#{avatar},</if>
 			<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
 			<if test="sex != null and sex != ''">#{sex},</if>
 			<if test="password != null and password != ''">#{password},</if>
 			<if test="status != null and status != ''">#{status},</if>
 			<if test="createBy != null and createBy != ''">#{createBy},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
 			UNIX_TIMESTAMP() * 1000
 		)
 	</insert>
 	<update id="updateUser" parameterType="SysUser">
 		update sys_user
 		<set>
 			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
 			<if test="userName != null and userName != ''">user_name = #{userName},</if>
 			<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
 			<if test="email != null ">email = #{email},</if>
 			<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
 			<if test="sex != null and sex != ''">sex = #{sex},</if>
 			<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
 			<if test="password != null and password != ''">password = #{password},</if>
 			<if test="status != null and status != ''">status = #{status},</if>
 			<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
 			<if test="loginDate != null">login_date = #{loginDate},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			<if test="remark != null">remark = #{remark},</if>
 			update_time = UNIX_TIMESTAMP() * 1000
 		</set>
 		where user_id = #{userId}
 	</update>
 	<update id="updateUserStatus" parameterType="SysUser">
 		update sys_user set status = #{status} where user_id = #{userId}
 	</update>
 	<update id="updateUserAvatar" parameterType="SysUser">
 		update sys_user set avatar = #{avatar} where user_name = #{userName}
 	</update>
 	<update id="resetUserPwd" parameterType="SysUser">
 		update sys_user set password = #{password} where user_name = #{userName}
 	</update>
 	<delete id="deleteUserById" parameterType="Long">
 		update sys_user set del_flag = '2' where user_id = #{userId}
 	</delete>
 	<delete id="deleteUserByIds" parameterType="Long">
 		update sys_user set del_flag = '2' where user_id in
 		<foreach collection="array" item="userId" open="(" separator="," close=")">
 			#{userId}
        </foreach>
 	</delete>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/SysUserPostMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/SysUserPostMapper.xml
@ -1,34 +0,0 @@
 <?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.ff.base.system.mapper.SysUserPostMapper">
 	<resultMap type="SysUserPost" id="SysUserPostResult">
 		<result property="userId"     column="user_id"      />
 		<result property="postId"     column="post_id"      />
 	</resultMap>
 	<delete id="deleteUserPostByUserId" parameterType="Long">
 		delete from sys_user_post where user_id=#{userId}
 	</delete>
 	<select id="countUserPostById" resultType="Integer">
 	    select count(1) from sys_user_post where post_id=#{postId}
 	</select>
 	<delete id="deleteUserPost" parameterType="Long">
 		delete from sys_user_post where user_id in
 		<foreach collection="array" item="userId" open="(" separator="," close=")">
 			#{userId}
        </foreach>
 	</delete>
 	<insert id="batchUserPost">
 		insert into sys_user_post(user_id, post_id) values
 		<foreach item="item" index="index" collection="list" separator=",">
 			(#{item.userId},#{item.postId})
 		</foreach>
 	</insert>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/SysUserRoleMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/SysUserRoleMapper.xml
@ -1,44 +0,0 @@
 <?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.ff.base.system.mapper.SysUserRoleMapper">
 	<resultMap type="SysUserRole" id="SysUserRoleResult">
 		<result property="userId"     column="user_id"      />
 		<result property="roleId"     column="role_id"      />
 	</resultMap>
 	<delete id="deleteUserRoleByUserId" parameterType="Long">
 		delete from sys_user_role where user_id=#{userId}
 	</delete>
 	<select id="countUserRoleByRoleId" resultType="Integer">
 	    select count(1) from sys_user_role where role_id=#{roleId}
 	</select>
 	<delete id="deleteUserRole" parameterType="Long">
 		delete from sys_user_role where user_id in
 		<foreach collection="array" item="userId" open="(" separator="," close=")">
 			#{userId}
        </foreach>
 	</delete>
 	<insert id="batchUserRole">
 		insert into sys_user_role(user_id, role_id) values
 		<foreach item="item" index="index" collection="list" separator=",">
 			(#{item.userId},#{item.roleId})
 		</foreach>
 	</insert>
 	<delete id="deleteUserRoleInfo" parameterType="SysUserRole">
 		delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
 	</delete>
 	<delete id="deleteUserRoleInfos">
 	    delete from sys_user_role where role_id=#{roleId} and user_id in
 	    <foreach collection="userIds" item="userId" open="(" separator="," close=")">
 	        #{userId}
            </foreach>
 	</delete>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/TenantAgentMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/TenantAgentMapper.xml
@ -1,122 +0,0 @@
 <?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.ff.base.system.mapper.TenantAgentMapper">
    <resultMap type="TenantAgent" id="TenantAgentResult">
        <result property="id"    column="id"    />
        <result property="account"    column="account"    />
        <result property="password"    column="password"    />
        <result property="registerTime"    column="register_time"    />
        <result property="registerIp"    column="register_ip"    />
        <result property="registerIpCity"    column="register_ip_city"    />
        <result property="loginIp"    column="login_ip"    />
        <result property="loginData"    column="login_data"    />
        <result property="tenantStatus"    column="tenant_status"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="currencyAgreement"    column="currency_agreement"    />
        <result property="walletAddress"    column="wallet_address"    />
    </resultMap>
    <sql id="selectTenantAgentVo">
        select id,currency_agreement,wallet_address, account, password, register_time, register_ip, register_ip_city, login_ip, login_data, tenant_status, create_by, create_time, update_by, update_time from ff_tenant_agent
    </sql>
    <select id="selectTenantAgentList" parameterType="TenantAgent" resultMap="TenantAgentResult">
        <include refid="selectTenantAgentVo"/>
        <where>
            <if test="account != null  and account != ''"> and account = #{account}</if>
            <if test="password != null  and password != ''"> and password = #{password}</if>
            <if test="registerTime != null "> and register_time = #{registerTime}</if>
            <if test="registerIp != null  and registerIp != ''"> and register_ip = #{registerIp}</if>
            <if test="registerIpCity != null  and registerIpCity != ''"> and register_ip_city = #{registerIpCity}</if>
            <if test="loginIp != null  and loginIp != ''"> and login_ip = #{loginIp}</if>
            <if test="loginData != null "> and login_data = #{loginData}</if>
            <if test="tenantStatus != null "> and tenant_status = #{tenantStatus}</if>
            <if test="currencyAgreement != null  and currencyAgreement != ''"> and currency_agreement = #{currencyAgreement}</if>
            <if test="walletAddress != null  and walletAddress != ''"> and wallet_address = #{walletAddress}</if>
        </where>
    </select>
    <select id="selectTenantAgentById" parameterType="Long" resultMap="TenantAgentResult">
        <include refid="selectTenantAgentVo"/>
        where id = #{id}
    </select>
    <select id="selectTenantAgentByAccount" parameterType="String" resultMap="TenantAgentResult">
        <include refid="selectTenantAgentVo"/>
        where account = #{account}
    </select>
    <insert id="insertTenantAgent" parameterType="TenantAgent" useGeneratedKeys="true" keyProperty="id">
        insert into ff_tenant_agent
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="account != null">account,</if>
            <if test="password != null">password,</if>
            <if test="registerTime != null">register_time,</if>
            <if test="registerIp != null">register_ip,</if>
            <if test="registerIpCity != null">register_ip_city,</if>
            <if test="loginIp != null">login_ip,</if>
            <if test="loginData != null">login_data,</if>
            <if test="tenantStatus != null">tenant_status,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="currencyAgreement != null">currency_agreement,</if>
            <if test="walletAddress != null">wallet_address,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="account != null">#{account},</if>
            <if test="password != null">#{password},</if>
            <if test="registerTime != null">#{registerTime},</if>
            <if test="registerIp != null">#{registerIp},</if>
            <if test="registerIpCity != null">#{registerIpCity},</if>
            <if test="loginIp != null">#{loginIp},</if>
            <if test="loginData != null">#{loginData},</if>
            <if test="tenantStatus != null">#{tenantStatus},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="currencyAgreement != null">#{currencyAgreement},</if>
            <if test="walletAddress != null">#{walletAddress},</if>
         </trim>
    </insert>
    <update id="updateTenantAgent" parameterType="TenantAgent">
        update ff_tenant_agent
        <trim prefix="SET" suffixOverrides=",">
            <if test="account != null">account = #{account},</if>
            <if test="password != null">password = #{password},</if>
            <if test="registerTime != null">register_time = #{registerTime},</if>
            <if test="registerIp != null">register_ip = #{registerIp},</if>
            <if test="registerIpCity != null">register_ip_city = #{registerIpCity},</if>
            <if test="loginIp != null">login_ip = #{loginIp},</if>
            <if test="loginData != null">login_data = #{loginData},</if>
            <if test="tenantStatus != null">tenant_status = #{tenantStatus},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="currencyAgreement != null">currency_agreement = #{currencyAgreement},</if>
            <if test="walletAddress != null">wallet_address = #{walletAddress},</if>
        </trim>
        where id = #{id}
    </update>
    <delete id="deleteTenantAgentById" parameterType="Long">
        delete from ff_tenant_agent where id = #{id}
    </delete>
    <delete id="deleteTenantAgentByIds" parameterType="String">
        delete from ff_tenant_agent where id in 
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/TenantPlatformMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/TenantPlatformMapper.xml
@ -1,113 +0,0 @@
 <?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.ff.base.system.mapper.TenantPlatformMapper">
    <resultMap type="TenantPlatform" id="TenantPlatformResult">
        <result property="id"    column="id"    />
        <result property="tenantId"    column="tenant_id"    />
        <result property="platformCode"    column="platform_code"    />
        <result property="currencyCode"    column="currency_code"    />
        <result property="cost"    column="cost"    />
        <result property="useCost"    column="use_cost"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
    </resultMap>
    <sql id="selectTenantPlatformVo">
        select id, tenant_id, platform_code, currency_code, cost, use_cost, create_by, create_time, update_by, update_time from ff_tenant_platform
    </sql>
    <select id="selectTenantPlatformList" parameterType="TenantPlatform" resultMap="TenantPlatformResult">
        <include refid="selectTenantPlatformVo"/>
        <where>  
            <if test="tenantId != null "> and tenant_id = #{tenantId}</if>
            <if test="platformCode != null  and platformCode != ''"> and platform_code = #{platformCode}</if>
            <if test="currencyCode != null  and currencyCode != ''"> and currency_code = #{currencyCode}</if>
            <if test="cost != null "> and cost = #{cost}</if>
            <if test="useCost != null "> and use_cost = #{useCost}</if>
        </where>
    </select>
    <select id="selectTenantPlatformById" parameterType="Long" resultMap="TenantPlatformResult">
        <include refid="selectTenantPlatformVo"/>
        where id = #{id}
    </select>
    <select id="findTenantPlatform"  parameterType="TenantPlatform" resultMap="TenantPlatformResult">
    <include refid="selectTenantPlatformVo"/>
        <where>
            <if test="tenantId != null "> and tenant_id = #{tenantId}</if>
            <if test="platformCode != null  and platformCode != ''"> and platform_code = #{platformCode}</if>
            <if test="currencyCode != null  and currencyCode != ''"> and currency_code = #{currencyCode}</if>
            <if test="cost != null "> and cost = #{cost}</if>
            <if test="useCost != null "> and use_cost = #{useCost}</if>
        </where>
        limit 1
    </select>
    <select id="selectCurrencyCodeByTenantId" >
        select   currency_code from ff_tenant_platform
        where   tenant_id = #{tenantId}  group by currency_code
    </select>
    <insert id="insertTenantPlatform" parameterType="TenantPlatform">
        insert into ff_tenant_platform
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="tenantId != null">tenant_id,</if>
            <if test="platformCode != null and platformCode != ''">platform_code,</if>
            <if test="currencyCode != null and currencyCode != ''">currency_code,</if>
            <if test="cost != null">cost,</if>
            <if test="useCost != null">use_cost,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="tenantId != null">#{tenantId},</if>
            <if test="platformCode != null and platformCode != ''">#{platformCode},</if>
            <if test="currencyCode != null and currencyCode != ''">#{currencyCode},</if>
            <if test="cost != null">#{cost},</if>
            <if test="useCost != null">#{useCost},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
         </trim>
    </insert>
    <update id="updateTenantPlatform" parameterType="TenantPlatform">
        update ff_tenant_platform
        <trim prefix="SET" suffixOverrides=",">
            <if test="tenantId != null">tenant_id = #{tenantId},</if>
            <if test="platformCode != null and platformCode != ''">platform_code = #{platformCode},</if>
            <if test="currencyCode != null and currencyCode != ''">currency_code = #{currencyCode},</if>
            <if test="cost != null">cost = #{cost},</if>
            <if test="useCost != null">use_cost = #{useCost},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
        </trim>
        where id = #{id}
    </update>
    <delete id="deleteTenantPlatformById" parameterType="Long">
        delete from ff_tenant_platform where id = #{id}
    </delete>
    <delete id="deleteTenantPlatformByIds" parameterType="String">
        delete from ff_tenant_platform where id in 
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/TenantSecretKeyMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/TenantSecretKeyMapper.xml
@ -1,169 +0,0 @@
 <?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.ff.base.system.mapper.TenantSecretKeyMapper">
    <resultMap type="TenantSecretKey" id="TenantSecretKeyResult">
        <result property="id"    column="id"    />
        <result property="tenantKey"    column="tenant_key"    />
        <result property="password"    column="password"    />
        <result property="registerTime"    column="register_time"    />
        <result property="registerIp"    column="register_ip"    />
        <result property="registerIpCity"    column="register_ip_city"    />
        <result property="loginIp"    column="login_ip"    />
        <result property="loginData"    column="login_data"    />
        <result property="agentId"    column="agent_id"    />
        <result property="tenantSn"    column="tenant_sn"    />
        <result property="tenantSecret"    column="tenant_secret"    />
        <result property="tenantStatus"    column="tenant_status"    />
        <result property="quotaType"    column="quota_type"    />
        <result property="scoreRatio"    column="score_ratio"    />
        <result property="tenantType"    column="tenant_type"    />
        <result property="depositRatio"    column="deposit_ratio"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
    </resultMap>
    <sql id="selectTenantSecretKeyVo">
        select id, tenant_key, password, register_time, register_ip, register_ip_city, login_ip, login_data, agent_id, tenant_sn, tenant_secret, tenant_status, quota_type, score_ratio, tenant_type, deposit_ratio, create_by, create_time, update_by, update_time from ff_tenant_secret_key
    </sql>
    <select id="selectTenantSecretKeyList" parameterType="TenantSecretKey" resultMap="TenantSecretKeyResult">
        <include refid="selectTenantSecretKeyVo"/>
        <where>
            <if test="tenantKey != null  and tenantKey != ''"> and tenant_key = #{tenantKey}</if>
            <if test="password != null  and password != ''"> and password = #{password}</if>
            <if test="registerTime != null "> and register_time = #{registerTime}</if>
            <if test="registerIp != null  and registerIp != ''"> and register_ip = #{registerIp}</if>
            <if test="registerIpCity != null  and registerIpCity != ''"> and register_ip_city = #{registerIpCity}</if>
            <if test="loginIp != null  and loginIp != ''"> and login_ip = #{loginIp}</if>
            <if test="loginData != null "> and login_data = #{loginData}</if>
            <if test="agentId != null "> and agent_id = #{agentId}</if>
            <if test="tenantSn != null  and tenantSn != ''"> and tenant_sn = #{tenantSn}</if>
            <if test="tenantSecret != null  and tenantSecret != ''"> and tenant_secret = #{tenantSecret}</if>
            <if test="tenantStatus != null "> and tenant_status = #{tenantStatus}</if>
            <if test="quotaType != null "> and quota_type = #{quotaType}</if>
            <if test="scoreRatio != null "> and score_ratio = #{scoreRatio}</if>
            <if test="tenantType != null "> and tenant_type = #{tenantType}</if>
            <if test="depositRatio != null "> and deposit_ratio = #{depositRatio}</if>
        </where>
    </select>
    <select id="selectTenantSecretKeyById" parameterType="Long" resultMap="TenantSecretKeyResult">
        <include refid="selectTenantSecretKeyVo"/>
        where id = #{id}
    </select>
    <insert id="insertTenantSecretKey" parameterType="TenantSecretKey" useGeneratedKeys="true" keyProperty="id">
        insert into ff_tenant_secret_key
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="tenantKey != null and tenantKey != ''">tenant_key,</if>
            <if test="password != null">password,</if>
            <if test="registerTime != null">register_time,</if>
            <if test="registerIp != null">register_ip,</if>
            <if test="registerIpCity != null">register_ip_city,</if>
            <if test="loginIp != null">login_ip,</if>
            <if test="loginData != null">login_data,</if>
            <if test="agentId != null">agent_id,</if>
            <if test="tenantSn != null">tenant_sn,</if>
            <if test="tenantSecret != null and tenantSecret != ''">tenant_secret,</if>
            <if test="tenantStatus != null">tenant_status,</if>
            <if test="quotaType != null">quota_type,</if>
            <if test="scoreRatio != null">score_ratio,</if>
            <if test="tenantType != null">tenant_type,</if>
            <if test="depositRatio != null">deposit_ratio,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="tenantKey != null and tenantKey != ''">#{tenantKey},</if>
            <if test="password != null">#{password},</if>
            <if test="registerTime != null">#{registerTime},</if>
            <if test="registerIp != null">#{registerIp},</if>
            <if test="registerIpCity != null">#{registerIpCity},</if>
            <if test="loginIp != null">#{loginIp},</if>
            <if test="loginData != null">#{loginData},</if>
            <if test="agentId != null">#{agentId},</if>
            <if test="tenantSn != null">#{tenantSn},</if>
            <if test="tenantSecret != null and tenantSecret != ''">#{tenantSecret},</if>
            <if test="tenantStatus != null">#{tenantStatus},</if>
            <if test="quotaType != null">#{quotaType},</if>
            <if test="scoreRatio != null">#{scoreRatio},</if>
            <if test="tenantType != null">#{tenantType},</if>
            <if test="depositRatio != null">#{depositRatio},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
        </trim>
    </insert>
    <update id="updateTenantSecretKey" parameterType="TenantSecretKey">
        update ff_tenant_secret_key
        <trim prefix="SET" suffixOverrides=",">
            <if test="tenantKey != null and tenantKey != ''">tenant_key = #{tenantKey},</if>
            <if test="password != null">password = #{password},</if>
            <if test="registerTime != null">register_time = #{registerTime},</if>
            <if test="registerIp != null">register_ip = #{registerIp},</if>
            <if test="registerIpCity != null">register_ip_city = #{registerIpCity},</if>
            <if test="loginIp != null">login_ip = #{loginIp},</if>
            <if test="loginData != null">login_data = #{loginData},</if>
            <if test="agentId != null">agent_id = #{agentId},</if>
            <if test="tenantSn != null">tenant_sn = #{tenantSn},</if>
            <if test="tenantSecret != null and tenantSecret != ''">tenant_secret = #{tenantSecret},</if>
            <if test="tenantStatus != null">tenant_status = #{tenantStatus},</if>
            <if test="quotaType != null">quota_type = #{quotaType},</if>
            <if test="scoreRatio != null">score_ratio = #{scoreRatio},</if>
            <if test="tenantType != null">tenant_type = #{tenantType},</if>
            <if test="depositRatio != null">deposit_ratio = #{depositRatio},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
        </trim>
        where id = #{id}
    </update>
    <select id="selectTenantSecretKeyByTenantKey" parameterType="String" resultMap="TenantSecretKeyResult">
        <include refid="selectTenantSecretKeyVo"/>
        where tenant_key = #{tenantKey}
    </select>
    <delete id="deleteTenantSecretKeyById" parameterType="Long">
        delete from ff_tenant_secret_key where id = #{id}
    </delete>
    <select id="selectTenantSecretKeyDTOList" parameterType="com.ff.base.system.dto.TenantSecretKeyDTO" resultMap="TenantSecretKeyResult">
        <include refid="selectTenantSecretKeyVo"/>
        <where>
            <if test="password != null  and password != ''"> and password = #{password}</if>
            <if test="loginIp != null  and loginIp != ''"> and login_ip = #{loginIp}</if>
            <if test="loginData != null "> and login_data = #{loginData}</if>
            <if test="tenantKey != null  and tenantKey != ''"> and tenant_key like concat('%',#{tenantKey},'%') </if>
            <if test="agentId != null "> and agent_id = #{agentId}</if>
            <if test="tenantSn != null  and tenantSn != ''"> and tenant_sn = #{tenantSn}</if>
            <if test="tenantSecret != null  and tenantSecret != ''"> and tenant_secret = #{tenantSecret}</if>
            <if test="tenantStatus != null "> and tenant_status = #{tenantStatus}</if>
            <if test="quotaType != null "> and quota_type = #{quotaType}</if>
            <if test="scoreRatio != null "> and score_ratio = #{scoreRatio}</if>
            <if test="tenantType != null "> and tenant_type = #{tenantType}</if>
            <if test="depositRatio != null "> and deposit_ratio = #{depositRatio}</if>
        </where>
    </select>
    <delete id="deleteTenantSecretKeyByIds" parameterType="String">
        delete from ff_tenant_secret_key where id in 
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
 </mapper>
--- a/ff-base/src/main/resources/mapper/system/TenantWhiteMapper.xml
+++ b/ff-base/src/main/resources/mapper/system/TenantWhiteMapper.xml
@ -1,79 +0,0 @@
 <?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.ff.base.system.mapper.TenantWhiteMapper">
    <resultMap type="TenantWhite" id="TenantWhiteResult">
        <result property="id"    column="id"    />
        <result property="tenantId"    column="tenant_id"    />
        <result property="whiteIp"    column="white_ip"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
    </resultMap>
    <sql id="selectTenantWhiteVo">
        select id, tenant_id, white_ip, create_by, create_time, update_by, update_time from ff_tenant_white
    </sql>
    <select id="selectTenantWhiteList" parameterType="TenantWhite" resultMap="TenantWhiteResult">
        <include refid="selectTenantWhiteVo"/>
        <where>  
            <if test="tenantId != null "> and tenant_id = #{tenantId}</if>
            <if test="whiteIp != null  and whiteIp != ''"> and white_ip = #{whiteIp}</if>
        </where>
    </select>
    <select id="selectTenantWhiteById" parameterType="Long" resultMap="TenantWhiteResult">
        <include refid="selectTenantWhiteVo"/>
        where id = #{id}
    </select>
    <insert id="insertTenantWhite" parameterType="TenantWhite">
        insert into ff_tenant_white
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="tenantId != null">tenant_id,</if>
            <if test="whiteIp != null">white_ip,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="tenantId != null">#{tenantId},</if>
            <if test="whiteIp != null">#{whiteIp},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
         </trim>
    </insert>
    <update id="updateTenantWhite" parameterType="TenantWhite">
        update ff_tenant_white
        <trim prefix="SET" suffixOverrides=",">
            <if test="tenantId != null">tenant_id = #{tenantId},</if>
            <if test="whiteIp != null">white_ip = #{whiteIp},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
        </trim>
        where id = #{id}
    </update>
    <delete id="deleteTenantWhiteById" parameterType="Long">
        delete from ff_tenant_white where id = #{id}
    </delete>
    <delete id="deleteTenantWhiteByIds" parameterType="String">
        delete from ff_tenant_white where id in 
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
 </mapper>
--- a/ff-bean/ff-mysql/pom.xml
+++ b/ff-bean/ff-mysql/pom.xml
@ -0,0 +1,95 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <artifactId>ff</artifactId>
        <groupId>com.ff</groupId>
        <version>0.0.1</version>
    </parent>
    <artifactId>ff-mysql-entity</artifactId>
    <version>0.0.1</version>
    <name>ff-mysql-entity</name>
    <packaging>jar</packaging>
    <dependencies>
        <dependency>
            <groupId>com.xuxueli</groupId>
            <artifactId>xxl-job-core</artifactId>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>com.dtflys.forest</groupId>
            <artifactId>forest-spring-boot-starter</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <!-- 自定义验证注解 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-validation</artifactId>
        </dependency>
        <!--常用工具类 -->
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
        </dependency>
        <!-- 阿里JSON解析器 -->
        <dependency>
            <groupId>com.alibaba.fastjson2</groupId>
            <artifactId>fastjson2</artifactId>
        </dependency>
        <!-- io常用工具类 -->
        <dependency>
            <groupId>commons-io</groupId>
            <artifactId>commons-io</artifactId>
        </dependency>
        <!-- redis 缓存操作 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>
        <!-- pool 对象池， redis 依赖此对象池 -->
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-pool2</artifactId>
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <version>2.5.15</version>
                <configuration>
                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
                </configuration>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>
        </plugins>
        <finalName>ff-mysql-entity</finalName>
    </build>
 </project>
--- a/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentCommission.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentCommission.java
@ -1,14 +1,15 @@
 package com.ff.agent.domain;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
-import lombok.*;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 /**
 * 代理佣金管理 对象 ff_tenant_agent_commission
 *
@ -19,11 +20,12 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
-public class TenantAgentCommission extends BaseEntity
+public class TenantAgentCommission extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** $column.columnComment */
+    /**
     * $column.columnComment
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
@ -33,49 +35,60 @@ public class TenantAgentCommission extends BaseEntity
    @JsonSerialize(using = ToStringSerializer.class)
    private Long agentId;
-    /** 来源id */
+    /**
-    @Excel(name = "来源id")
+     * 来源id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long sourceId;
-    /** 来源类型 CommissionSourceType */
+    /**
-    @Excel(name = "来源类型 CommissionSourceType")
+     * 来源类型 CommissionSourceType
     */
    private Integer sourceType;
-    /** 佣金类型  ff_tenant_agent_commission_type    commissionType */
+    /**
-    @Excel(name = "佣金类型 commissionType")
+     * 佣金类型  ff_tenant_agent_commission_type    commissionType
     */
    private Integer commissionType;
-    /** 币种 */
+    /**
-    @Excel(name = "币种")
+     * 币种
     */
    private String currencyCode;
-    /** 平台代码 */
+    /**
-    @Excel(name = "平台代码")
+     * 平台代码
     */
    private String platformCode;
-    /** 成本比例 */
+    /**
-    @Excel(name = "成本比例")
+     * 成本比例
     */
    private BigDecimal costBalance;
-    /** 商户比例 */
+    /**
-    @Excel(name = "商户比例")
+     * 商户比例
     */
    private BigDecimal merchantBalance;
-    /** 充值金额 */
+    /**
-    @Excel(name = "充值金额")
+     * 充值金额
     */
    private BigDecimal balance;
-    /** 佣金金额 */
+    /**
-    @Excel(name = "佣金金额")
+     * 佣金金额
     */
    private BigDecimal commissionBalance;
-    /** USDT金额 */
+    /**
-    @Excel(name = "USDT金额")
+     * USDT金额
     */
    private BigDecimal usdtBalance;
-    /** 佣金审批状态  ff_tenant_agent_approval_status 0 未提现  1 提现中 1 已提现 */
+    /**
-    @Excel(name = "佣金审批状态 0 未提现  1 提现中 1 已提现")
+     * 佣金审批状态  ff_tenant_agent_approval_status 0 未提现  1 提现中 1 已提现
     */
    private Integer approvalStatus;
--- a/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInvite.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInvite.java
@ -1,17 +1,15 @@
 package com.ff.agent.domain;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 /**
 * 代理邀请链接对象 ff_tenant_agent_invite
 *
@ -22,53 +20,64 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
-public class TenantAgentInvite extends BaseEntity
+public class TenantAgentInvite extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 主键id */
+    /**
     * 主键id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
-    /** 代理id */
+    /**
-    @Excel(name = "代理id")
+     * 代理id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long agentId;
-    /** 缴费金额 */
+    /**
-    @Excel(name = "缴费金额")
+     * 缴费金额
     */
    private BigDecimal balance;
-    /** 邀请类型 1 租户 2代理  ff_agent_invite_type  */
+    /**
-    @Excel(name = "邀请类型 1 租户 2代理 ")
+     * 邀请类型 1 租户 2代理  ff_agent_invite_type
     */
    private Integer inviteType;
-    /** 额度类型  TenantQuotaType 枚举 */
+    /**
-    @Excel(name = "额度类型  TenantQuotaType 枚举")
+     * 额度类型  TenantQuotaType 枚举
     */
    private Integer quotaType;
-    /** 买分比例 */
+    /**
-    @Excel(name = "买分比例")
+     * 买分比例
     */
    private BigDecimal scoreRatio;
-    /** 租户类型  TenantType 枚举 */
+    /**
-    @Excel(name = "租户类型  TenantType 枚举")
+     * 租户类型  TenantType 枚举
     */
    private Integer tenantType;
-    /** 透支比例 */
+    /**
-    @Excel(name = "透支比例")
+     * 透支比例
     */
    private BigDecimal depositRatio;
-    /** 信誉额度 */
+    /**
-    @Excel(name = "信誉额度")
+     * 信誉额度
     */
    private BigDecimal realBalance;
-    /** 邀请码 */
+    /**
-    @Excel(name = "邀请码")
+     * 邀请码
     */
    private String inviteCode;
-    /** 邀请链接 */
+    /**
-    @Excel(name = "邀请链接")
+     * 邀请链接
     */
    private String inviteUrl;
 }
--- a/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInvitePlatform.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInvitePlatform.java
@ -1,17 +1,15 @@
 package com.ff.agent.domain;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 /**
 * 平台邀请注册成本管理对象 ff_tenant_agent_invite_platform
 *
@ -22,32 +20,38 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
-public class TenantAgentInvitePlatform extends BaseEntity
+public class TenantAgentInvitePlatform extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 主键id */
+    /**
     * 主键id
     */
    private Long id;
-    /** 邀请码id */
+    /**
     * 邀请码id
     */
    @JsonSerialize(using = ToStringSerializer.class)
   @Excel(name = "邀请码id", width = 30, dateFormat = "yyyy-MM-dd")
    private Long inviteId;
-    /** 平台编码 */
+    /**
-    @Excel(name = "平台编码")
+     * 平台编码
     */
    private String platformCode;
-    /** 币种编码 */
+    /**
-    @Excel(name = "币种编码")
+     * 币种编码
     */
    private String currencyCode;
-    /** 成本 */
+    /**
-    @Excel(name = "成本")
+     * 成本
     */
    private BigDecimal cost;
-    /** 使用成本 */
+    /**
-    @Excel(name = "使用成本")
+     * 使用成本
     */
    private BigDecimal useCost;
--- a/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInviteRegister.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentInviteRegister.java
@ -1,17 +1,15 @@
 package com.ff.agent.domain;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 /**
 * 代理邀请注册对象 ff_tenant_agent_invite_register
 *
@ -22,50 +20,60 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
-public class TenantAgentInviteRegister extends BaseEntity
+public class TenantAgentInviteRegister extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 主键id */
+    /**
     * 主键id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
-    /** 代理id */
+    /**
-    @Excel(name = "代理id")
+     * 代理id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long agentId;
-    /** 邀请码 */
+    /**
-    @Excel(name = "邀请码")
+     * 邀请码
     */
    private String inviteCode;
-    /** 账号 */
+    /**
-    @Excel(name = "账号")
+     * 账号
     */
    private String account;
-    /** 密码 */
+    /**
-    @Excel(name = "密码")
+     * 密码
     */
    private String password;
-    /** 缴费金额 */
+    /**
-    @Excel(name = "缴费金额")
+     * 缴费金额
     */
    private BigDecimal balance;
-    /** 注册时间 */
+    /**
-    @Excel(name = "注册时间")
+     * 注册时间
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long registerTime;
-    /** 注册IP */
+    /**
-    @Excel(name = "注册IP")
+     * 注册IP
     */
    private String registerIp;
-    /** 注册ip的城市 */
+    /**
-    @Excel(name = "注册ip的城市")
+     * 注册ip的城市
     */
    private String registerIpCity;
-    /** 状态 1 待激活 2已激活  InviterRegisterStatus 枚举*/
+    /**
-    @Excel(name = "状态 1 待激活 2已激活")
+     * 状态 1 待激活 2已激活  InviterRegisterStatus 枚举
     */
    private Integer status;
    /**
--- a/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentWithdrawal.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/agent/domain/TenantAgentWithdrawal.java
@ -1,17 +1,15 @@
 package com.ff.agent.domain;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 /**
 * 代理申请提现审批管理对象 ff_tenant_agent_withdrawal
 *
@ -22,11 +20,12 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
-public class TenantAgentWithdrawal extends BaseEntity
+public class TenantAgentWithdrawal extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** $column.columnComment */
+    /**
     * $column.columnComment
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
@ -35,20 +34,24 @@ public class TenantAgentWithdrawal extends BaseEntity
    @JsonSerialize(using = ToStringSerializer.class)
    private Long agentId;
-    /** 佣金余额 */
+    /**
-    @Excel(name = "佣金余额")
+     * 佣金余额
     */
    private BigDecimal commissionBalance;
-    /** 币种协议 */
+    /**
-    @Excel(name = "币种协议")
+     * 币种协议
     */
    private String currencyAgreement;
-    /** 钱包地址 */
+    /**
-    @Excel(name = "钱包地址")
+     * 钱包地址
     */
    private String walletAddress;
-    /**  0 未提现  1 提现中 1 已提现 3 已拒绝 */
+    /**
-    @Excel(name = " 0 未提现  1 提现中 1 已提现 3 已拒绝")
+     * 0 未提现  1 提现中 1 已提现 3 已拒绝
     */
    private Integer approvalStatus;
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/core/domain/BaseEntity.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/core/domain/BaseEntity.java
@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@ -23,8 +22,7 @@ import java.util.Map;
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
-public class BaseEntity implements Serializable
+public class BaseEntity implements Serializable {
 {
    private static final long serialVersionUID = 1L;
    /**
@ -32,37 +30,48 @@ public class BaseEntity implements Serializable
     */
    private Long id;
-    /** 搜索值 */
+    /**
     * 搜索值
     */
    @JsonIgnore
    private String searchValue;
-    /** 创建者 */
+    /**
     * 创建者
     */
    private String createBy;
-    /** 创建时间 */
+    /**
     * 创建时间
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long createTime;
-    /** 更新者 */
+    /**
     * 更新者
     */
    private String updateBy;
-    /** 更新时间 */
+    /**
     * 更新时间
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long updateTime;
-    /** 备注 */
+    /**
     * 备注
     */
    private String remark;
-    /** 请求参数 */
+    /**
     * 请求参数
     */
    @JsonInclude(JsonInclude.Include.NON_EMPTY)
    private Map<String, Object> params;
-
+    public Map<String, Object> getParams() {
-    public Map<String, Object> getParams()
+        if (params == null) {
    {
        if (params == null)
        {
            params = new HashMap<>();
        }
        return params;
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysConfig.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysConfig.java
@ -2,8 +2,6 @@ package com.ff.base.system.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.annotation.Excel.ColumnType;
 import com.ff.base.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@ -16,90 +14,85 @@ import javax.validation.constraints.Size;
 *
 * @author ff
 */
-public class SysConfig extends BaseEntity
+public class SysConfig extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 参数主键 */
+    /**
-    @Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
+     * 参数主键
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long configId;
-    /** 参数名称 */
+    /**
-    @Excel(name = "参数名称")
+     * 参数名称
     */
    private String configName;
-    /** 参数键名 */
+    /**
-    @Excel(name = "参数键名")
+     * 参数键名
     */
    private String configKey;
-    /** 参数键值 */
+    /**
-    @Excel(name = "参数键值")
+     * 参数键值
     */
    private String configValue;
-    /** 系统内置（Y是 N否） */
+    /**
-    @Excel(name = "系统内置", readConverterExp = "Y=是,N=否")
+     * 系统内置（Y是 N否）
     */
    private String configType;
    @JsonSerialize(using = ToStringSerializer.class)
-    public Long getConfigId()
+    public Long getConfigId() {
    {
        return configId;
    }
-    public void setConfigId(Long configId)
+    public void setConfigId(Long configId) {
    {
        this.configId = configId;
    }
    @NotBlank(message = "参数名称不能为空")
    @Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
-    public String getConfigName()
+    public String getConfigName() {
    {
        return configName;
    }
-    public void setConfigName(String configName)
+    public void setConfigName(String configName) {
    {
        this.configName = configName;
    }
    @NotBlank(message = "参数键名长度不能为空")
    @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
-    public String getConfigKey()
+    public String getConfigKey() {
    {
        return configKey;
    }
-    public void setConfigKey(String configKey)
+    public void setConfigKey(String configKey) {
    {
        this.configKey = configKey;
    }
    @NotBlank(message = "参数键值不能为空")
    @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
-    public String getConfigValue()
+    public String getConfigValue() {
    {
        return configValue;
    }
-    public void setConfigValue(String configValue)
+    public void setConfigValue(String configValue) {
    {
        this.configValue = configValue;
    }
-    public String getConfigType()
+    public String getConfigType() {
    {
        return configType;
    }
-    public void setConfigType(String configType)
+    public void setConfigType(String configType) {
    {
        this.configType = configType;
    }
    @Override
    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("configId", getConfigId())
                .append("configName", getConfigName())
                .append("configKey", getConfigKey())
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDatasource.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDatasource.java
@ -2,7 +2,6 @@ package com.ff.base.system.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.Data;
 /**
@ -21,31 +20,24 @@ public class SysDatasource extends BaseEntity
    private Long id;
    /** 租户id */
    @Excel(name = "租户id")
    private String tenantId;
    /** 连接地址 */
    @Excel(name = "连接地址")
    private String url;
    /** 用户名 */
    @Excel(name = "用户名")
    private String username;
    /** 密码 */
    @Excel(name = "密码")
    private String password;
    /** 数据库驱动 */
    @Excel(name = "数据库驱动")
    private String driverClassName;
    /** 时区 */
    @Excel(name = "时区")
    private String timeZone;
    /** 状态（0 停用 1 启用） */
    @Excel(name = "状态", readConverterExp = "0=,停=用,1=,启=用")
    private String status;
    /** 时区名称 */
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDept.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDept.java
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDictData.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDictData.java
@ -3,9 +3,6 @@ package com.ff.base.system.domain;
 import com.fasterxml.jackson.annotation.JsonView;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.annotation.Excel.ColumnType;
 import com.ff.base.constant.UserConstants;
 import com.ff.base.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@ -18,53 +15,66 @@ import javax.validation.constraints.Size;
 *
 * @author ff
 */
-public class SysDictData extends BaseEntity
+public class SysDictData extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    public interface DictDataSimpleView {};
+    public interface DictDataSimpleView {
-    /** 字典编码 */
+    }
-    @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
+
    ;
    /**
     * 字典编码
     */
    @JsonView(DictDataSimpleView.class)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long dictCode;
-    /** 字典排序 */
+    /**
-    @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
+     * 字典排序
     */
    @JsonView(DictDataSimpleView.class)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long dictSort;
-    /** 字典标签 */
+    /**
-    @Excel(name = "字典标签")
+     * 字典标签
     */
    @JsonView(DictDataSimpleView.class)
    private String dictLabel;
-    /** 字典键值 */
+    /**
-    @Excel(name = "字典键值")
+     * 字典键值
     */
    @JsonView(DictDataSimpleView.class)
    private String dictValue;
-    /** 字典类型 */
+    /**
-    @Excel(name = "字典类型")
+     * 字典类型
     */
    @JsonView(DictDataSimpleView.class)
    private String dictType;
-    /** 样式属性（其他样式扩展） */
+    /**
     * 样式属性（其他样式扩展）
     */
    @JsonView(DictDataSimpleView.class)
    private String cssClass;
-    /** 表格字典样式 */
+    /**
     * 表格字典样式
     */
    @JsonView(DictDataSimpleView.class)
    private String listClass;
-    /** 是否默认（Y是 N否） */
+    /**
-    @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
+     * 是否默认（Y是 N否）
     */
    @JsonView(DictDataSimpleView.class)
    private String isDefault;
-    /** 状态（0正常 1停用） */
+    /**
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+     * 状态（0正常 1停用）
     */
    private String status;
    @Override
@ -76,114 +86,98 @@ public class SysDictData extends BaseEntity
    public void setRemark(String remark) {
        this.remark = remark;
    }
    @JsonView(DictDataSimpleView.class)
    private String remark;
    @JsonSerialize(using = ToStringSerializer.class)
-    public Long getDictCode()
+    public Long getDictCode() {
    {
        return dictCode;
    }
-    public void setDictCode(Long dictCode)
+    public void setDictCode(Long dictCode) {
    {
        this.dictCode = dictCode;
    }
    @JsonSerialize(using = ToStringSerializer.class)
-    public Long getDictSort()
+    public Long getDictSort() {
    {
        return dictSort;
    }
-    public void setDictSort(Long dictSort)
+    public void setDictSort(Long dictSort) {
    {
        this.dictSort = dictSort;
    }
    @NotBlank(message = "字典标签不能为空")
    @Size(min = 0, max = 200, message = "字典标签长度不能超过200个字符")
-    public String getDictLabel()
+    public String getDictLabel() {
    {
        return dictLabel;
    }
-    public void setDictLabel(String dictLabel)
+    public void setDictLabel(String dictLabel) {
    {
        this.dictLabel = dictLabel;
    }
    @NotBlank(message = "字典键值不能为空")
    @Size(min = 0, max = 200, message = "字典键值长度不能超过200个字符")
-    public String getDictValue()
+    public String getDictValue() {
    {
        return dictValue;
    }
-    public void setDictValue(String dictValue)
+    public void setDictValue(String dictValue) {
    {
        this.dictValue = dictValue;
    }
    @NotBlank(message = "字典类型不能为空")
    @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
-    public String getDictType()
+    public String getDictType() {
    {
        return dictType;
    }
-    public void setDictType(String dictType)
+    public void setDictType(String dictType) {
    {
        this.dictType = dictType;
    }
    @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
-    public String getCssClass()
+    public String getCssClass() {
    {
        return cssClass;
    }
-    public void setCssClass(String cssClass)
+    public void setCssClass(String cssClass) {
    {
        this.cssClass = cssClass;
    }
-    public String getListClass()
+    public String getListClass() {
    {
        return listClass;
    }
-    public void setListClass(String listClass)
+    public void setListClass(String listClass) {
    {
        this.listClass = listClass;
    }
-    public boolean getDefault()
+    public boolean getDefault() {
-    {
+        return "Y".equals(this.isDefault);
        return UserConstants.YES.equals(this.isDefault);
    }
-    public String getIsDefault()
+    public String getIsDefault() {
    {
        return isDefault;
    }
-    public void setIsDefault(String isDefault)
+    public void setIsDefault(String isDefault) {
    {
        this.isDefault = isDefault;
    }
-    public String getStatus()
+    public String getStatus() {
    {
        return status;
    }
-    public void setStatus(String status)
+    public void setStatus(String status) {
    {
        this.status = status;
    }
    @Override
    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("dictCode", getDictCode())
                .append("dictSort", getDictSort())
                .append("dictLabel", getDictLabel())
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDictType.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysDictType.java
@ -2,8 +2,6 @@ package com.ff.base.system.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.annotation.Excel.ColumnType;
 import com.ff.base.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@ -17,75 +15,71 @@ import javax.validation.constraints.Size;
 *
 * @author ff
 */
-public class SysDictType extends BaseEntity
+public class SysDictType extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 字典主键 */
+    /**
-    @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
+     * 字典主键
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long dictId;
-    /** 字典名称 */
+    /**
-    @Excel(name = "字典名称")
+     * 字典名称
     */
    private String dictName;
-    /** 字典类型 */
+    /**
-    @Excel(name = "字典类型")
+     * 字典类型
     */
    private String dictType;
-    /** 状态（0正常 1停用） */
+    /**
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+     * 状态（0正常 1停用）
     */
    private String status;
    @JsonSerialize(using = ToStringSerializer.class)
-    public Long getDictId()
+    public Long getDictId() {
    {
        return dictId;
    }
-    public void setDictId(Long dictId)
+    public void setDictId(Long dictId) {
    {
        this.dictId = dictId;
    }
    @NotBlank(message = "字典名称不能为空")
    @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
-    public String getDictName()
+    public String getDictName() {
    {
        return dictName;
    }
-    public void setDictName(String dictName)
+    public void setDictName(String dictName) {
    {
        this.dictName = dictName;
    }
    @NotBlank(message = "字典类型不能为空")
    @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
-    public String getDictType()
+    public String getDictType() {
    {
        return dictType;
    }
-    public void setDictType(String dictType)
+    public void setDictType(String dictType) {
    {
        this.dictType = dictType;
    }
-    public String getStatus()
+    public String getStatus() {
    {
        return status;
    }
-    public void setStatus(String status)
+    public void setStatus(String status) {
    {
        this.status = status;
    }
    @Override
    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("dictId", getDictId())
                .append("dictName", getDictName())
                .append("dictType", getDictType())
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysLogininfor.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysLogininfor.java
@ -0,0 +1,134 @@
 package com.ff.base.system.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.core.domain.BaseEntity;
 /**
 * 系统访问记录表 sys_logininfor
 *
 * @author ff
 */
 public class SysLogininfor extends BaseEntity {
    private static final long serialVersionUID = 1L;
    /**
     * ID
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long infoId;
    /**
     * 用户账号
     */
    private String userName;
    /**
     * 登录状态 0成功 1失败
     */
    private String status;
    /**
     * 登录IP地址
     */
    private String ipaddr;
    /**
     * 登录地点
     */
    private String loginLocation;
    /**
     * 浏览器类型
     */
    private String browser;
    /**
     * 操作系统
     */
    private String os;
    /**
     * 提示消息
     */
    private String msg;
    /**
     * 访问时间
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long loginTime;
    public Long getInfoId() {
        return infoId;
    }
    public void setInfoId(Long infoId) {
        this.infoId = infoId;
    }
    public String getUserName() {
        return userName;
    }
    public void setUserName(String userName) {
        this.userName = userName;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    public String getIpaddr() {
        return ipaddr;
    }
    public void setIpaddr(String ipaddr) {
        this.ipaddr = ipaddr;
    }
    public String getLoginLocation() {
        return loginLocation;
    }
    public void setLoginLocation(String loginLocation) {
        this.loginLocation = loginLocation;
    }
    public String getBrowser() {
        return browser;
    }
    public void setBrowser(String browser) {
        this.browser = browser;
    }
    public String getOs() {
        return os;
    }
    public void setOs(String os) {
        this.os = os;
    }
    public String getMsg() {
        return msg;
    }
    public void setMsg(String msg) {
        this.msg = msg;
    }
    public Long getLoginTime() {
        return loginTime;
    }
    public void setLoginTime(Long loginTime) {
        this.loginTime = loginTime;
    }
 }
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysMenu.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysMenu.java
@ -0,0 +1,279 @@
 package com.ff.base.system.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.List;
 /**
 * 菜单权限表 sys_menu
 *
 * @author ff
 */
 public class SysMenu extends BaseEntity {
    private static final long serialVersionUID = 1L;
    /**
     * 菜单ID
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long menuId;
    /**
     * 菜单名称
     */
    private String menuName;
    /**
     * 父菜单名称
     */
    private String parentName;
    /**
     * 父菜单ID
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long parentId;
    /**
     * 显示顺序
     */
    private Integer orderNum;
    /**
     * 路由地址
     */
    private String path;
    /**
     * 组件路径
     */
    private String component;
    /**
     * 路由参数
     */
    private String query;
    /**
     * 路由名称，默认和路由地址相同的驼峰格式（注意：因为vue3版本的router会删除名称相同路由，为避免名字的冲突，特殊情况可以自定义）
     */
    private String routeName;
    /**
     * 是否为外链（0是 1否）
     */
    private String isFrame;
    /**
     * 是否缓存（0缓存 1不缓存）
     */
    private String isCache;
    /**
     * 类型（M目录 C菜单 F按钮）
     */
    private String menuType;
    /**
     * 显示状态（0显示 1隐藏）
     */
    private String visible;
    /**
     * 菜单状态（0正常 1停用）
     */
    private String status;
    /**
     * 权限字符串
     */
    private String perms;
    /**
     * 菜单图标
     */
    private String icon;
    /**
     * 子菜单
     */
    private List<SysMenu> children = new ArrayList<SysMenu>();
    @JsonSerialize(using = ToStringSerializer.class)
    public Long getMenuId() {
        return menuId;
    }
    public void setMenuId(Long menuId) {
        this.menuId = menuId;
    }
    @NotBlank(message = "菜单名称不能为空")
    @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
    public String getMenuName() {
        return menuName;
    }
    public void setMenuName(String menuName) {
        this.menuName = menuName;
    }
    public String getParentName() {
        return parentName;
    }
    public void setParentName(String parentName) {
        this.parentName = parentName;
    }
    public Long getParentId() {
        return parentId;
    }
    public void setParentId(Long parentId) {
        this.parentId = parentId;
    }
    @NotNull(message = "显示顺序不能为空")
    public Integer getOrderNum() {
        return orderNum;
    }
    public void setOrderNum(Integer orderNum) {
        this.orderNum = orderNum;
    }
    @Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
    public String getPath() {
        return path;
    }
    public void setPath(String path) {
        this.path = path;
    }
    @Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
    public String getComponent() {
        return component;
    }
    public void setComponent(String component) {
        this.component = component;
    }
    public String getQuery() {
        return query;
    }
    public void setQuery(String query) {
        this.query = query;
    }
    public String getRouteName() {
        return routeName;
    }
    public void setRouteName(String routeName) {
        this.routeName = routeName;
    }
    public String getIsFrame() {
        return isFrame;
    }
    public void setIsFrame(String isFrame) {
        this.isFrame = isFrame;
    }
    public String getIsCache() {
        return isCache;
    }
    public void setIsCache(String isCache) {
        this.isCache = isCache;
    }
    @NotBlank(message = "菜单类型不能为空")
    public String getMenuType() {
        return menuType;
    }
    public void setMenuType(String menuType) {
        this.menuType = menuType;
    }
    public String getVisible() {
        return visible;
    }
    public void setVisible(String visible) {
        this.visible = visible;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
    public String getPerms() {
        return perms;
    }
    public void setPerms(String perms) {
        this.perms = perms;
    }
    public String getIcon() {
        return icon;
    }
    public void setIcon(String icon) {
        this.icon = icon;
    }
    public List<SysMenu> getChildren() {
        return children;
    }
    public void setChildren(List<SysMenu> children) {
        this.children = children;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("menuId", getMenuId())
                .append("menuName", getMenuName())
                .append("parentId", getParentId())
                .append("orderNum", getOrderNum())
                .append("path", getPath())
                .append("component", getComponent())
                .append("query", getQuery())
                .append("routeName", getRouteName())
                .append("isFrame", getIsFrame())
                .append("IsCache", getIsCache())
                .append("menuType", getMenuType())
                .append("visible", getVisible())
                .append("status ", getStatus())
                .append("perms", getPerms())
                .append("icon", getIcon())
                .append("createBy", getCreateBy())
                .append("createTime", getCreateTime())
                .append("updateBy", getUpdateBy())
                .append("updateTime", getUpdateTime())
                .append("remark", getRemark())
                .toString();
    }
 }
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysOperLog.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysOperLog.java
@ -0,0 +1,110 @@
 package com.ff.base.system.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.Data;
 /**
 * 操作日志记录表 oper_log
 *
 * @author ff
 */
@Data
 public class SysOperLog extends BaseEntity {
    private static final long serialVersionUID = 1L;
    /**
     * 日志主键
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long operId;
    /**
     * 操作模块
     */
    private String title;
    /**
     * 业务类型（0其它 1新增 2修改 3删除）
     */
    private Integer businessType;
    /**
     * 业务类型数组
     */
    private Integer[] businessTypes;
    /**
     * 请求方法
     */
    private String method;
    /**
     * 请求方式
     */
    private String requestMethod;
    /**
     * 操作类别（0其它 1后台用户 2手机端用户）
     */
    private Integer operatorType;
    /**
     * 操作人员
     */
    private String operName;
    /**
     * 部门名称
     */
    private String deptName;
    /**
     * 请求url
     */
    private String operUrl;
    /**
     * 操作地址
     */
    private String operIp;
    /**
     * 操作地点
     */
    private String operLocation;
    /**
     * 请求参数
     */
    private String operParam;
    /**
     * 返回参数
     */
    private String jsonResult;
    /**
     * 操作状态（0正常 1异常）
     */
    private Integer status;
    /**
     * 错误消息
     */
    private String errorMsg;
    /**
     * 操作时间
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long operTime;
    /**
     * 消耗时间
     */
    private Long costTime;
 }
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysPost.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysPost.java
@ -2,8 +2,6 @@ package com.ff.base.system.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.annotation.Excel.ColumnType;
 import com.ff.base.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@ -17,102 +15,97 @@ import javax.validation.constraints.Size;
 *
 * @author ff
 */
-public class SysPost extends BaseEntity
+public class SysPost extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 岗位序号 */
+    /**
-    @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC)
+     * 岗位序号
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long postId;
-    /** 岗位编码 */
+    /**
-    @Excel(name = "岗位编码")
+     * 岗位编码
     */
    private String postCode;
-    /** 岗位名称 */
+    /**
-    @Excel(name = "岗位名称")
+     * 岗位名称
     */
    private String postName;
-    /** 岗位排序 */
+    /**
-    @Excel(name = "岗位排序")
+     * 岗位排序
     */
    private Integer postSort;
-    /** 状态（0正常 1停用） */
+    /**
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+     * 状态（0正常 1停用）
     */
    private String status;
-    /** 用户是否存在此岗位标识 默认不存在 */
+    /**
     * 用户是否存在此岗位标识 默认不存在
     */
    private boolean flag = false;
    @JsonSerialize(using = ToStringSerializer.class)
-    public Long getPostId()
+    public Long getPostId() {
    {
        return postId;
    }
-    public void setPostId(Long postId)
+    public void setPostId(Long postId) {
    {
        this.postId = postId;
    }
    @NotBlank(message = "岗位编码不能为空")
    @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
-    public String getPostCode()
+    public String getPostCode() {
    {
        return postCode;
    }
-    public void setPostCode(String postCode)
+    public void setPostCode(String postCode) {
    {
        this.postCode = postCode;
    }
    @NotBlank(message = "岗位名称不能为空")
    @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
-    public String getPostName()
+    public String getPostName() {
    {
        return postName;
    }
-    public void setPostName(String postName)
+    public void setPostName(String postName) {
    {
        this.postName = postName;
    }
    @NotNull(message = "显示顺序不能为空")
-    public Integer getPostSort()
+    public Integer getPostSort() {
    {
        return postSort;
    }
-    public void setPostSort(Integer postSort)
+    public void setPostSort(Integer postSort) {
    {
        this.postSort = postSort;
    }
-    public String getStatus()
+    public String getStatus() {
    {
        return status;
    }
-    public void setStatus(String status)
+    public void setStatus(String status) {
    {
        this.status = status;
    }
-    public boolean isFlag()
+    public boolean isFlag() {
    {
        return flag;
    }
-    public void setFlag(boolean flag)
+    public void setFlag(boolean flag) {
    {
        this.flag = flag;
    }
    @Override
    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("postId", getPostId())
                .append("postCode", getPostCode())
                .append("postName", getPostName())
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRole.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRole.java
@ -0,0 +1,233 @@
 package com.ff.base.system.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.Set;
 /**
 * 角色表 sys_role
 *
 * @author ff
 */
 public class SysRole extends BaseEntity {
    private static final long serialVersionUID = 1L;
    /**
     * 角色ID
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long roleId;
    /**
     * 角色名称
     */
    private String roleName;
    /**
     * 角色权限
     */
    private String roleKey;
    /**
     * 角色排序
     */
    private Integer roleSort;
    /**
     * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
     */
    private String dataScope;
    /**
     * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
     */
    private boolean menuCheckStrictly;
    /**
     * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）
     */
    private boolean deptCheckStrictly;
    /**
     * 角色状态（0正常 1停用）
     */
    private String status;
    /**
     * 删除标志（0代表存在 2代表删除）
     */
    private String delFlag;
    /**
     * 用户是否存在此角色标识 默认不存在
     */
    private boolean flag = false;
    /**
     * 菜单组
     */
    private Long[] menuIds;
    /**
     * 部门组（数据权限）
     */
    private Long[] deptIds;
    /**
     * 角色菜单权限
     */
    private Set<String> permissions;
    public SysRole() {
    }
    public SysRole(Long roleId) {
        this.roleId = roleId;
    }
    @JsonSerialize(using = ToStringSerializer.class)
    public Long getRoleId() {
        return roleId;
    }
    public void setRoleId(Long roleId) {
        this.roleId = roleId;
    }
    public boolean isAdmin() {
        return isAdmin(this.roleId);
    }
    public static boolean isAdmin(Long roleId) {
        return roleId != null && 1L == roleId;
    }
    @NotBlank(message = "角色名称不能为空")
    @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
    public String getRoleName() {
        return roleName;
    }
    public void setRoleName(String roleName) {
        this.roleName = roleName;
    }
    @NotBlank(message = "权限字符不能为空")
    @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
    public String getRoleKey() {
        return roleKey;
    }
    public void setRoleKey(String roleKey) {
        this.roleKey = roleKey;
    }
    @NotNull(message = "显示顺序不能为空")
    public Integer getRoleSort() {
        return roleSort;
    }
    public void setRoleSort(Integer roleSort) {
        this.roleSort = roleSort;
    }
    public String getDataScope() {
        return dataScope;
    }
    public void setDataScope(String dataScope) {
        this.dataScope = dataScope;
    }
    public boolean isMenuCheckStrictly() {
        return menuCheckStrictly;
    }
    public void setMenuCheckStrictly(boolean menuCheckStrictly) {
        this.menuCheckStrictly = menuCheckStrictly;
    }
    public boolean isDeptCheckStrictly() {
        return deptCheckStrictly;
    }
    public void setDeptCheckStrictly(boolean deptCheckStrictly) {
        this.deptCheckStrictly = deptCheckStrictly;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    public String getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(String delFlag) {
        this.delFlag = delFlag;
    }
    public boolean isFlag() {
        return flag;
    }
    public void setFlag(boolean flag) {
        this.flag = flag;
    }
    public Long[] getMenuIds() {
        return menuIds;
    }
    public void setMenuIds(Long[] menuIds) {
        this.menuIds = menuIds;
    }
    public Long[] getDeptIds() {
        return deptIds;
    }
    public void setDeptIds(Long[] deptIds) {
        this.deptIds = deptIds;
    }
    public Set<String> getPermissions() {
        return permissions;
    }
    public void setPermissions(Set<String> permissions) {
        this.permissions = permissions;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("roleId", getRoleId())
                .append("roleName", getRoleName())
                .append("roleKey", getRoleKey())
                .append("roleSort", getRoleSort())
                .append("dataScope", getDataScope())
                .append("menuCheckStrictly", isMenuCheckStrictly())
                .append("deptCheckStrictly", isDeptCheckStrictly())
                .append("status", getStatus())
                .append("delFlag", getDelFlag())
                .append("createBy", getCreateBy())
                .append("createTime", getCreateTime())
                .append("updateBy", getUpdateBy())
                .append("updateTime", getUpdateTime())
                .append("remark", getRemark())
                .toString();
    }
 }
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRoleDept.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRoleDept.java
@ -10,39 +10,40 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 *
 * @author ff
 */
-public class SysRoleDept
+public class SysRoleDept {
-{
+    /**
-    /** 角色ID */
+     * 角色ID
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long roleId;
-    /** 部门ID */
+    /**
     * 部门ID
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long deptId;
    @JsonSerialize(using = ToStringSerializer.class)
-    public Long getRoleId()
+    public Long getRoleId() {
    {
        return roleId;
    }
-    public void setRoleId(Long roleId)
+    public void setRoleId(Long roleId) {
    {
        this.roleId = roleId;
    }
    @JsonSerialize(using = ToStringSerializer.class)
-    public Long getDeptId()
+    public Long getDeptId() {
    {
        return deptId;
    }
-    public void setDeptId(Long deptId)
+    public void setDeptId(Long deptId) {
    {
        this.deptId = deptId;
    }
    @Override
    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("roleId", getRoleId())
                .append("deptId", getDeptId())
                .toString();
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRoleMenu.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysRoleMenu.java
@ -10,39 +10,40 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 *
 * @author ff
 */
-public class SysRoleMenu
+public class SysRoleMenu {
-{
+    /**
-    /** 角色ID */
+     * 角色ID
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long roleId;
-    /** 菜单ID */
+    /**
     * 菜单ID
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long menuId;
    @JsonSerialize(using = ToStringSerializer.class)
-    public Long getRoleId()
+    public Long getRoleId() {
    {
        return roleId;
    }
-    public void setRoleId(Long roleId)
+    public void setRoleId(Long roleId) {
    {
        this.roleId = roleId;
    }
    @JsonSerialize(using = ToStringSerializer.class)
-    public Long getMenuId()
+    public Long getMenuId() {
    {
        return menuId;
    }
-    public void setMenuId(Long menuId)
+    public void setMenuId(Long menuId) {
    {
        this.menuId = menuId;
    }
    @Override
    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("roleId", getRoleId())
                .append("menuId", getMenuId())
                .toString();
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUser.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUser.java
@ -2,15 +2,8 @@ package com.ff.base.system.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.annotation.Excel.ColumnType;
 import com.ff.base.annotation.Excel.Type;
 import com.ff.base.annotation.Excels;
 import com.ff.base.core.domain.BaseEntity;
 import com.ff.base.xss.Xss;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
@ -30,21 +23,17 @@ public class SysUser extends BaseEntity {
     * 用户ID
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
    private Long userId;
    /**
     * 部门ID
     */
    @Excel(name = "部门编号", type = Type.IMPORT)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long deptId;
    /**
     * 用户账号
     */
    @Excel(name = "登录名称")
    @Xss(message = "用户账号不能包含脚本字符")
    @NotBlank(message = "用户账号不能为空")
    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
    private String userName;
@ -52,15 +41,12 @@ public class SysUser extends BaseEntity {
    /**
     * 用户昵称
     */
    @Excel(name = "用户名称")
    @Xss(message = "用户昵称不能包含脚本字符")
    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
    private String nickName;
    /**
     * 用户邮箱
     */
    @Excel(name = "用户邮箱")
    @Email(message = "邮箱格式不正确")
    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
    private String email;
@ -68,14 +54,12 @@ public class SysUser extends BaseEntity {
    /**
     * 手机号码
     */
    @Excel(name = "手机号码", cellType = ColumnType.TEXT)
    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
    private String phonenumber;
    /**
     * 用户性别
     */
    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
    private String sex;
    /**
@ -91,7 +75,6 @@ public class SysUser extends BaseEntity {
    /**
     * 帐号状态（0正常 1停用）
     */
    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
    private String status;
    /**
@ -102,23 +85,17 @@ public class SysUser extends BaseEntity {
    /**
     * 最后登录IP
     */
    @Excel(name = "最后登录IP", type = Type.EXPORT)
    private String loginIp;
    /**
     * 最后登录时间
     */
    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long loginDate;
    /**
     * 部门对象
     */
    @Excels({
            @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
            @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
    })
    private SysDept dept;
    /**
@ -148,18 +125,12 @@ public class SysUser extends BaseEntity {
    private Integer loginType;
    /**
     * 真实姓名
     */
    private String realName;
    public SysUser() {
    }
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserOnline.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserOnline.java
@ -0,0 +1,112 @@
 package com.ff.base.system.domain;
 /**
 * 当前在线会话
 *
 * @author ff
 */
 public class SysUserOnline {
    /**
     * 会话编号
     */
    private String tokenId;
    /**
     * 部门名称
     */
    private String deptName;
    /**
     * 用户名称
     */
    private String userName;
    /**
     * 登录IP地址
     */
    private String ipaddr;
    /**
     * 登录地址
     */
    private String loginLocation;
    /**
     * 浏览器类型
     */
    private String browser;
    /**
     * 操作系统
     */
    private String os;
    /**
     * 登录时间
     */
    private Long loginTime;
    public String getTokenId() {
        return tokenId;
    }
    public void setTokenId(String tokenId) {
        this.tokenId = tokenId;
    }
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
    public String getUserName() {
        return userName;
    }
    public void setUserName(String userName) {
        this.userName = userName;
    }
    public String getIpaddr() {
        return ipaddr;
    }
    public void setIpaddr(String ipaddr) {
        this.ipaddr = ipaddr;
    }
    public String getLoginLocation() {
        return loginLocation;
    }
    public void setLoginLocation(String loginLocation) {
        this.loginLocation = loginLocation;
    }
    public String getBrowser() {
        return browser;
    }
    public void setBrowser(String browser) {
        this.browser = browser;
    }
    public String getOs() {
        return os;
    }
    public void setOs(String os) {
        this.os = os;
    }
    public Long getLoginTime() {
        return loginTime;
    }
    public void setLoginTime(Long loginTime) {
        this.loginTime = loginTime;
    }
 }
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserPost.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserPost.java
@ -8,37 +8,36 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 *
 * @author ff
 */
-public class SysUserPost
+public class SysUserPost {
-{
+    /**
-    /** 用户ID */
+     * 用户ID
     */
    private Long userId;
-    /** 岗位ID */
+    /**
     * 岗位ID
     */
    private Long postId;
-    public Long getUserId()
+    public Long getUserId() {
    {
        return userId;
    }
-    public void setUserId(Long userId)
+    public void setUserId(Long userId) {
    {
        this.userId = userId;
    }
-    public Long getPostId()
+    public Long getPostId() {
    {
        return postId;
    }
-    public void setPostId(Long postId)
+    public void setPostId(Long postId) {
    {
        this.postId = postId;
    }
    @Override
    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("userId", getUserId())
                .append("postId", getPostId())
                .toString();
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserRole.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/SysUserRole.java
@ -8,37 +8,36 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 *
 * @author ff
 */
-public class SysUserRole
+public class SysUserRole {
-{
+    /**
-    /** 用户ID */
+     * 用户ID
     */
    private Long userId;
-    /** 角色ID */
+    /**
     * 角色ID
     */
    private Long roleId;
-    public Long getUserId()
+    public Long getUserId() {
    {
        return userId;
    }
-    public void setUserId(Long userId)
+    public void setUserId(Long userId) {
    {
        this.userId = userId;
    }
-    public Long getRoleId()
+    public Long getRoleId() {
    {
        return roleId;
    }
-    public void setRoleId(Long roleId)
+    public void setRoleId(Long roleId) {
    {
        this.roleId = roleId;
    }
    @Override
    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("userId", getUserId())
                .append("roleId", getRoleId())
                .toString();
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantAgent.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantAgent.java
@ -2,10 +2,8 @@ package com.ff.base.system.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@ -20,50 +18,58 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
-public class TenantAgent extends BaseEntity
+public class TenantAgent extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 主键id */
+    /**
     * 主键id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
-    /** 账号 */
+    /**
-    @Excel(name = "账号")
+     * 账号
     */
    private String account;
-    /** 密码 */
+    /**
-    @Excel(name = "密码")
+     * 密码
     */
    private String password;
-    /** 注册时间 */
+    /**
-    @Excel(name = "注册时间")
+     * 注册时间
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long registerTime;
-    /** 注册IP */
+    /**
-    @Excel(name = "注册IP")
+     * 注册IP
     */
    private String registerIp;
-    /** 注册ip的城市 */
+    /**
-    @Excel(name = "注册ip的城市")
+     * 注册ip的城市
     */
    private String registerIpCity;
-    /** 最后登录ip */
+    /**
-    @Excel(name = "最后登录ip")
+     * 最后登录ip
     */
    private String loginIp;
-    /** 最后登录时间 */
+    /**
-    @Excel(name = "最后登录时间")
+     * 最后登录时间
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long loginData;
-    /** 租户状态 1正常 0停用 */
+    /**
-    @Excel(name = "租户状态 1正常 0停用")
+     * 租户状态 1正常 0停用
     */
    private Boolean tenantStatus;
    /**
     * 货币协议
     */
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantPlatform.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantPlatform.java
@ -1,17 +1,15 @@
 package com.ff.base.system.domain;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 /**
 * 租户成本管理对象 ff_tenant_platform
 *
@ -22,32 +20,38 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
-public class TenantPlatform extends BaseEntity
+public class TenantPlatform extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 主键id */
+    /**
     * 主键id
     */
    private Long id;
-    /** 租户id */
+    /**
     * 租户id
     */
    @JsonSerialize(using = ToStringSerializer.class)
   @Excel(name = "租户id", width = 30, dateFormat = "yyyy-MM-dd")
    private Long tenantId;
-    /** 平台编码 */
+    /**
-    @Excel(name = "平台编码")
+     * 平台编码
     */
    private String platformCode;
-    /** 币种编码 */
+    /**
-    @Excel(name = "币种编码")
+     * 币种编码
     */
    private String currencyCode;
-    /** 成本 */
+    /**
-    @Excel(name = "成本")
+     * 成本
     */
    private BigDecimal cost;
-    /** 使用成本 */
+    /**
-    @Excel(name = "使用成本")
+     * 使用成本
     */
    private BigDecimal useCost;
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantSecretKey.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantSecretKey.java
@ -1,18 +1,16 @@
 package com.ff.base.system.domain;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 /**
 * 用户租户密钥对象 ff_tenant_secret_key
 *
@ -23,76 +21,92 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
-public class TenantSecretKey extends BaseEntity
+public class TenantSecretKey extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 主键id */
+    /**
     * 主键id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
-    /** 租户key */
+    /**
-    @Excel(name = "租户key")
+     * 租户key
     */
    private String tenantKey;
-    /** 密码 */
+    /**
-    @Excel(name = "密码")
+     * 密码
     */
    @JsonIgnore
    private String password;
-    /** 注册时间 */
+    /**
     * 注册时间
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @Excel(name = "注册时间")
    private Long registerTime;
-    /** 注册ip */
+    /**
-    @Excel(name = "注册ip")
+     * 注册ip
     */
    private String registerIp;
-    /** 注册ip的城市 */
+    /**
-    @Excel(name = "注册ip的城市")
+     * 注册ip的城市
     */
    private String registerIpCity;
-    /** 最后登录ip */
+    /**
-    @Excel(name = "最后登录ip")
+     * 最后登录ip
     */
    private String loginIp;
-    /** 最后登录时间 */
+    /**
     * 最后登录时间
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @Excel(name = "最后登录时间")
    private Long loginData;
-    /** 上级代理id */
+    /**
     * 上级代理id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @Excel(name = "上级代理id")
    private Long agentId;
-    /** 商户后缀 */
+    /**
-    @Excel(name = "商户后缀")
+     * 商户后缀
     */
    private String tenantSn;
-    /** 租户密钥 */
+    /**
-    @Excel(name = "租户密钥")
+     * 租户密钥
     */
    private String tenantSecret;
-    /** 租户状态 1正常 0停用 */
+    /**
-    @Excel(name = "租户状态 1正常 0停用")
+     * 租户状态 1正常 0停用
     */
    private Boolean tenantStatus;
-    /** 额度类型  TenantQuotaType 枚举 */
+    /**
-    @Excel(name = "额度类型  TenantQuotaType 枚举")
+     * 额度类型  TenantQuotaType 枚举
     */
    private Integer quotaType;
-    /** 买分比例 */
+    /**
-    @Excel(name = "买分比例")
+     * 买分比例
     */
    private BigDecimal scoreRatio;
-    /** 租户类型  TenantType 枚举 */
+    /**
-    @Excel(name = "租户类型  TenantType 枚举")
+     * 租户类型  TenantType 枚举
     */
    private Integer tenantType;
-    /** 透支比例 */
+    /**
-    @Excel(name = "透支比例")
+     * 透支比例
     */
    private BigDecimal depositRatio;
--- a/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantWhite.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/base/system/domain/TenantWhite.java
@ -2,10 +2,8 @@ package com.ff.base.system.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@ -20,20 +18,23 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
-public class TenantWhite extends BaseEntity
+public class TenantWhite extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 主键id */
+    /**
     * 主键id
     */
    private Long id;
-    /** 租户id */
+    /**
     * 租户id
     */
    @JsonSerialize(using = ToStringSerializer.class)
   @Excel(name = "租户id", width = 30, dateFormat = "yyyy-MM-dd")
    private Long tenantId;
-    /** 白名单ip地址 */
+    /**
-    @Excel(name = "白名单ip地址")
+     * 白名单ip地址
     */
    private String whiteIp;
--- a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/Currency.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/Currency.java
@ -1,12 +1,12 @@
 package com.ff.common.domain;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.Data;
 import java.math.BigDecimal;
 /**
 * 币种对象 ff_currency
 *
@ -14,44 +14,53 @@ import lombok.Data;
 * @date 2025-02-10
 */
@Data
-public class Currency extends BaseEntity
+public class Currency extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 主键id */
+    /**
     * 主键id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
-    /** 币种状态（0正常 1停用） */
+    /**
-    @Excel(name = "币种状态", readConverterExp = "0=正常,1=停用")
+     * 币种状态（0正常 1停用）
     */
    private String status;
-    /** 币种国家 */
+    /**
-    @Excel(name = "币种国家")
+     * 币种国家
     */
    private String country;
-    /** 币种编码 */
+    /**
-    @Excel(name = "币种编码")
+     * 币种编码
     */
    private String currencyCode;
-    /** 币种符号 */
+    /**
-    @Excel(name = "币种符号")
+     * 币种符号
     */
    private String currencySign;
-    /** 汇率 */
+    /**
-    @Excel(name = "汇率")
+     * 汇率
     */
    private BigDecimal gameRate;
-    /** 币种展示内容 */
+    /**
-    @Excel(name = "币种展示内容")
+     * 币种展示内容
     */
    private String currencyDisplay;
-    /** 币种名称 */
+    /**
-    @Excel(name = "币种名称")
+     * 币种名称
     */
    private String currencyName;
-    /** 币种全称 */
+    /**
-    @Excel(name = "币种全称")
+     * 币种全称
     */
    private String fullName;
--- a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/Lang.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/Lang.java
@ -2,9 +2,9 @@ package com.ff.common.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.Data;
 /**
 * 系统语种管理 对象 ff_lang
 *
@ -12,28 +12,33 @@ import lombok.Data;
 * @date 2025-02-10
 */
@Data
-public class Lang extends BaseEntity
+public class Lang extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 主键id */
+    /**
     * 主键id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
-    /** 语言名称 */
+    /**
-    @Excel(name = "语言名称")
+     * 语言名称
     */
    private String name;
-    /** 国家代码 */
+    /**
-    @Excel(name = "国家代码")
+     * 国家代码
     */
    private String country;
-    /** 语种 */
+    /**
-    @Excel(name = "语种")
+     * 语种
     */
    private String langCode;
-    /** 语种开关 0 关闭 1 开启 */
+    /**
-    @Excel(name = "语种开关 0 关闭 1 开启")
+     * 语种开关 0 关闭 1 开启
     */
    private Boolean langStatus;
--- a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantAgentPlatform.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantAgentPlatform.java
@ -1,14 +1,13 @@
 package com.ff.common.domain;
 import java.math.BigDecimal;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 /**
 * 平台利润成本管理对象 ff_tenant_agent_platform
 *
@ -19,27 +18,32 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
-public class TenantAgentPlatform extends BaseEntity
+public class TenantAgentPlatform extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 主键id */
+    /**
     * 主键id
     */
    private Long id;
-    /** 平台编码 */
+    /**
-    @Excel(name = "平台编码")
+     * 平台编码
     */
    private String platformCode;
-    /** 币种编码 */
+    /**
-    @Excel(name = "币种编码")
+     * 币种编码
     */
    private String currencyCode;
-    /** 成本 */
+    /**
-    @Excel(name = "成本")
+     * 成本
     */
    private BigDecimal cost;
-    /** 使用成本 */
+    /**
-    @Excel(name = "使用成本")
+     * 使用成本
     */
    private BigDecimal useCost;
--- a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantGameQuota.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantGameQuota.java
@ -1,18 +1,15 @@
 package com.ff.common.domain;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 /**
 * 租户游戏配额对象 ff_tenant_game_quota
 *
@ -23,28 +20,33 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
-public class TenantGameQuota extends BaseEntity
+public class TenantGameQuota extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 主键id */
+    /**
     * 主键id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
-    /** 租户key */
+    /**
-    @Excel(name = "租户key")
+     * 租户key
     */
    private String tenantKey;
-    /** 游戏额度 */
+    /**
-    @Excel(name = "游戏额度")
+     * 游戏额度
     */
    private BigDecimal balance;
-    /** 额度类型  TenantQuotaType 枚举或者平台_币种或者平台_币种_FALSE 假额度 */
+    /**
-    @Excel(name = "额度类型  TenantQuotaType 枚举或者平台_币种或者平台_币种_FALSE 假额度")
+     * 额度类型  TenantQuotaType 枚举或者平台_币种或者平台_币种_FALSE 假额度
     */
    private String quotaType;
-    /** 版本号 */
+    /**
-    @Excel(name = "版本号")
+     * 版本号
     */
    private Integer version;
--- a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantGameQuotaFlow.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantGameQuotaFlow.java
@ -1,17 +1,15 @@
 package com.ff.common.domain;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 /**
 * 租户游戏额度流水对象 ff_tenant_game_quota_flow
 *
@ -22,65 +20,77 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
-public class TenantGameQuotaFlow extends BaseEntity
+public class TenantGameQuotaFlow extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 主键id */
+    /**
     * 主键id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
-    /** 租户key */
+    /**
-    @Excel(name = "租户key")
+     * 租户key
     */
    private String tenantKey;
-    /** 额度类型 */
+    /**
-    @Excel(name = "额度类型")
+     * 额度类型
     */
    private String quotaType;
-    /** 用户账号id */
+    /**
-    @Excel(name = "用户账号id")
+     * 用户账号id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long memberId;
-    /** 平台 */
+    /**
-    @Excel(name = "平台")
+     * 平台
     */
    private String platformCode;
-    /** 币种代码 */
+    /**
-    @Excel(name = "币种代码")
+     * 币种代码
     */
    private String currencyCode;
-
+    /**
-    /** 充值类型 false 扣除  true 充值 */
+     * 充值类型 false 扣除  true 充值
-    @Excel(name = "充值类型 false 扣除  true 充值")
+     */
    private Boolean isOut;
-    /** 操作类型 operationType枚举 */
+    /**
-    @Excel(name = "操作类型 operationType枚举")
+     * 操作类型 operationType枚举
     */
    private Integer operationType;
-    /** 游戏额度之前 */
+    /**
-    @Excel(name = "游戏额度之前")
+     * 游戏额度之前
     */
    private BigDecimal balanceBefore;
-    /** 游戏额度 */
+    /**
-    @Excel(name = "游戏额度")
+     * 游戏额度
     */
    private BigDecimal balance;
-    /** 兑换比例 */
+    /**
-    @Excel(name = "兑换比例")
+     * 兑换比例
     */
    private BigDecimal exchangeRatio;
-    /** 兑换金额 */
+    /**
-    @Excel(name = "兑换金额")
+     * 兑换金额
     */
    private BigDecimal exchangeMoney;
-    /** 游戏额度之后 */
+    /**
-    @Excel(name = "游戏额度之后")
+     * 游戏额度之后
     */
    private BigDecimal balanceAfter;
    /**
--- a/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantQuotaExchange.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/common/domain/TenantQuotaExchange.java
@ -1,17 +1,15 @@
 package com.ff.common.domain;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 /**
 * 币种汇率对象 ff_tenant_quota_exchange
 *
@ -22,36 +20,43 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
-public class TenantQuotaExchange extends BaseEntity
+public class TenantQuotaExchange extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 主键id */
+    /**
     * 主键id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
-    /** 币种编码 */
+    /**
-    @Excel(name = "币种编码")
+     * 币种编码
     */
    private String currencyCode;
-    /** 兑换币种编码 */
+    /**
-    @Excel(name = "兑换币种编码")
+     * 兑换币种编码
     */
    private String exchangeCurrencyCode;
-    /** 市场兑换金额 */
+    /**
-    @Excel(name = "市场兑换金额")
+     * 市场兑换金额
     */
    private BigDecimal exchangeRate;
-    /** 汇率差 1百分比  2 固定值 */
+    /**
-    @Excel(name = "汇率差 1百分比  2 固定值")
+     * 汇率差 1百分比  2 固定值
     */
    private Integer differenceType;
-    /** 汇率差值 */
+    /**
-    @Excel(name = "汇率差值")
+     * 汇率差值
     */
    private BigDecimal differenceValue;
-    /** 实际兑换金额 */
+    /**
-    @Excel(name = "实际兑换金额")
+     * 实际兑换金额
     */
    private BigDecimal actualBalance;
--- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/CurrencyInfo.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/CurrencyInfo.java
--- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/ExtInfo.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/ExtInfo.java
--- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/Game.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/Game.java
@ -2,7 +2,6 @@ package com.ff.game.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@ -33,20 +32,17 @@ public class Game extends BaseEntity {
    /**
     * 排序
     */
    @Excel(name = "排序")
    private Integer sortNo;
    /**
     * 游戏平台id
     */
    @Excel(name = "游戏平台id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long platformId;
    /**
     * 游戏第三方id
     */
    @Excel(name = "游戏第三方id")
    private String gameCode;
    /**
@ -57,31 +53,26 @@ public class Game extends BaseEntity {
    /**
     * 第三方来源分类
     */
    @Excel(name = "第三方来源分类")
    private String gameSourceType;
    /**
     * 游戏名称
     */
    @Excel(name = "游戏名称")
    private String gameName;
    /**
     * 是否支持免费游戏  1 支持  0 不支持
     */
    @Excel(name = "是否支持免费游戏  1 支持  0 不支持")
    private Boolean freespin;
    /**
     * 是否支持试玩 0关闭 1开启
     */
    @Excel(name = "是否支持试玩 0关闭 1开启")
    private Boolean demoStatus;
    /**
     * 维护开关  维护状态
     */
    @Excel(name = "维护开关 ")
    private Boolean stopStatus;
    /**
--- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameBettingDetails.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameBettingDetails.java
@ -0,0 +1,183 @@
 package com.ff.game.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 /**
 * 会员投注细目对象 ff_game_betting_details
 *
 * @author shi
 * @date 2025-02-10
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
 public class GameBettingDetails extends BaseEntity {
    private static final long serialVersionUID = 1L;
    /**
     * 主键id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 租户key
     */
    private String tenantKey;
    /**
     * 币种编码
     */
    private String currencyCode;
    /**
     * 会员id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long memberId;
    /**
     * 游戏id
     */
    private String gameCode;
    /**
     * 游戏id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private String gameId;
    /**
     * 游戏类型 ff_game_type 字典
     */
    private Integer gameType;
    /**
     * 游戏平台
     */
    private String platformCode;
    /**
     * 游戏名称
     */
    private String gameName;
    /**
     * 注单状态 1: 赢 2: 输 3: 平局 4 未知
     */
    private Integer gameStatus;
    /**
     * 注单类型
     * 1 一般下注
     * 9 舞龙争霸和梅杜莎的
     * 11 道具卡
     * 12 游戏内购
     * 17 满额必开 (下注)
     * 18 满额必开 (开奖)
     * 19 免费游戏
     * 28 旋转奖金
     * DG
     * （1:注单，2:红包小费）
     * AE
     * 正常状况：
     * 预设：0
     * 结果更改过状况：
     * Resettle / Unsettle / Voidsettle / Unvoidsettle: 1
     * Voidbet: -1
     */
    private Integer gameStatusType;
    /**
     * 游戏币种类型
     */
    private String gameCurrencyCode;
    /**
     * 游戏账号
     */
    private String account;
    /**
     * 局号
     */
    private String round;
    /**
     * 桌号
     */
    private String table;
    /**
     * 座号
     */
    private String seat;
    /**
     * 投注内容，部分游戏字段内容较长，建议数据库字段类型为 text
     */
    private String betContent;
    /**
     * 游戏注单唯一值
     */
    private String wagersId;
    /**
     * 投注时间 (Unix 时间戳)
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long wagersTime;
    /**
     * 投注金额
     */
    private BigDecimal betAmount;
    /**
     * 派彩时间 (Unix 时间戳)
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long payoffTime;
    /**
     * 派彩金额
     */
    private BigDecimal payoffAmount;
    /**
     * 对帐时间 (Unix 时间戳)
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long settlementTime;
    /**
     * 有效投注金额 ※注 1
     */
    private BigDecimal turnover;
    /**
     * 订单id
     */
    private String orderNo;
    /**
     * 结算状态 1 未结算 2已结算 3 已撤单 4 已取消
     */
    private Integer settlementStatus;
 }
--- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameExchangeMoney.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameExchangeMoney.java
@ -1,17 +1,15 @@
 package com.ff.game.domain;
 import java.math.BigDecimal;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 /**
 * 会员金额转移记录对象 ff_game_exchange_money
 *
@ -22,24 +20,28 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
-public class GameExchangeMoney extends BaseEntity
+public class GameExchangeMoney extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 主键id */
+    /**
     * 主键id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
-    /** 租户key */
+    /**
-    @Excel(name = "租户key")
+     * 租户key
     */
    private String tenantKey;
-    /** 币种编码 */
+    /**
-    @Excel(name = "币种编码")
+     * 币种编码
     */
    private String currencyCode;
-    /** 第三方交易id */
+    /**
-    @Excel(name = "第三方交易id")
+     * 第三方交易id
     */
    private String transactionId;
    /**
@ -47,47 +49,56 @@ public class GameExchangeMoney extends BaseEntity
     */
    private String orderId;
-    /** 会员id */
+    /**
-    @Excel(name = "会员id")
+     * 会员id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long memberId;
-    /** 游戏平台  */
+    /**
-    @Excel(name = "游戏平台 ")
+     * 游戏平台
     */
    private String platformCode;
-    /** 操作金额 */
+    /**
-    @Excel(name = "操作金额")
+     * 操作金额
     */
    private BigDecimal balance;
-    /** 租户操作额度 */
+    /**
-    @Excel(name = "租户操作额度")
+     * 租户操作额度
     */
    private BigDecimal quota;
-    /**  转账前金额(游戏币) */
+    /**
-    @Excel(name = " 转账前金额(游戏币)")
+     * 转账前金额(游戏币)
     */
    private BigDecimal coinBefore;
-    /** 转账后金额(游戏币) */
+    /**
-    @Excel(name = "转账后金额(游戏币)")
+     * 转账后金额(游戏币)
     */
    private BigDecimal coinAfter;
-    /** 转账前金额(指定货币) */
+    /**
-    @Excel(name = "转账前金额(指定货币)")
+     * 转账前金额(指定货币)
     */
    private BigDecimal currencyBefore;
-    /** 转账后金额(指定货币) */
+    /**
-    @Excel(name = "转账后金额(指定货币)")
+     * 转账后金额(指定货币)
     */
    private BigDecimal currencyAfter;
-
+    /**
-    /** 转出类型 1游戏商转入到用户全部转出  2 用户转移到游戏商  3 游戏商转移额度到平台商 */
+     * 转出类型 1游戏商转入到用户全部转出  2 用户转移到游戏商  3 游戏商转移额度到平台商
-    @Excel(name = "转出类型 1游戏商转入到用户全部转出  2 用户转移到游戏商  3 游戏商转移额度到平台商")
+     */
    private Integer exchangeType;
-    /** 状态，0:进行中、1:成功、2:失败 */
+    /**
-    @Excel(name = "状态 1 成功 2失败")
+     * 状态，0:进行中、1:成功、2:失败
     */
    private Integer status;
    /**
--- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameFreeRecord.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/GameFreeRecord.java
@ -2,10 +2,8 @@ package com.ff.game.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@ -20,73 +18,88 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@SuperBuilder
@NoArgsConstructor
-public class GameFreeRecord extends BaseEntity
+public class GameFreeRecord extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 主键id */
+    /**
     * 主键id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
-    /** 币种编码 */
+    /**
-    @Excel(name = "币种编码")
+     * 币种编码
     */
    private String currencyCode;
-    /** 平台代码 */
+    /**
-    @Excel(name = "平台代码")
+     * 平台代码
     */
    private String platformCode;
-    /** 免费局数序号（唯一标识符） */
+    /**
-    @Excel(name = "免费局数序号", readConverterExp = "唯=一标识符")
+     * 免费局数序号（唯一标识符）
     */
    private String referenceId;
-    /** 会员id */
+    /**
-    @Excel(name = "会员id")
+     * 会员id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long memberId;
-    /** 用户账号 */
+    /**
-    @Excel(name = "用户账号")
+     * 用户账号
     */
    private String memberAccount;
-    /** 游戏id  */
+    /**
-    @Excel(name = "游戏id ")
+     * 游戏id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long gameId;
-    /** 免费游戏局数可使用的开始时间 */
+    /**
-    @Excel(name = "免费游戏局数可使用的开始时间")
+     * 免费游戏局数可使用的开始时间
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long sendTime;
-    /** 免费局数过期时间 */
+    /**
-    @Excel(name = "免费局数过期时间")
+     * 免费局数过期时间
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long expiredTime;
-    /** 免费局数记录更新时间 */
+    /**
-    @Excel(name = "免费局数记录更新时间")
+     * 免费局数记录更新时间
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long freeUpdateTime;
-    /** 免费局数赠送的游戏名称 */
+    /**
-    @Excel(name = "免费局数赠送的游戏名称")
+     * 免费局数赠送的游戏名称
     */
    private String sendGame;
-    /** 免费局数赠送的数量 */
+    /**
-    @Excel(name = "免费局数赠送的数量")
+     * 免费局数赠送的数量
     */
    private Integer sendAmount;
-    /** 已使用的免费局数数量 */
+    /**
-    @Excel(name = "已使用的免费局数数量")
+     * 已使用的免费局数数量
     */
    private Integer usedAmount;
-    /** 未使用的免费局数数量 */
+    /**
-    @Excel(name = "未使用的免费局数数量")
+     * 未使用的免费局数数量
     */
    private Integer unusedAmount;
-    /** 免费状态    1正常 0 取消  */
+    /**
-    @Excel(name = "免费状态    1正常 0 取消 ")
+     * 免费状态    1正常 0 取消
     */
    private Integer freeStatus;
--- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/KeyInfo.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/KeyInfo.java
--- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/LangInfo.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/LangInfo.java
--- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/NameInfo.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/NameInfo.java
--- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/Platform.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/Platform.java
--- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/PlatformInfo.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/PlatformInfo.java
--- a/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/UrlInfo.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/game/domain/UrlInfo.java
--- a/ff-bean/ff-mysql/src/main/java/com/ff/member/domain/Member.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/member/domain/Member.java
@ -2,10 +2,8 @@ package com.ff.member.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@ -20,32 +18,38 @@ import lombok.experimental.SuperBuilder;
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
-public class Member extends BaseEntity
+public class Member extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** 主键id */
+    /**
     * 主键id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
-    /** 租户key */
+    /**
-    @Excel(name = "租户key")
+     * 租户key
     */
    private String tenantKey;
-    /** 会员账号 */
+    /**
-    @Excel(name = "会员账号")
+     * 会员账号
     */
    private String memberAccount;
-    /** 游戏账号 */
+    /**
-    @Excel(name = "游戏账号")
+     * 游戏账号
     */
    private String gameAccount;
-    /** 平台编码 */
+    /**
-    @Excel(name = "平台编码")
+     * 平台编码
     */
    private String platformCode;
-    /** 币种编码 */
+    /**
-    @Excel(name = "币种编码")
+     * 币种编码
     */
    private String currencyCode;
--- a/ff-bean/ff-mysql/src/main/java/com/ff/sys/domain/SysFeedback.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/sys/domain/SysFeedback.java
@ -0,0 +1,60 @@
 package com.ff.sys.domain;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.Data;
 /**
 * 系统反馈对象 ff_sys_feedback
 *
 * @author shi
 * @date 2025-02-27
 */
@Data
 public class SysFeedback extends BaseEntity {
    private static final long serialVersionUID = 1L;
    /**
     * $column.columnComment
     */
    private Long id;
    /**
     * 用户类型  1 租户 2代理
     */
    private Integer userType;
    /**
     * 用户id
     */
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;
    /**
     * 标题
     */
    private String title;
    /**
     * 手机号
     */
    private String phone;
    /**
     * 反馈内容
     */
    private String content;
    /**
     * 状态  1待处理 2已处理
     */
    private Integer status;
    /**
     * 回复内容
     */
    private String replyContent;
 }
--- a/ff-bean/ff-mysql/src/main/java/com/ff/sys/domain/SysNotice.java
+++ b/ff-bean/ff-mysql/src/main/java/com/ff/sys/domain/SysNotice.java
@ -1,8 +1,8 @@
 package com.ff.sys.domain;
 import com.ff.base.annotation.Excel;
 import com.ff.base.core.domain.BaseEntity;
 import lombok.Data;
 /**
 * 系统公告对象 ff_sys_notice
 *
@ -10,19 +10,22 @@ import lombok.Data;
 * @date 2025-02-28
 */
@Data
-public class SysNotice extends BaseEntity
+public class SysNotice extends BaseEntity {
 {
    private static final long serialVersionUID = 1L;
-    /** $column.columnComment */
+    /**
     * $column.columnComment
     */
    private Long id;
-    /** 标题 */
+    /**
-    @Excel(name = "标题")
+     * 标题
     */
    private String title;
-    /** 内容 */
+    /**
-    @Excel(name = "内容")
+     * 内容
     */
    private String content;
--- a/ff-fetcher/pom.xml
+++ b/ff-fetcher/pom.xml
@ -0,0 +1,108 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <artifactId>ff</artifactId>
        <groupId>com.ff</groupId>
        <version>0.0.1</version>
    </parent>
    <groupId>com.ff</groupId>
    <artifactId>ff-fetcher</artifactId>
    <version>0.0.1</version>
    <name>ff-fetcher</name>
    <dependencies>
        <dependency>
            <groupId>com.xuxueli</groupId>
            <artifactId>xxl-job-core</artifactId>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>com.dtflys.forest</groupId>
            <artifactId>forest-spring-boot-starter</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <!-- 自定义验证注解 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-validation</artifactId>
        </dependency>
        <!--常用工具类 -->
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
        </dependency>
        <!-- 阿里JSON解析器 -->
        <dependency>
            <groupId>com.alibaba.fastjson2</groupId>
            <artifactId>fastjson2</artifactId>
        </dependency>
        <!-- io常用工具类 -->
        <dependency>
            <groupId>commons-io</groupId>
            <artifactId>commons-io</artifactId>
        </dependency>
        <!-- redis 缓存操作 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>
        <!-- pool 对象池， redis 依赖此对象池 -->
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-pool2</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-mongodb</artifactId>
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <version>2.5.15</version>
                <configuration>
                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
                </configuration>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-war-plugin</artifactId>
                <version>3.1.0</version>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <warName>xk-fetcher</warName>
                </configuration>
            </plugin>
        </plugins>
        <finalName>xk-fetcher</finalName>
    </build>
 </project>
--- a/ff-fetcher/src/main/java/com/ff/FFApplication.java
+++ b/ff-fetcher/src/main/java/com/ff/FFApplication.java
@ -0,0 +1,28 @@
 package com.ff;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringBootVersion;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.scheduling.annotation.EnableAsync;
 /**
 * 启动程序
 *
 * @author ff
 */
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
@EnableAsync
 public class FFApplication {
    public static void main(String[] args) {
        // System.setProperty("spring.devtools.restart.enabled", "false");
        SpringApplication.run(FFApplication.class, args);
        System.out.println("(♥◠‿◠)ﾉﾞ  FF启动成功   ლ(´ڡ`ლ)ﾞ" + SpringBootVersion.getVersion());
    }
 }
--- a/ff-fetcher/src/main/java/com/ff/utils/CalculateDateDaysAgo.java
+++ b/ff-fetcher/src/main/java/com/ff/utils/CalculateDateDaysAgo.java
--- a/ff-fetcher/src/main/java/com/ff/utils/SortByAttributeNameASC.java
+++ b/ff-fetcher/src/main/java/com/ff/utils/SortByAttributeNameASC.java
--- a/ff-fetcher/src/main/java/com/ff/utils/TimestampFromString.java
+++ b/ff-fetcher/src/main/java/com/ff/utils/TimestampFromString.java
--- a/ff-fetcher/src/main/java/com/ff/xxljob/config/XxlJobConfig.java
+++ b/ff-fetcher/src/main/java/com/ff/xxljob/config/XxlJobConfig.java
@ -0,0 +1,53 @@
 package com.ff.xxljob.config;
 import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@Configuration
@Slf4j
 public class XxlJobConfig {
    @Value("${xxl.job.admin.addresses}")
    private String adminAddresses;
    @Value("${xxl.job.accessToken}")
    private String accessToken;
    @Value("${xxl.job.executor.appname}")
    private String appname;
    @Value("${xxl.job.executor.address}")
    private String address;
    @Value("${xxl.job.executor.ip}")
    private String ip;
    @Value("${xxl.job.executor.port}")
    private int port;
    @Value("${xxl.job.executor.logpath}")
    private String logPath;
    @Value("${xxl.job.executor.logretentiondays}")
    private int logRetentionDays;
    @Bean
    public XxlJobSpringExecutor xxlJobExecutor() {
        log.info(">>>>>>>>>>> xxl-job config init.");
        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
        xxlJobSpringExecutor.setAppname(appname);
        xxlJobSpringExecutor.setAddress(address);
        xxlJobSpringExecutor.setIp(ip);
        xxlJobSpringExecutor.setPort(port);
        xxlJobSpringExecutor.setAccessToken(accessToken);
        xxlJobSpringExecutor.setLogPath(logPath);
        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
        return xxlJobSpringExecutor;
    }
 }
--- a/ff-fetcher/src/main/java/com/ff/xxljob/fetch/TaskParam.java
+++ b/ff-fetcher/src/main/java/com/ff/xxljob/fetch/TaskParam.java
@ -0,0 +1,13 @@
 package com.ff.xxljob.fetch;
 import lombok.Data;
 /**
 * @author cengy
 */
@Data
 public class TaskParam {
    // 定时任务的参数：平台code, 拉多少分钟前的
    private String platformCode;
    private long ago;
 }
--- a/ff-fetcher/src/main/java/com/ff/xxljob/task/AbstractTask.java
+++ b/ff-fetcher/src/main/java/com/ff/xxljob/task/AbstractTask.java
@ -0,0 +1,29 @@
 package com.ff.xxljob.task;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.IJobHandler;
 import lombok.extern.slf4j.Slf4j;
 /**
 * 定时任务执行抽象类
 *
 * @author cengy
 */
@Slf4j
 public abstract class AbstractTask extends IJobHandler {
    /**
     * 执行有参方法
     */
    abstract void doExecute(String params);
    /**
     * 无参执行方法 执行业务前切换数据源
     */
    @Override
    public void execute() throws Exception {
        String params = XxlJobHelper.getJobParam(); // 获取任务参数
        doExecute(params);
    }
 }
--- a/ff-fetcher/src/main/java/com/ff/xxljob/task/FetchHistoryOrderListTask.java
+++ b/ff-fetcher/src/main/java/com/ff/xxljob/task/FetchHistoryOrderListTask.java
@ -0,0 +1,20 @@
 package com.ff.xxljob.task;
 import com.ff.xxljob.fetch.TaskParam;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
 /**
 * 拉取历史投注订单列表
 *
 * @author cengy
 */
@Component
 public class FetchHistoryOrderListTask extends FetchTask {
    @XxlJob("fetchHistoryOrderListTask")
    @Override
    public void doExecute(TaskParam taskParam) {
    }
 }
--- a/ff-fetcher/src/main/java/com/ff/xxljob/task/FetchOrderListTask.java
+++ b/ff-fetcher/src/main/java/com/ff/xxljob/task/FetchOrderListTask.java
@ -0,0 +1,20 @@
 package com.ff.xxljob.task;
 import com.ff.xxljob.fetch.TaskParam;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
 /**
 * 拉取投注订单列表
 *
 * @author cengy
 */
@Component
 public class FetchOrderListTask extends FetchTask {
    @XxlJob("fetchOrderListTask")
    @Override
    public void doExecute(TaskParam taskParam) {
    }
 }
--- a/ff-fetcher/src/main/java/com/ff/xxljob/task/FetchTask.java
+++ b/ff-fetcher/src/main/java/com/ff/xxljob/task/FetchTask.java
@ -0,0 +1,24 @@
 package com.ff.xxljob.task;
 import com.ff.xxljob.fetch.TaskParam;
 import org.apache.commons.lang3.StringUtils;
 /**
 * @author cengy
 */
 public abstract class FetchTask extends AbstractTask {
    @Override
    void doExecute(String params) {
        if (StringUtils.isEmpty(params)) {
            return;
        }
        String[] split = params.split(",");
        TaskParam param = new TaskParam();
        param.setPlatformCode(split[0]);
        param.setAgo(Long.parseLong(split[1]));
        doExecute(param);
    }
    abstract public void doExecute(TaskParam taskParam);
 }
--- a/ff-fetcher/src/main/resources/application-prod.properties
+++ b/ff-fetcher/src/main/resources/application-prod.properties
@ -0,0 +1,41 @@
 # 引入子配置文件
 spring.config.import=\
  classpath:config/test/redis.properties,\
  classpath:config/test/xxljob.properties,\
  classpath:config/test/mongo.properties
 # 项目相关配置
 ff.name=FF-Fetcher
 ff.version=0.0.1
 ff.copyrightYear=2024
 ff.profile=D:/ff/uploadPath
 ff.addressEnabled=false
 ff.captchaType=math
 # 开发环境配置
 server.port=19080
 server.servlet.context-path=/
 server.tomcat.uri-encoding=UTF-8
 server.tomcat.accept-count=1000
 server.tomcat.threads.max=800
 server.tomcat.threads.min-spare=100
 # 日志配置
 logging.level.com.ff=debug
 logging.level.org.springframework=warn
 # 用户配置
 user.password.maxRetryCount=5
 user.password.lockTime=10
 # Spring配置
 spring.mvc.pathmatch.matching-strategy=ant_path_matcher
 spring.messages.basename=i18n/messages
 spring.servlet.multipart.max-file-size=20MB
 spring.servlet.multipart.max-request-size=20MB
 # Token配置
 token.header=Authorization
 token.secret=abcdefghijklmnopqrstuvwxyz
 token.expireTime=10080
--- a/ff-fetcher/src/main/resources/application-test.properties
+++ b/ff-fetcher/src/main/resources/application-test.properties
@ -0,0 +1,41 @@
 # 引入子配置文件
 spring.config.import=\
  classpath:config/test/redis.properties,\
  classpath:config/test/xxljob.properties,\
  classpath:config/test/mongo.properties
 # 项目相关配置
 ff.name=FF-Fetcher
 ff.version=0.0.1
 ff.copyrightYear=2024
 ff.profile=D:/ff/uploadPath
 ff.addressEnabled=false
 ff.captchaType=math
 # 开发环境配置
 server.port=9082
 server.servlet.context-path=/
 server.tomcat.uri-encoding=UTF-8
 server.tomcat.accept-count=1000
 server.tomcat.threads.max=800
 server.tomcat.threads.min-spare=100
 # 日志配置
 logging.level.com.ff=debug
 logging.level.org.springframework=warn
 # 用户配置
 user.password.maxRetryCount=5
 user.password.lockTime=10
 # Spring配置
 spring.mvc.pathmatch.matching-strategy=ant_path_matcher
 spring.messages.basename=i18n/messages
 spring.servlet.multipart.max-file-size=20MB
 spring.servlet.multipart.max-request-size=20MB
 # Token配置
 token.header=Authorization
 token.secret=abcdefghijklmnopqrstuvwxyz
 token.expireTime=10080
--- a/ff-fetcher/src/main/resources/application.properties
+++ b/ff-fetcher/src/main/resources/application.properties
@ -0,0 +1 @@
 spring.profiles.active=test
--- a/ff-fetcher/src/main/resources/config/prod/mongo.properties
+++ b/ff-fetcher/src/main/resources/config/prod/mongo.properties
@ -0,0 +1,2 @@
 # Mongo 数据源配置
 spring.data.mongodb.uri=mongodb://admin:123456@localhost:17017/?authSource=admin
--- a/ff-fetcher/src/main/resources/config/prod/redis.properties
+++ b/ff-fetcher/src/main/resources/config/prod/redis.properties
@ -0,0 +1,12 @@
 # Redis 配置
 spring.redis.host=192.168.50.11
 spring.redis.port=26379
 spring.redis.database=10
 spring.redis.password=reAa123456
 spring.redis.timeout=10s
 # Lettuce 连接池配置
 spring.redis.lettuce.pool.min-idle=0
 spring.redis.lettuce.pool.max-idle=8
 spring.redis.lettuce.pool.max-active=8
 spring.redis.lettuce.pool.max-wait=-1ms
--- a/ff-fetcher/src/main/resources/config/prod/xxljob.properties
+++ b/ff-fetcher/src/main/resources/config/prod/xxljob.properties
@ -0,0 +1,9 @@
 # XXL-Job配置
 xxl.job.admin.addresses=http://192.168.50.11:2980/xxl-job-admin/
 xxl.job.accessToken=
 xxl.job.executor.appname=ff-admin-job-name
 xxl.job.executor.address=http://192.168.50.28:13998
 xxl.job.executor.ip=192.168.50.28
 xxl.job.executor.port=13998
 xxl.job.executor.logpath=./logs/job
 xxl.job.executor.logretentiondays=30
--- a/ff-fetcher/src/main/resources/config/test/mongo.properties
+++ b/ff-fetcher/src/main/resources/config/test/mongo.properties
@ -0,0 +1,2 @@
 # Mongo 数据源配置
 spring.data.mongodb.uri=mongodb://admin:123456@localhost:17017/?authSource=admin
--- a/ff-fetcher/src/main/resources/config/test/redis.properties
+++ b/ff-fetcher/src/main/resources/config/test/redis.properties
@ -0,0 +1,12 @@
 # Redis 配置
 spring.redis.host=192.168.50.11
 spring.redis.port=26379
 spring.redis.database=10
 spring.redis.password=reAa123456
 spring.redis.timeout=10s
 # Lettuce 连接池配置
 spring.redis.lettuce.pool.min-idle=0
 spring.redis.lettuce.pool.max-idle=8
 spring.redis.lettuce.pool.max-active=8
 spring.redis.lettuce.pool.max-wait=-1ms
--- a/ff-fetcher/src/main/resources/config/test/xxljob.properties
+++ b/ff-fetcher/src/main/resources/config/test/xxljob.properties
@ -0,0 +1,9 @@
 # XXL-Job配置
 xxl.job.admin.addresses=http://192.168.50.11:2980/xxl-job-admin/
 xxl.job.accessToken=
 xxl.job.executor.appname=ff-admin-job-name
 xxl.job.executor.address=http://192.168.50.28:13998
 xxl.job.executor.ip=192.168.50.28
 xxl.job.executor.port=13998
 xxl.job.executor.logpath=./logs/job
 xxl.job.executor.logretentiondays=30
--- a/ff-fetcher/src/main/resources/i18n/messages.properties
+++ b/ff-fetcher/src/main/resources/i18n/messages.properties
--- a/ff-fetcher/src/main/resources/logback.xml
+++ b/ff-fetcher/src/main/resources/logback.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
    <!-- 日志存放路径 -->
-	<property name="log.path" value="/opt/sever/dist/ff-game/logs" />
+	<property name="log.path" value="./logs" />
    <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS}-[%X{dataSource}] [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
--- a/ff-game/pom.xml
+++ b/ff-game/pom.xml
@ -11,46 +11,35 @@
    <groupId>com.ff</groupId>
    <artifactId>ff-game</artifactId>
    <version>0.0.1</version>
-    <name>ff-admin</name>
+    <name>ff-game</name>
-    <description>ff-admin</description>
+    <description>ff-game</description>
    <dependencies>
        <dependency>
            <groupId>com.ff</groupId>
            <artifactId>ff-mysql-entity</artifactId>
        </dependency>
        <dependency>
            <groupId>com.xuxueli</groupId>
            <artifactId>xxl-job-core</artifactId>
        </dependency>
        <!--<dependency>
            <groupId>org.apache.rocketmq</groupId>
            <artifactId>rocketmq-spring-boot-starter</artifactId>
            <version>2.4.10</version> &lt;!&ndash; 请检查最新版本 &ndash;&gt;
        </dependency>-->
        <!-- spring-boot-devtools -->
-        <dependency>
+        <!--<dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional> <!-- 表示依赖不会传递 -->
+            <optional>true</optional> &lt;!&ndash; 表示依赖不会传递 &ndash;&gt;
-        </dependency>
+        </dependency>-->
        <!-- Jackson XML 数据格式支持 -->
        <dependency>
            <groupId>com.fasterxml.jackson.dataformat</groupId>
            <artifactId>jackson-dataformat-xml</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-context</artifactId>
        </dependency>
        <!-- swagger3-->
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-boot-starter</artifactId>
        </dependency>
        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
        <dependency>
            <groupId>io.swagger</groupId>
            <artifactId>swagger-models</artifactId>
            <version>1.6.2</version>
        </dependency>
        <!-- Mysql驱动包 -->
        <dependency>
            <groupId>mysql</groupId>
@ -69,17 +58,6 @@
            </exclusions>
        </dependency>
        <!-- 核心模块-->
        <dependency>
            <groupId>com.ff</groupId>
            <artifactId>ff-base</artifactId>
        </dependency>
        <!-- 代码生成-->
        <dependency>
            <groupId>com.ff</groupId>
            <artifactId>ff-gen</artifactId>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
@ -97,8 +75,113 @@
            <version>1.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.dtflys.forest</groupId>
            <artifactId>forest-spring-boot-starter</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>druid-spring-boot-starter</artifactId>
        </dependency>
        <!-- 验证码 -->
        <dependency>
            <groupId>pro.fessional</groupId>
            <artifactId>kaptcha</artifactId>
        </dependency>
        <!-- 获取系统信息 -->
        <dependency>
            <groupId>com.github.oshi</groupId>
            <artifactId>oshi-core</artifactId>
        </dependency>
        <!-- pagehelper 分页插件 -->
        <dependency>
            <groupId>com.github.pagehelper</groupId>
            <artifactId>pagehelper-spring-boot-starter</artifactId>
        </dependency>
        <!-- 自定义验证注解 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-validation</artifactId>
        </dependency>
        <!--常用工具类 -->
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
        </dependency>
        <!-- 阿里JSON解析器 -->
        <dependency>
            <groupId>com.alibaba.fastjson2</groupId>
            <artifactId>fastjson2</artifactId>
        </dependency>
        <!-- io常用工具类 -->
        <dependency>
            <groupId>commons-io</groupId>
            <artifactId>commons-io</artifactId>
        </dependency>
        <!-- excel工具 -->
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-ooxml</artifactId>
        </dependency>
        <!-- Token生成与解析-->
        <dependency>
            <groupId>io.jsonwebtoken</groupId>
            <artifactId>jjwt</artifactId>
        </dependency>
        <!-- redis 缓存操作 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
        </dependency>
        <!-- 解析客户端操作系统、浏览器等 -->
        <dependency>
            <groupId>eu.bitwalker</groupId>
            <artifactId>UserAgentUtils</artifactId>
        </dependency>
        <!-- 二维码生成 -->
        <dependency>
            <groupId>com.google.zxing</groupId>
            <artifactId>core</artifactId>
        </dependency>
        <dependency>
            <groupId>com.google.zxing</groupId>
            <artifactId>javase</artifactId>
        </dependency>
        <!-- spring security 安全认证 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-security</artifactId>
        </dependency>
        <!-- SpringBoot 拦截器 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-aop</artifactId>
        </dependency>
        <!-- pool 对象池 -->
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-pool2</artifactId>
        </dependency>
    </dependencies>
    <build>
@ -118,17 +201,9 @@
                    </execution>
                </executions>
            </plugin>
-            <plugin>
+
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-war-plugin</artifactId>
                <version>3.1.0</version>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <warName>${project.artifactId}</warName>
                </configuration>
            </plugin>
        </plugins>
-        <finalName>${project.artifactId}</finalName>
+        <finalName>xk-admin</finalName>
    </build>
 </project>
--- a/ff-game/src/main/java/com/ff/FFApplication.java
+++ b/ff-game/src/main/java/com/ff/FFApplication.java
@ -1,39 +0,0 @@
 package com.ff;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringBootVersion;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.FilterType;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
 /**
 * 启动程序
 *
 * @author ff
 */
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
@MapperScan({"com.ff.base.system.mapper","com.ff.quartz.mapper","com.ff.gen.mapper"})
@ComponentScan(excludeFilters = {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = DaoAuthenticationProvider.class)})
@EnableAsync
 public class FFApplication
 {
    public static void main(String[] args)
    {
        // System.setProperty("spring.devtools.restart.enabled", "false");
        SpringApplication.run(FFApplication.class, args);
        System.out.println("(♥◠‿◠)ﾉﾞ  FF启动成功   ლ(´ڡ`ლ)ﾞ"+ SpringBootVersion.getVersion());
    }
 }
--- a/ff-game/src/main/java/com/ff/FFServletInitializer.java
+++ b/ff-game/src/main/java/com/ff/FFServletInitializer.java
@ -1,18 +0,0 @@
 package com.ff;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 /**
 * web容器中进行部署
 *
 * @author ff
 */
 public class FFServletInitializer extends SpringBootServletInitializer
 {
    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
    {
        return application.sources(FFApplication.class);
    }
 }
--- a/ff-game/src/main/java/com/ff/agent/controller/AgentController.java
+++ b/ff-game/src/main/java/com/ff/agent/controller/AgentController.java
@ -1,151 +0,0 @@
 package com.ff.agent.controller;
 import
        com.ff.agent.dto.AgentTenantSecretKeyDTO;
 import com.ff.agent.dto.AgentCreateTenantDTO;
 import com.ff.base.constant.Constants;
 import com.ff.base.core.controller.BaseController;
 import com.ff.base.core.domain.AjaxResult;
 import com.ff.base.core.page.TableDataInfo;
 import com.ff.base.enums.OperationType;
 import com.ff.base.enums.QuotaType;
 import com.ff.base.exception.base.BaseException;
 import com.ff.base.system.domain.TenantPlatform;
 import com.ff.base.system.dto.CreateTenantDTO;
 import com.ff.base.system.dto.TenantSecretKeyDTO;
 import com.ff.base.system.service.ISysDeptService;
 import com.ff.base.system.service.ISysRoleService;
 import com.ff.base.system.service.ISysUserService;
 import com.ff.base.utils.DateUtils;
 import com.ff.base.utils.bean.BeanUtils;
 import com.ff.base.utils.ip.IpUtils;
 import com.ff.base.system.domain.TenantSecretKey;
 import com.ff.common.domain.TenantAgentPlatform;
 import com.ff.common.dto.BalanceChangesDTO;
 import com.ff.common.service.ITenantAgentPlatformService;
 import com.ff.common.service.ITenantGameQuotaService;
 import com.ff.base.system.service.ITenantSecretKeyService;
 import com.ff.base.system.service.ITenantPlatformService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 /**
 * api控制器
 *
 * @author shi
 * @date 2025/02/10
 */
@RestController
@RequestMapping("/agent/tenant")
@Slf4j
 public class AgentController extends BaseController {
    @Resource
    private ITenantSecretKeyService tenantSecretKeyService;
    @Resource
    private ITenantGameQuotaService tenantGameQuotaService;
    @Resource
    private ITenantPlatformService tenantPlatformService;
    @Resource
    private ITenantAgentPlatformService tenantAgentPlatformService;
    /**
     * 列表
     *
     * @param tenantSecretKeyDTO 租户密钥
     * @return {@link TableDataInfo }
     */
    @GetMapping("/list")
    @Transactional
    @PreAuthorize("@ss.hasPermi('agent:tenant:list')")
    public TableDataInfo list(TenantSecretKeyDTO tenantSecretKeyDTO) {
        startPage();
        tenantSecretKeyDTO.setAgentId(getUserId());
        List<TenantSecretKey> tenantSecretKeys = tenantSecretKeyService.selectTenantSecretKeyDTOList(tenantSecretKeyDTO);
        TableDataInfo dataTable = getDataTable(tenantSecretKeys);
        List<AgentTenantSecretKeyDTO> list = new ArrayList<>();
        for (TenantSecretKey row : (List<TenantSecretKey>) dataTable.getRows()) {
            AgentTenantSecretKeyDTO agentTenantSecretKeyDTO = new AgentTenantSecretKeyDTO();
            BeanUtils.copyProperties(row, agentTenantSecretKeyDTO);
            agentTenantSecretKeyDTO.setTenantPlatforms(tenantPlatformService.selectTenantPlatformList(TenantPlatform.builder()
                            .tenantId(row.getId())
                    .build()));
            list.add(agentTenantSecretKeyDTO);
        }
        dataTable.setRows(list);
        return dataTable;
    }
    /**
     * 创建租户
     *
     * @return {@link AjaxResult }
     */
    @PostMapping("/create")
    @Transactional
    @PreAuthorize("@ss.hasPermi('agent:tenant:create')")
    public AjaxResult createTenant(@Validated @RequestBody AgentCreateTenantDTO agentCreateTenantDTO) {
        //构造租户的充值信息
        List<TenantPlatform> tenantPlatforms = new ArrayList<>();
        for (TenantAgentPlatform tenantAgentPlatform : agentCreateTenantDTO.getTenantAgentPlatforms()) {
            TenantAgentPlatform agentPlatform = tenantAgentPlatformService.selectTenantAgentPlatformById(tenantAgentPlatform.getId());
            // 成本比平台成本大
            if (agentPlatform.getCost().compareTo(tenantAgentPlatform.getCost())>0){
                throw new BaseException("成本比例不允许比最低比例小");
            }
            TenantPlatform tenantPlatform = new TenantPlatform();
            BeanUtils.copyProperties(tenantAgentPlatform, tenantPlatform);
            tenantPlatforms.add(tenantPlatform);
        }
        //创建租户
        Integer tenant = tenantSecretKeyService.createTenant(CreateTenantDTO.builder()
                .registerTime(DateUtils.getNowDate())
                .registerIp(IpUtils.getIpAddr())
                .agentId(getUserId())
                .account(agentCreateTenantDTO.getAccount())
                .password(agentCreateTenantDTO.getPassword())
                .scoreRatio(agentCreateTenantDTO.getScoreRatio())
                .tenantType(agentCreateTenantDTO.getTenantType())
                .depositRatio(agentCreateTenantDTO.getDepositRatio())
                .tenantPlatforms(tenantPlatforms)
                .build());
        if (tenant > 0) {
            //信誉额度
            if (!ObjectUtils.isEmpty(agentCreateTenantDTO.getRealBalance())) {
                tenantGameQuotaService.balanceChanges(BalanceChangesDTO.builder()
                        .isOut(Boolean.TRUE)
                        .currencyCode(Constants.USDT)
                        .tenantKey(agentCreateTenantDTO.getAccount())
                        .balance(agentCreateTenantDTO.getRealBalance())
                        .operationType(OperationType.TENANT_RECHARGE.getCode())
                        .quotaType(QuotaType.REPUTATION.getCode())
                        .remark(OperationType.TENANT_RECHARGE.getDescription())
                        .build());
            }
        }
        return toAjax(tenant);
    }
 }
--- a/ff-game/src/main/java/com/ff/agent/controller/TenantAgentCommissionController.java
+++ b/ff-game/src/main/java/com/ff/agent/controller/TenantAgentCommissionController.java
@ -1,150 +0,0 @@
 package com.ff.agent.controller;
 import java.math.BigDecimal;
 import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import cn.hutool.core.util.NumberUtil;
 import com.ff.agent.domain.TenantAgentWithdrawal;
 import com.ff.agent.service.ITenantAgentInviteService;
 import com.ff.agent.service.ITenantAgentWithdrawalService;
 import com.ff.base.annotation.Excel;
 import com.ff.base.constant.Constants;
 import com.ff.base.enums.CommissionApprovalStatus;
 import com.ff.base.enums.CommissionSourceType;
 import com.ff.base.enums.CommissionType;
 import com.ff.base.system.domain.TenantAgent;
 import com.ff.base.system.service.ITenantAgentService;
 import com.github.pagehelper.util.StringUtil;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 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.ff.base.annotation.Log;
 import com.ff.base.core.controller.BaseController;
 import com.ff.base.core.domain.AjaxResult;
 import com.ff.base.enums.BusinessType;
 import com.ff.agent.domain.TenantAgentCommission;
 import com.ff.agent.service.ITenantAgentCommissionService;
 import com.ff.base.utils.poi.ExcelUtil;
 import com.ff.base.core.page.TableDataInfo;
 /**
 * 代理佣金管理 Controller
 *
 * @author shi
 * @date 2025-02-26
 */
@RestController
@RequestMapping("/agent/commission")
 public class TenantAgentCommissionController extends BaseController {
    @Autowired
    private ITenantAgentCommissionService tenantAgentCommissionService;
    @Resource
    private ITenantAgentWithdrawalService tenantAgentWithdrawalService;
    @Resource
    private ITenantAgentService tenantAgentService;
    /**
     * 查询代理佣金管理 列表
     */
    @PreAuthorize("@ss.hasPermi('agent:commission:list')")
    @GetMapping("/list")
    public AjaxResult list(TenantAgentCommission tenantAgentCommission) {
        startPage();
        tenantAgentCommission.setAgentId(getUserId());
        List<TenantAgentCommission> list = tenantAgentCommissionService.selectTenantAgentCommissionList(tenantAgentCommission);
        //未提现佣金
        tenantAgentCommission.setApprovalStatus(CommissionApprovalStatus.UNWITHDRAWN.getValue());
        BigDecimal unwithdrawn = tenantAgentCommissionService.getAgentCommissionSum(tenantAgentCommission);
        //已提现佣金
        tenantAgentCommission.setApprovalStatus(CommissionApprovalStatus.WITHDRAWN.getValue());
        BigDecimal withdrawn = tenantAgentCommissionService.getAgentCommissionSum(tenantAgentCommission);
        //总佣金
        tenantAgentCommission.setApprovalStatus(null);
        BigDecimal total = tenantAgentCommissionService.getAgentCommissionSum(tenantAgentCommission);
        // 邀请佣金
        tenantAgentCommission.setCommissionType(CommissionType.INVITE.getValue());
        BigDecimal invite = tenantAgentCommissionService.getAgentCommissionSum(tenantAgentCommission);
        //抽成佣金
        tenantAgentCommission.setCommissionType(CommissionType.TAKE.getValue());
        BigDecimal take = tenantAgentCommissionService.getAgentCommissionSum(tenantAgentCommission);
        TableDataInfo dataTable = getDataTable(list);
        AjaxResult ajaxResult = success(dataTable);
        ajaxResult.put("unwithdrawn", unwithdrawn);
        ajaxResult.put("withdrawn", withdrawn);
        ajaxResult.put("total", total);
        ajaxResult.put("invite", invite);
        ajaxResult.put("take", take);
        return ajaxResult;
    }
    /**
     * 获取代理佣金管理 详细信息
     */
    @PreAuthorize("@ss.hasPermi('agent:commission:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(tenantAgentCommissionService.selectTenantAgentCommissionById(id));
    }
    /**
     * 修改代理佣金管理
     */
    @PreAuthorize("@ss.hasPermi('agent:commission:edit')")
    @Log(title = "代理佣金管理 ", businessType = BusinessType.UPDATE)
    @PutMapping
    @Transactional
    public synchronized AjaxResult edit() {
        //查询钱包
        TenantAgent tenantAgent = tenantAgentService.selectTenantAgentById(getUserId());
        Assert.isTrue(tenantAgent.getTenantStatus(), "当前租户已被停用");
        Assert.isTrue(!StringUtil.isEmpty(tenantAgent.getWalletAddress()) &&
                !StringUtil.isEmpty(tenantAgent.getCurrencyAgreement()), "钱包地址为空");
        //查询代理佣金信息
        TenantAgentCommission agentCommission = new TenantAgentCommission();
        agentCommission.setAgentId(getUserId());
        agentCommission.setApprovalStatus(CommissionApprovalStatus.UNWITHDRAWN.getValue());
        List<TenantAgentCommission> list = tenantAgentCommissionService.selectTenantAgentCommissionList(agentCommission);
        BigDecimal usdtBalance = list.stream().map(TenantAgentCommission::getUsdtBalance).reduce(NumberUtil::add).get();
        Assert.isTrue(usdtBalance.compareTo(BigDecimal.ZERO) > 0, "佣金待提现余额为0");
        TenantAgentWithdrawal tenantAgentWithdrawal = TenantAgentWithdrawal.builder()
                .agentId(getUserId())
                .commissionBalance(usdtBalance)
                .currencyAgreement(tenantAgent.getWalletAddress())
                .walletAddress(tenantAgent.getWalletAddress())
                .build();
        tenantAgentWithdrawalService.insertTenantAgentWithdrawal(tenantAgentWithdrawal);
        for (TenantAgentCommission commission : list) {
            commission.setAgentWithdrawalId(tenantAgentWithdrawal.getId());
            commission.setUpdateBy(getUsername());
            commission.setApprovalStatus(CommissionApprovalStatus.WITHDRAWING.getValue());
            tenantAgentCommissionService.updateTenantAgentCommission(commission);
        }
        return toAjax(1);
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
liaoyong	bd023143b7	Merge remote-tracking branch 'origin/upgrade' into upgrade	2025-04-11 19:33:52 +08:00
liaoyong	5774321bea	refactor(工程): 调整工程代码结构	2025-04-11 19:30:06 +08:00
liaoyong	3b754902f0	refactor(工程): 调整工程代码结构	2025-04-11 19:28:20 +08:00
liaoyong	de27d191c2	refactor(工程): 调整工程代码结构	2025-04-11 19:22:49 +08:00
liaoyong	773d0db66e	refactor(工程): 调整工程代码结构	2025-04-11 14:39:54 +08:00
		`@ -0,0 +1,2 @@`
							`# Mongo 数据源配置`
							`spring.data.mongodb.uri=mongodb://admin:123456@localhost:17017/?authSource=admin`