移除多余模块

base-api/pom.xml

@@ -1,23 +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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>tofly-parent</artifactId>
-        <groupId>com.tofly</groupId>
-        <version>1.0.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>base-api</artifactId>
-    <packaging>jar</packaging>
-    <version>1.0.0</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.tofly</groupId>
-            <artifactId>common-core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-    </dependencies>
-</project>

base-api/src/main/java/com/tofly/base/api/dto/UserInfo.java

@@ -1,29 +0,0 @@
-package com.tofly.base.api.dto;
-
-import com.tofly.base.api.entity.SysUser;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author Administrator
- * @date 2019/9/6  15:46
- */
-@Data
-public class UserInfo implements Serializable {
-
-    private static final long serialVersionUID = 4950628032564330016L;
-    /**
-     * 用户基本信息
-     */
-    private SysUser sysUser;
-    /**
-     * 权限标识集合
-     */
-    private String[] permissions;
-
-    /**
-     * 角色集合
-     */
-    private Long[] roles;
-}

base-api/src/main/java/com/tofly/base/api/entity/Ftpfiles.java

@@ -1,113 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.api.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 公共基础附件信息表
- *
- * @author wangjian
- * @date Mon Feb 17 00:00:00 CST 2020
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value="TF_SMPN_FTPFILES_X",resultMap = "ftpfilesMap")
-@KeySequence("TF_SMPN_FTPFILES_X")
-@ApiModel
-public class Ftpfiles extends Model<Ftpfiles> {
-    private static final long serialVersionUID = 1L;
-
-        /**
-     * ID
-     */
-        @TableId(value = "ID",type= IdType.INPUT)
-        @ApiModelProperty(value = "ID")
-                private Long id;
-            /**
-     * 关联表主键
-     */
-        @ApiModelProperty(value = "关联表主键")
-                private Long tableId;
-            /**
-     * 文件类型
-     */
-        @ApiModelProperty(value = "文件类型")
-                private String fileType;
-            /**
-     * 文件相对存放路径（FTP路径）
-     */
-        @ApiModelProperty(value = "文件相对存放路径（FTP路径）")
-                private String filePath;
-            /**
-     * 文件大小
-     */
-        @ApiModelProperty(value = "文件大小")
-                private Long fileLength;
-            /**
-     * 是否做FTP处理
-     */
-        @ApiModelProperty(value = "是否做FTP处理")
-                private String ftpState;
-            /**
-     * 应用名称
-     */
-        @ApiModelProperty(value = "应用名称")
-                private String appName;
-            /**
-     * 缩略图名称
-     */
-        @ApiModelProperty(value = "缩略图名称")
-                private String thumbName;
-            /**
-     * 缩略图路径
-     */
-        @ApiModelProperty(value = "缩略图路径")
-                private String thumbPath;
-            /**
-     * 原始名称
-     */
-        @ApiModelProperty(value = "原始名称")
-                private String originalName;
-            /**
-     * 备注
-     */
-        @ApiModelProperty(value = "备注")
-                private String notes;
-            /**
-     * pdf文件路径
-     */
-        @ApiModelProperty(value = "pdf文件路径")
-                private String pdfPath;
-            /**
-     * PDF文件名称
-     */
-        @ApiModelProperty(value = "PDF文件名称")
-                private String pdfFileName;
-            /**
-     * 创建时间
-     */
-        @ApiModelProperty(value = "创建时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-            @TableField(value = "CREATE_TIME",fill = FieldFill.INSERT)
-            private Date createTime;
-            /**
-     * 创建用户
-     */
-        @ApiModelProperty(value = "创建用户")
-            @TableField(value = "USER_ID",fill = FieldFill.INSERT)
-            private Long userId;
-        
-}

base-api/src/main/java/com/tofly/base/api/entity/Log.java

@@ -1,115 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.api.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 日志信息表
- *
- * @author wangjian
- * @date Mon Oct 21 00:00:00 CST 2019
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("TF_SMPN_LOG_X")
-@KeySequence("TF_SMPN_LOG_X")
-@ApiModel
-public class Log extends Model<Log> {
-    private static final long serialVersionUID = 1L;
-
-        /**
-     * 日志ID
-     */
-        @TableId(value = "ID",type= IdType.INPUT)
-        @ApiModelProperty(value = "日志ID")
-            private Long id;
-        /**
-     * 日志类型
-     */
-        @ApiModelProperty(value = "日志类型")
-            private String type;
-        /**
-     * 服务ID
-     */
-        @ApiModelProperty(value = "服务ID")
-            private String serviceId;
-        /**
-     * 创建者
-     */
-        @ApiModelProperty(value = "创建者")
-            private String createBy;
-        /**
-     * 创建时间
-     */
-        @ApiModelProperty(value = "创建时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-            @TableField(value = "CREATE_TIME",fill = FieldFill.INSERT)
-        private Date createTime;
-        /**
-     * 更新时间
-     */
-        @ApiModelProperty(value = "更新时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-            @TableField(value = "UPDATE_TIME",fill = FieldFill.INSERT_UPDATE)
-        private Date updateTime;
-        /**
-     * 操作ip
-     */
-        @ApiModelProperty(value = "操作ip")
-            private String remoteAddr;
-        /**
-     * 用户代理
-     */
-        @ApiModelProperty(value = "用户代理")
-            private String userAgent;
-        /**
-     * 请求URI
-     */
-        @ApiModelProperty(value = "请求URI")
-            private String requestUri;
-        /**
-     * 操作方法
-     */
-        @ApiModelProperty(value = "操作方法")
-            private String method;
-        /**
-     * 操作提交数据
-     */
-        @ApiModelProperty(value = "操作提交数据")
-            private String params;
-        /**
-     * 相应时间
-     */
-        @ApiModelProperty(value = "响应时间")
-            private Long time;
-        /**
-     * 删除标记
-     */
-        @ApiModelProperty(value = "删除标记")
-            private String delFlag;
-        /**
-     * 异常信息
-     */
-        @ApiModelProperty(value = "异常信息")
-            private String exception;
-        /**
-     * 日志内容
-     */
-        @ApiModelProperty(value = "日志内容")
-            private String title;
-    
-}

base-api/src/main/java/com/tofly/base/api/entity/MemberUser.java

@@ -1,15 +0,0 @@
-package com.tofly.base.api.entity;
-
-import lombok.Data;
-
-/**
- * @author tuonbed
- * @date 2019/12/6  17:16
- */
-@Data
-public class MemberUser {
-
-
-    private User user;
-    private String groupId;
-}

base-api/src/main/java/com/tofly/base/api/entity/SysLog.java

@@ -1,96 +0,0 @@
-package com.tofly.base.api.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.sql.Timestamp;
-import java.util.Date;
-
-/**
- * @author Administrator
- * @date 2019/9/3  14:32
- */
-
-@Data
-//@TableName("TF_SMPN_LOG_X")
-//@KeySequence("TF_SMPN_LOG_X")
-@EqualsAndHashCode(callSuper = true)
-public class SysLog extends Model<SysLog> {
-
-
-     private static final long serialVersionUID = -8383510462575645592L;
-     /**
-     * 编号
-     */
-    @TableId(value = "id",type = IdType.INPUT)
-    private Long id;
-
-    /**
-     * 日志类型
-     */
-    private String type;
-
-    /**
-     * 日志标题
-     */
-    private String title;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private Timestamp createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 操作IP地址
-     */
-    private String remoteAddr;
-
-    /**
-     * 请求URI
-     */
-    private String requestUri;
-
-    /**
-     * 操作方式
-     */
-    private String method;
-
-    /**
-     * 操作提交的数据
-     */
-    private String params;
-
-    /**
-     * 执行时间
-     */
-    private Long time;
-
-    /**
-     * 异常信息
-     */
-    private String exception;
-
-    /**
-     * 服务ID
-     */
-    private String serviceId;
-
-    /**
-     * 删除标记
-     */
-    private String delFlag;
-
-}

base-api/src/main/java/com/tofly/base/api/entity/SysMenu.java

@@ -1,75 +0,0 @@
-package com.tofly.base.api.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-/**
- * @author Administrator
- * @date 2019/9/6  16:42
- */
-@Data
-@TableName("TF_SMPN_MENU_X")
-@EqualsAndHashCode(callSuper = true)
-@KeySequence(value = "TF_SMPN_MENU_X")
-public class SysMenu extends Model<SysMenu> {
-
-    private static final long serialVersionUID = 6659863367857035557L;
-    /**
-     * 菜单ID
-     */
-    @TableId(value = "id",type = IdType.UUID)
-    private String id;
-    /**
-     * 菜单名称
-     */
-    private String name;
-    /**
-     * 菜单权限标识
-     */
-    private String permission;
-    /**
-     * 父菜单ID
-     */
-    private String parentId;
-    /**
-     * 图标
-     */
-    private String icon;
-    /**
-     * VUE页面
-     */
-    private String component;
-    /**
-     * 排序值
-     */
-    private Integer sort;
-    /**
-     * 菜单类型 （0菜单 1按钮）
-     */
-    private String type;
-    /**
-     * 路由缓冲
-     */
-    private String keepAlive;
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-    /**
-     * 0--正常 1--删除
-     */
-    @TableLogic
-    private String delFlag;
-    /**
-     * 前端URL
-     */
-    private String path;
-}

base-api/src/main/java/com/tofly/base/api/entity/SysRole.java

@@ -1,51 +0,0 @@
-package com.tofly.base.api.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author Administrator
- * @date 2019/9/6  16:09
- */
-@Data
-@TableName("TF_SMPN_ROLE_X")
-@EqualsAndHashCode(callSuper = true)
-public class SysRole extends Model<SysRole> {
-
-
-    private static final long serialVersionUID = -6474044493027004717L;
-    @TableId(value = "id",type = IdType.INPUT)
-    private Long id;
-
-    private String roleName;
-
-    private String roleCode;
-
-    private String roleDesc;
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-    /**
-     * 删除标识（0-正常,1-删除）
-     */
-    @TableLogic
-    private String delFlag;
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-}

base-api/src/main/java/com/tofly/base/api/entity/User.java

@@ -1,184 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.api.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.tofly.common.core.annotation.Excel;
-import com.tofly.common.core.constant.ToflySqlCondition;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 用户表
- *
- * @author wangjian
- * @date Mon Oct 21 00:00:00 CST 2019
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_SMPN_USER_X",resultMap = "userMap")
-@KeySequence("TF_SMPN_USER_X")
-@ApiModel
-public class User extends Model<User> {
-    private static final long serialVersionUID = 1L;
-
-        /**
-     * 用户ID，主键
-     */
-        @TableId(value = "ID",type= IdType.INPUT)
-        @ApiModelProperty(value = "用户ID，主键")
-            private Long id;
-        /**
-     * 用户名
-     */
-        @ApiModelProperty(value = "用户名")
-        @TableField(condition = ToflySqlCondition.LIKE)
-        @Excel(name = "username")
-            private String username;
-        /**
-     * 密码
-     */
-        @ApiModelProperty(value = "密码")
-        @Excel(name = "password")
-            private String password;
-        /**
-     * 随机数
-     */
-        @ApiModelProperty(value = "随机数")
-            private String salt;
-        /**
-     * 电话
-     */
-        @ApiModelProperty(value = "电话")
-        @Excel(name = "phone")
-            private String phone;
-        /**
-     * 头像
-     */
-        @ApiModelProperty(value = "头像")
-            private String avatar;
-        /**
-     * 部门ID
-     */
-        @ApiModelProperty(value = "部门ID")
-        @Excel(name = "departmentId")
-            private Long departmentId;
-
-        @TableField(exist = false)
-        private String departmentName;
-        /**
-     * 创建时间
-     */
-        @ApiModelProperty(value = "创建时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-            @TableField(value = "CREATE_TIME",fill = FieldFill.INSERT)
-        private Date createTime;
-        /**
-     * 修改时间
-     */
-        @ApiModelProperty(value = "修改时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-            @TableField(value = "UPDATE_TIME",fill = FieldFill.INSERT_UPDATE)
-        private Date updateTime;
-        /**
-     * 是否锁定，1正常，0锁定
-     */
-        @ApiModelProperty(value = "是否锁定，1正常，0锁定")
-            private String lockFlag;
-        /**
-     * 是否启用禁用，1启用，0禁用
-     */
-        @ApiModelProperty(value = "是否启用禁用，1启用，0禁用")
-            private String statusFlag;
-        /**
-     * 扩展功能，微信openid
-     */
-        @ApiModelProperty(value = "扩展功能，微信openid")
-            private String wxOpenid;
-        /**
-     * 扩展功能，QQ openid
-     */
-        @ApiModelProperty(value = "扩展功能，QQ openid")
-            private String qqOpenid;
-        /**
-     * 用户email
-     */
-        @ApiModelProperty(value = "用户email")
-        @Excel(name = "email")
-            private String email;
-        /**
-     * 用户姓名
-     */
-        @ApiModelProperty(value = "用户姓名")
-        @TableField(condition = ToflySqlCondition.LIKE)
-        @Excel(name = "realName")
-            private String realName;
-        /**
-     * 最后一次登录时间
-     */
-        @ApiModelProperty(value = "最后一次登录时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-            private Date loginTime;
-        /**
-     * 最后一次访问IP
-     */
-        @ApiModelProperty(value = "最后一次访问IP")
-            private String lastIp;
-        /**
-     * 密码错误次数
-     */
-        @ApiModelProperty(value = "密码错误次数")
-            private Short pwderrtimes;
-        /**
-     * 工号
-     */
-        @ApiModelProperty(value = "工号")
-            private String worknumber;
-        /**
-     * 找回密码关键字
-     */
-        @ApiModelProperty(value = "找回密码关键字")
-            private String findpwdkey;
-        /**
-     * 别名
-     */
-        @ApiModelProperty(value = "别名")
-            private String aliasname;
-        /**
-     * 生日
-     */
-        @ApiModelProperty(value = "生日")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-            private Date birthday;
-        /**
-     * 属于（学院/部门）
-     */
-        @ApiModelProperty(value = "属于（学院/部门）")
-            private String belong;
-        /**
-     * 创建人
-     */
-        @ApiModelProperty(value = "创建人")
-            @TableField(value = "CREATE_USER",fill = FieldFill.INSERT)
-        private Long createUser;
-
-    /**
-     * 用户级别
-     */
-    @ApiModelProperty(value = "用户级别")
-    @Excel(name = "userLevel")
-    private String userLevel;
-}

base-api/src/main/java/com/tofly/base/api/feign/AuthTokenService.java

@@ -1,47 +0,0 @@
-package com.tofly.base.api.feign;
-
-import com.tofly.base.api.feign.factory.AuthTokenServiceFallbackFactory;
-import com.tofly.common.core.constant.SecurityConstants;
-import com.tofly.common.core.entity.ResultRespone;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.HttpRequestMethodNotSupportedException;
-import org.springframework.web.bind.annotation.*;
-
-import java.security.Principal;
-import java.util.Map;
-
-/**
- * @author Administrator
- * @date 2019/9/12  11:44
- */
-@FeignClient(contextId = "authTokenService",value = "tofly-auth", fallbackFactory = AuthTokenServiceFallbackFactory.class)
-public interface AuthTokenService {
-
-    /**
-     * 分页查询token 信息
-     *
-     * @param params 分页参数
-     * @param from   内部调用标志
-     * @return page
-     */
-    @PostMapping("/token/page")
-    ResultRespone getTokenPage(@RequestBody Map<String, Object> params, @RequestHeader(SecurityConstants.FROM) String from);
-
-    /**
-     * 删除token
-     *
-     * @param token token
-     * @param from  调用标志
-     * @return
-     */
-    @DeleteMapping("/token/{token}")
-    ResultRespone<Boolean> removeToken(@PathVariable("token") String token, @RequestHeader(SecurityConstants.FROM) String from);
-
-    @RequestMapping(value = "/oauth/token", method=RequestMethod.POST)
-    public ResponseEntity postAccessToken(Principal principal, @RequestParam
-            Map<String, String> parameters) throws HttpRequestMethodNotSupportedException;
-
-    @DeleteMapping("/token/remove")
-    public ResultRespone<Boolean> removeTokenByUser(@RequestBody Map<String, Object> params, @RequestHeader(SecurityConstants.FROM) String from);
-}

base-api/src/main/java/com/tofly/base/api/feign/BaseEsLogService.java

@@ -1,27 +0,0 @@
-package com.tofly.base.api.feign;
-
-import com.tofly.base.api.entity.Log;
-import com.tofly.base.api.feign.factory.BaseEsLogServiceFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Administrator
- * @date 2019/9/3  14:54
- */
-@FeignClient( contextId = "baseEsLogService",value = "tofly-es",fallbackFactory = BaseEsLogServiceFallbackFactory.class)
-public interface BaseEsLogService {
-
-    @PostMapping("/log/add")
-    boolean saveLog(@RequestBody Log log);
-
-
-    @GetMapping("/log/pageNew")
-    List queryLog(@RequestParam Map map);
-}

base-api/src/main/java/com/tofly/base/api/feign/BaseUserLoginService.java

@@ -1,27 +0,0 @@
-package com.tofly.base.api.feign;
-
-import com.tofly.base.api.entity.User;
-import com.tofly.base.api.feign.factory.BaseLogServiceFallbackFactory;
-import com.tofly.common.core.constant.SecurityConstants;
-import com.tofly.common.core.entity.ResultRespone;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-
-/**
- * @author Administrator
- * @date 2019/9/6  15:50
- */
-@FeignClient(contextId = "baseUserLoginService",value = "tofly-base",fallbackFactory = BaseLogServiceFallbackFactory.class)
-public interface BaseUserLoginService {
-
-    /**
-     * 修改用户登录状态信息，记录密码错误次数，以及修改IP
-     *
-     * @param user 用户信息
-     * @param from     调用标志
-     */
-    @PostMapping("/user/info/update")
-    ResultRespone<Boolean> updateUserInfo(@RequestBody User user, @RequestHeader(SecurityConstants.FROM) String from);
-}

base-api/src/main/java/com/tofly/base/api/feign/BaseUserService.java

@@ -1,30 +0,0 @@
-package com.tofly.base.api.feign;
-
-import com.tofly.base.api.dto.UserInfo;
-import com.tofly.base.api.feign.factory.BaseLogServiceFallbackFactory;
-import com.tofly.common.core.constant.SecurityConstants;
-import com.tofly.common.core.entity.ResultRespone;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
-
-/**
- * @author Administrator
- * @date 2019/9/6  15:50
- */
-@FeignClient(contextId = "baseUserService",value = "tofly-base",fallbackFactory = BaseLogServiceFallbackFactory.class)
-public interface BaseUserService {
-
-    /**
-     * 通过用户名查询用户、角色信息
-     *
-     * @param username 用户名
-     * @param from     调用标志
-     */
-    @GetMapping("/user/info/{username}")
-    ResultRespone<UserInfo> getInfo(@PathVariable("username") String username
-            , @RequestHeader(SecurityConstants.FROM) String from);
-
-
-}

base-api/src/main/java/com/tofly/base/api/feign/FlowableService.java

@@ -1,48 +0,0 @@
-package com.tofly.base.api.feign;
-
-import com.tofly.base.api.entity.MemberUser;
-import com.tofly.base.api.entity.User;
-import com.tofly.base.api.feign.factory.FlowableServiceFallbackFactory;
-import com.tofly.common.core.constant.SecurityConstants;
-import com.tofly.common.core.entity.ResultRespone;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * @author tuonbed
- * @date 2019/12/3  15:35
- */
-@FeignClient(contextId = "flowableService",value = "tofly-flowable",fallbackFactory = FlowableServiceFallbackFactory.class)
-public interface FlowableService {
-
-
-    @PostMapping("/flowable/addUser")
-    public ResultRespone addUser(@RequestBody User user,@RequestHeader(SecurityConstants.FROM) String from);
-
-    @PostMapping("/flowable/updateUser")
-    public ResultRespone updateUser(@RequestBody User user,@RequestHeader(SecurityConstants.FROM) String from);
-
-    @PostMapping("/flowable/deleteUser")
-    public ResultRespone deleteUser(@RequestBody User user, @RequestHeader(SecurityConstants.FROM) String from);
-
-    @PostMapping("/flowable/addUserGroup")
-    public ResultRespone addUserGroup(@RequestBody Map map, @RequestHeader(SecurityConstants.FROM) String from);
-
-    @PostMapping("/flowable/addUserToGroup")
-    public ResultRespone addUserToGroup(@RequestBody MemberUser user, @RequestHeader(SecurityConstants.FROM) String from);
-
-    @PostMapping("/flowable/deleteUserToGroup")
-    public ResultRespone deleteUserToGroup(@RequestBody MemberUser user,@RequestHeader(SecurityConstants.FROM) String from);
-
-    @PostMapping("/flowable/updateGroup")
-    public ResultRespone updateGroup(@RequestBody Map map,@RequestHeader(SecurityConstants.FROM) String from);
-
-    @PostMapping("/flowable/deleteGroup")
-    public ResultRespone deleteGroup(@RequestParam("id") String id, @RequestHeader(SecurityConstants.FROM) String from);
-
-    @GetMapping("/flowable/getuploadForm")
-    public ResultRespone uploadForm(@RequestParam("appform") String appform, @RequestHeader(SecurityConstants.FROM) String from);
-
-}

base-api/src/main/java/com/tofly/base/api/feign/factory/AuthTokenServiceFallbackFactory.java

@@ -1,20 +0,0 @@
-package com.tofly.base.api.feign.factory;
-
-import com.tofly.base.api.feign.AuthTokenService;
-import com.tofly.base.api.feign.fallback.AuthTokenServiceFallbackImpl;
-import feign.hystrix.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Administrator
- * @date 2019/9/12  11:47
- */
-@Component
-public class AuthTokenServiceFallbackFactory implements FallbackFactory<AuthTokenService> {
-    @Override
-    public AuthTokenService create(Throwable throwable) {
-        AuthTokenServiceFallbackImpl baseTokenServiceFallback = new AuthTokenServiceFallbackImpl();
-        baseTokenServiceFallback.setCause(throwable);
-        return baseTokenServiceFallback;
-    }
-}

base-api/src/main/java/com/tofly/base/api/feign/factory/BaseEsLogServiceFallbackFactory.java

@@ -1,22 +0,0 @@
-package com.tofly.base.api.feign.factory;
-
-import com.tofly.base.api.feign.BaseEsLogService;
-import com.tofly.base.api.feign.fallback.BaseEsLogServiceFallbackImpl;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Administrator
- * @date 2019/9/3  14:58
- */
-@Component
-@Slf4j
-public class BaseEsLogServiceFallbackFactory implements FallbackFactory<BaseEsLogService> {
-    @Override
-    public BaseEsLogService create(Throwable throwable) {
-        BaseEsLogServiceFallbackImpl baseLogServiceFallbackImpl = new BaseEsLogServiceFallbackImpl();
-        baseLogServiceFallbackImpl.setThrowable(throwable);
-        return baseLogServiceFallbackImpl;
-    }
-}

base-api/src/main/java/com/tofly/base/api/feign/factory/BaseUserLoginServiceFallbackFactory.java

@@ -1,21 +0,0 @@
-package com.tofly.base.api.feign.factory;
-
-import com.tofly.base.api.feign.BaseUserLoginService;
-import com.tofly.base.api.feign.fallback.BaseUserLoginServiceFallbackImpl;
-import com.tofly.base.api.feign.fallback.BaseUserServiceFallbackImpl;
-import feign.hystrix.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Administrator
- * @date 2019/9/6  15:53
- */
-@Component
-public class BaseUserLoginServiceFallbackFactory implements FallbackFactory<BaseUserLoginService> {
-    @Override
-    public BaseUserLoginService create(Throwable throwable) {
-        BaseUserLoginService baseUserService=new BaseUserLoginServiceFallbackImpl();
-        ((BaseUserServiceFallbackImpl) baseUserService).setThrowable(throwable);
-        return baseUserService;
-    }
-}

base-api/src/main/java/com/tofly/base/api/feign/factory/BaseUserServiceFallbackFactory.java

@@ -1,20 +0,0 @@
-package com.tofly.base.api.feign.factory;
-
-import com.tofly.base.api.feign.BaseUserService;
-import com.tofly.base.api.feign.fallback.BaseUserServiceFallbackImpl;
-import feign.hystrix.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Administrator
- * @date 2019/9/6  15:53
- */
-@Component
-public class BaseUserServiceFallbackFactory implements FallbackFactory<BaseUserService> {
-    @Override
-    public BaseUserService create(Throwable throwable) {
-        BaseUserService baseUserService=new BaseUserServiceFallbackImpl();
-        ((BaseUserServiceFallbackImpl) baseUserService).setThrowable(throwable);
-        return baseUserService;
-    }
-}

base-api/src/main/java/com/tofly/base/api/feign/factory/FlowableServiceFallbackFactory.java

@@ -1,22 +0,0 @@
-package com.tofly.base.api.feign.factory;
-
-import com.tofly.base.api.feign.FlowableService;
-import com.tofly.base.api.feign.fallback.BaseUserServiceFallbackImpl;
-import com.tofly.base.api.feign.fallback.FlowableServiceFallbackImpl;
-import feign.hystrix.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * @author tuonbed
- * @date 2019/12/3  16:55
- */
-@Component
-public class FlowableServiceFallbackFactory implements FallbackFactory<FlowableService> {
-
-    @Override
-    public FlowableService create(Throwable throwable) {
-        FlowableService flowableService=new FlowableServiceFallbackImpl();
-        ((BaseUserServiceFallbackImpl) flowableService).setThrowable(throwable);
-        return flowableService;
-    }
-}

base-api/src/main/java/com/tofly/base/api/feign/fallback/AuthTokenServiceFallbackImpl.java

@@ -1,61 +0,0 @@
-package com.tofly.base.api.feign.fallback;
-
-import com.tofly.base.api.feign.AuthTokenService;
-import com.tofly.common.core.entity.ResultRespone;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.web.HttpRequestMethodNotSupportedException;
-
-import java.security.Principal;
-import java.util.Map;
-
-/**
- * @author Administrator
- * @date 2019/9/12  11:45
- */
-@Slf4j
-@Component
-public class AuthTokenServiceFallbackImpl implements AuthTokenService {
-    @Setter
-    private Throwable cause;
-
-    /**
-     * 分页查询token 信息
-     *
-     * @param params 分页参数
-     * @param from   内部调用标志
-     * @return page
-     */
-    @Override
-    public ResultRespone getTokenPage(Map<String, Object> params, String from) {
-        log.error("调用认证中心查询token 失败", cause);
-        return ResultRespone.failed("调用认证中心查询token 失败");
-    }
-
-    /**
-     * 删除token
-     *
-     * @param s
-     * @param id
-     * @return
-     */
-    @Override
-    public ResultRespone<Boolean> removeToken(String s, String id) {
-        log.error("删除token 失败 {}", id, cause);
-        return ResultRespone.failed("删除token 失败"+id);
-    }
-
-    @Override
-    public ResponseEntity postAccessToken(Principal principal, Map<String, String> parameters) throws HttpRequestMethodNotSupportedException {
-        log.error("用户登陆失败{}", parameters, cause);
-        return ResponseEntity.ok(cause);
-    }
-
-    @Override
-    public ResultRespone<Boolean> removeTokenByUser(Map<String, Object> params,String from) {
-        log.error("删除token 失败 :{}", params);
-        return ResultRespone.failed("删除token 失败");
-    }
-}

base-api/src/main/java/com/tofly/base/api/feign/fallback/BaseEsLogServiceFallbackImpl.java

@@ -1,34 +0,0 @@
-package com.tofly.base.api.feign.fallback;
-
-import com.tofly.base.api.entity.Log;
-import com.tofly.base.api.feign.BaseEsLogService;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Administrator
- * @date 2019/9/3  15:01
- */
-@Slf4j
-@Component
-public class BaseEsLogServiceFallbackImpl implements BaseEsLogService {
-
-    @Setter
-    private Throwable throwable;
-
-    @Override
-    public boolean saveLog(Log logs) {
-        log.error("插入日志失败,{},{}",logs,throwable);
-        return false;
-    }
-
-    @Override
-    public List queryLog(Map map) {
-        log.error("查询日志失败,{},{}",map,throwable);
-        return null;
-    }
-}

base-api/src/main/java/com/tofly/base/api/feign/fallback/BaseUserLoginServiceFallbackImpl.java

@@ -1,26 +0,0 @@
-package com.tofly.base.api.feign.fallback;
-
-import com.tofly.base.api.entity.User;
-import com.tofly.base.api.feign.BaseUserLoginService;
-import com.tofly.common.core.entity.ResultRespone;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Administrator
- * @date 2019/9/6  15:53
- */
-@Slf4j
-@Component
-public class BaseUserLoginServiceFallbackImpl implements BaseUserLoginService {
-    @Setter
-    private Throwable throwable;
-
-
-    @Override
-    public ResultRespone<Boolean> updateUserInfo(User user, String from) {
-        log.error("修改用户登录状态信息失败",user,throwable);
-        return null;
-    }
-}

base-api/src/main/java/com/tofly/base/api/feign/fallback/BaseUserServiceFallbackImpl.java

@@ -1,26 +0,0 @@
-package com.tofly.base.api.feign.fallback;
-
-import com.tofly.base.api.dto.UserInfo;
-import com.tofly.base.api.feign.BaseUserService;
-import com.tofly.common.core.entity.ResultRespone;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Administrator
- * @date 2019/9/6  15:53
- */
-@Slf4j
-@Component
-public class BaseUserServiceFallbackImpl implements BaseUserService {
-    @Setter
-    private Throwable throwable;
-
-    @Override
-    public ResultRespone<UserInfo> getInfo(String username, String from) {
-        log.error("查询用户失败",username,throwable);
-        return null;
-    }
-
-}

base-api/src/main/java/com/tofly/base/api/feign/fallback/FlowableServiceFallbackImpl.java

@@ -1,78 +0,0 @@
-package com.tofly.base.api.feign.fallback;
-
-import com.tofly.base.api.entity.MemberUser;
-import com.tofly.base.api.entity.User;
-import com.tofly.base.api.feign.FlowableService;
-import com.tofly.common.core.entity.ResultRespone;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-/**
- * @author tuonbed
- * @date 2019/12/3  16:57
- */
-@Slf4j
-@Component
-public class FlowableServiceFallbackImpl implements FlowableService {
-
-    @Setter
-    private Throwable throwable;
-    @Override
-    public ResultRespone addUser(User user, String from) {
-        log.error("用户写入失败，{}，{}",user,throwable);
-        return null;
-    }
-
-    @Override
-    public ResultRespone updateUser(User user, String from) {
-        log.error("用户修改失败，{}，{}",user,throwable);
-        return null;
-    }
-
-    @Override
-    public ResultRespone deleteUser(User user, String from) {
-        log.error("用户删除失败，{}，{}",user,throwable);
-        return null;
-    }
-
-    @Override
-    public ResultRespone addUserGroup(Map map, String from) {
-        log.error("新增用户组失败，{}，{}",map,throwable);
-        return null;
-    }
-
-    @Override
-    public ResultRespone addUserToGroup(MemberUser user, String from) {
-        log.error("用户组添加人员失败，{}，{}",user,throwable);
-        return null;
-    }
-
-    @Override
-    public ResultRespone deleteUserToGroup(MemberUser user, String from) {
-        log.error("用户组删除用户失败，{}，{}",user,throwable);
-        return null;
-    }
-
-    @Override
-    public ResultRespone updateGroup(Map map, String from) {
-        log.error("修改职位失败，{}，{}",map,throwable);
-        return null;
-    }
-
-    @Override
-    public ResultRespone deleteGroup(String id, String from) {
-        log.error("删除职位失败，{}，{}",id,throwable);
-        return null;
-    }
-
-    @Override
-    public ResultRespone uploadForm(String appform, String from) {
-        log.error("查询流程上传至业务数据失败，{}，{}",appform,throwable);
-        return null;
-    }
-
-
-}