diff --git a/src/main/java/top/fjy8018/fileupload/constant/GlobalConstant.java b/src/main/java/top/fjy8018/fileupload/constant/GlobalConstant.java
new file mode 100644
index 0000000..547b507
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/constant/GlobalConstant.java
@@ -0,0 +1,8 @@
+package top.fjy8018.fileupload.constant;
+
+/**
+ * 存储全局变量
+ */
+public class GlobalConstant {
+    public static final String USER_SESSION_KEY = "USER_SESSION";
+}
diff --git a/src/main/java/top/fjy8018/fileupload/controller/UploadController.java b/src/main/java/top/fjy8018/fileupload/controller/UploadController.java
new file mode 100644
index 0000000..0eecf33
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/controller/UploadController.java
@@ -0,0 +1,42 @@
+package top.fjy8018.fileupload.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import top.fjy8018.fileupload.config.ServerPropertiesConfig;
+import top.fjy8018.fileupload.dataobject.es.EsFileInfo;
+import top.fjy8018.fileupload.service.FileService;
+import top.fjy8018.fileupload.util.TimeUtil;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * @author F嘉阳
+ * @date 2018-06-23 09:16
+ */
+@Controller
+public class UploadController {
+
+    @Autowired
+    private FileService fileService;
+
+    @Autowired
+    private ServerPropertiesConfig serverPropertiesConfig;
+
+    public String moreUpload(HttpServletRequest request,
+                             @RequestParam(value = "fileName") String fileName) {
+        MultipartHttpServletRequest multipartHttpServletRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> files = multipartHttpServletRequest.getFileMap();
+
+        EsFileInfo fileInfo = new EsFileInfo();
+        fileInfo.setFileName(fileName);
+        fileInfo.setFilePath(serverPropertiesConfig.getFilePath());
+        /*fileInfo.setFileSize();
+        fileInfo.setUserId();*/
+
+        return null;
+    }
+}
diff --git a/src/main/java/top/fjy8018/fileupload/dataobject/AdminInfo.java b/src/main/java/top/fjy8018/fileupload/dataobject/AdminInfo.java
deleted file mode 100644
index 5147d16..0000000
--- a/src/main/java/top/fjy8018/fileupload/dataobject/AdminInfo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package top.fjy8018.fileupload.dataobject;
-
-import lombok.Data;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-/**
- * @author F嘉阳
- * @date 2018-06-22 10:49
- */
-@Data
-@Entity
-@DynamicUpdate
-public class AdminInfo {
-    @Id
-    private String adminId;
-
-    private String userId;
-
-    private String createTime;
-
-    private String updateTime;
-}
diff --git a/src/main/java/top/fjy8018/fileupload/dataobject/FileInfo.java b/src/main/java/top/fjy8018/fileupload/dataobject/FileInfo.java
deleted file mode 100644
index f6ffcd1..0000000
--- a/src/main/java/top/fjy8018/fileupload/dataobject/FileInfo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package top.fjy8018.fileupload.dataobject;
-
-import lombok.Data;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Id;
-import java.util.Date;
-
-/**
- * 文件表
- * @author F嘉阳
- * @date 2018-06-22 10:43
- */
-@Data
-/*@Entity*/
-@DynamicUpdate
-public class FileInfo {
-
-    @Id
-    private String fileId;
-
-    private String userId;
-
-    private Date createTime;
-
-    private String fileName;
-
-    private String fileSize;
-
-    private String filePath;
-
-}
diff --git a/src/main/java/top/fjy8018/fileupload/dataobject/Permission.java b/src/main/java/top/fjy8018/fileupload/dataobject/Permission.java
new file mode 100644
index 0000000..9d24a2b
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/dataobject/Permission.java
@@ -0,0 +1,40 @@
+package top.fjy8018.fileupload.dataobject;
+
+import lombok.Data;
+import top.fjy8018.fileupload.enums.PermissionStatusEnum;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author F嘉阳
+ * @date 2018-06-23 10:20
+ */
+@Data
+@Table(name = "sys_permission")
+@Entity
+public class Permission {
+
+    @Id
+    @GeneratedValue
+    private Integer id;
+
+    private String name;
+
+    private String type;
+
+    private String url;
+
+    private String percode;
+
+    private Integer parentid;
+
+    private String parentids;
+
+    private String sortstring;
+
+    private Integer available = PermissionStatusEnum.AVAILABLE.getCode();
+
+}
diff --git a/src/main/java/top/fjy8018/fileupload/dataobject/Role.java b/src/main/java/top/fjy8018/fileupload/dataobject/Role.java
new file mode 100644
index 0000000..939b200
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/dataobject/Role.java
@@ -0,0 +1,27 @@
+package top.fjy8018.fileupload.dataobject;
+
+import lombok.Data;
+import top.fjy8018.fileupload.enums.RoleStatusEnum;
+import top.fjy8018.fileupload.util.KeyUtil;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author F嘉阳
+ * @date 2018-06-23 10:17
+ */
+@Data
+@Table(name = "sys_role")
+@Entity
+public class Role {
+
+    @Id
+    private String id = KeyUtil.genUniqueKey();
+
+    private String name;
+
+    private Integer available = RoleStatusEnum.AVAILABLE.getCode();
+
+}
diff --git a/src/main/java/top/fjy8018/fileupload/dataobject/RolePermission.java b/src/main/java/top/fjy8018/fileupload/dataobject/RolePermission.java
new file mode 100644
index 0000000..ef256ca
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/dataobject/RolePermission.java
@@ -0,0 +1,27 @@
+package top.fjy8018.fileupload.dataobject;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author F嘉阳
+ * @date 2018-06-23 10:22
+ */
+@Data
+@Table(name = "sys_role_permission")
+@Entity
+public class RolePermission {
+
+    @Id
+    @GeneratedValue
+    private Integer id;
+
+    private String sysRoleId;
+
+    private Integer sysPermissionId;
+
+}
diff --git a/src/main/java/top/fjy8018/fileupload/dataobject/User.java b/src/main/java/top/fjy8018/fileupload/dataobject/User.java
new file mode 100644
index 0000000..5f60d6a
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/dataobject/User.java
@@ -0,0 +1,40 @@
+package top.fjy8018.fileupload.dataobject;
+
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import top.fjy8018.fileupload.enums.UserStatusEnum;
+import top.fjy8018.fileupload.util.KeyUtil;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @author F嘉阳
+ * @date 2018-06-23 10:10
+ */
+@Data
+@Entity
+@Table(name = "sys_user")
+@DynamicInsert
+@DynamicUpdate
+public class User {
+
+    @Id
+    private String id = KeyUtil.genUniqueKey();
+
+    private String usercode;
+
+    private String username;
+
+    private String password;
+
+    private Integer locked = UserStatusEnum.LOCKED.getCode();
+
+    private Date createTime;
+
+    private Date updateTime;
+
+}
diff --git a/src/main/java/top/fjy8018/fileupload/dataobject/UserInfo.java b/src/main/java/top/fjy8018/fileupload/dataobject/UserInfo.java
deleted file mode 100644
index 27250a2..0000000
--- a/src/main/java/top/fjy8018/fileupload/dataobject/UserInfo.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package top.fjy8018.fileupload.dataobject;
-
-import lombok.Data;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import java.util.Date;
-
-/**
- * 系统A用户表
- * @author F嘉阳
- * @date 2018-06-22 10:46
- */
-@Data
-@Entity
-@DynamicUpdate
-public class UserInfo {
-
-    @Id
-    private String userId;
-
-    private String username;
-
-    private String password;
-
-    private Date createTime;
-
-    private Date updateTime;
-
-}
diff --git a/src/main/java/top/fjy8018/fileupload/dataobject/UserRole.java b/src/main/java/top/fjy8018/fileupload/dataobject/UserRole.java
new file mode 100644
index 0000000..58e3d4c
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/dataobject/UserRole.java
@@ -0,0 +1,27 @@
+package top.fjy8018.fileupload.dataobject;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @author F嘉阳
+ * @date 2018-06-23 10:18
+ */
+@Data
+@Table(name = "sys_user_role")
+@Entity
+public class UserRole {
+
+    @Id
+    @GeneratedValue
+    private Integer id;
+
+    private String sysUserId;
+
+    private String sysRoleId;
+
+}
diff --git a/src/main/java/top/fjy8018/fileupload/dataobject/es/EsFileInfo.java b/src/main/java/top/fjy8018/fileupload/dataobject/es/EsFileInfo.java
index a6e49d9..9e5e68f 100644
--- a/src/main/java/top/fjy8018/fileupload/dataobject/es/EsFileInfo.java
+++ b/src/main/java/top/fjy8018/fileupload/dataobject/es/EsFileInfo.java
@@ -3,6 +3,9 @@ package top.fjy8018.fileupload.dataobject.es;
 import lombok.Data;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;
+import top.fjy8018.fileupload.enums.FileStatusEnum;
+import top.fjy8018.fileupload.util.KeyUtil;
+import top.fjy8018.fileupload.util.TimeUtil;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
@@ -14,17 +17,17 @@ import java.util.concurrent.TimeUnit;
  * @date 2018-06-22 11:34
  */
 @Data
-@Document(indexName = "file",type = "file")
+@Document(indexName = "fileInfo",type = "file")
 public class EsFileInfo implements Serializable {
 
     private static final long serialVersionUID = 3216398036847369019L;
 
     @Id
-    private String fileId;
+    private String fileId = KeyUtil.genUniqueKey();
 
     private String userId;
 
-    private String createTime = currentTimeString();
+    private String createTime = TimeUtil.currentTimeString();
 
     private String fileName;
 
@@ -32,7 +35,12 @@ public class EsFileInfo implements Serializable {
 
     private String filePath;
 
-    protected EsFileInfo() {
+    /**
+     * 当前文件状态，默认可用状态
+     */
+    private Integer deleteFlag = FileStatusEnum.FILE_AVAILABLE.getCode();
+
+    public EsFileInfo() {
     }
 
     public EsFileInfo(String userId, String fileName, String fileSize, String filePath) {
@@ -41,10 +49,4 @@ public class EsFileInfo implements Serializable {
         this.fileSize = fileSize;
         this.filePath = filePath;
     }
-
-    public String currentTimeString(){
-        Date date = new Date();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        return sdf.format(date);
-    }
 }
diff --git a/src/main/java/top/fjy8018/fileupload/enums/FileStatusEnum.java b/src/main/java/top/fjy8018/fileupload/enums/FileStatusEnum.java
new file mode 100644
index 0000000..9d31bed
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/enums/FileStatusEnum.java
@@ -0,0 +1,19 @@
+package top.fjy8018.fileupload.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum FileStatusEnum implements CodeEnum{
+    FILE_DELETED(1,"文件已删除"),
+    FILE_AVAILABLE(0,"文件存在并可用"),
+    ;
+
+    private Integer code;
+
+    private String msg;
+
+    FileStatusEnum(Integer code, String status) {
+        this.code = code;
+        this.msg = status;
+    }
+}
diff --git a/src/main/java/top/fjy8018/fileupload/enums/PermissionStatusEnum.java b/src/main/java/top/fjy8018/fileupload/enums/PermissionStatusEnum.java
new file mode 100644
index 0000000..920d9dc
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/enums/PermissionStatusEnum.java
@@ -0,0 +1,19 @@
+package top.fjy8018.fileupload.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum PermissionStatusEnum implements CodeEnum {
+    LOCKED(0,"权限不可用"),
+    AVAILABLE(1,"权限可用")
+    ;
+
+    private Integer code;
+
+    private String msg;
+
+    PermissionStatusEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+}
diff --git a/src/main/java/top/fjy8018/fileupload/enums/RoleStatusEnum.java b/src/main/java/top/fjy8018/fileupload/enums/RoleStatusEnum.java
new file mode 100644
index 0000000..dad1820
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/enums/RoleStatusEnum.java
@@ -0,0 +1,19 @@
+package top.fjy8018.fileupload.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum RoleStatusEnum implements CodeEnum {
+    LOCKED(1,"角色不可用"),
+    AVAILABLE(0,"角色可用")
+    ;
+
+    private Integer code;
+
+    private String msg;
+
+    RoleStatusEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+}
diff --git a/src/main/java/top/fjy8018/fileupload/enums/UserStatusEnum.java b/src/main/java/top/fjy8018/fileupload/enums/UserStatusEnum.java
new file mode 100644
index 0000000..21ef9ec
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/enums/UserStatusEnum.java
@@ -0,0 +1,19 @@
+package top.fjy8018.fileupload.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum UserStatusEnum implements CodeEnum {
+    LOCKED(1,"用户已锁定"),
+    AVAILABLE(0,"用户可用")
+    ;
+
+    private Integer code;
+
+    private String msg;
+
+    UserStatusEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+}
diff --git a/src/main/java/top/fjy8018/fileupload/form/LoginForm.java b/src/main/java/top/fjy8018/fileupload/form/LoginForm.java
new file mode 100644
index 0000000..7f749b5
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/form/LoginForm.java
@@ -0,0 +1,16 @@
+package top.fjy8018.fileupload.form;
+
+import lombok.Data;
+
+/**
+ * 用于前端上传参数传递和表单验证
+ * @author F嘉阳
+ * @date 2018-06-23 09:18
+ */
+@Data
+public class LoginForm {
+
+    private String userName;
+
+    private String password;
+}
diff --git a/src/main/java/top/fjy8018/fileupload/repository/AdminInfoRepository.java b/src/main/java/top/fjy8018/fileupload/repository/AdminInfoRepository.java
deleted file mode 100644
index d241e2d..0000000
--- a/src/main/java/top/fjy8018/fileupload/repository/AdminInfoRepository.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package top.fjy8018.fileupload.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import top.fjy8018.fileupload.dataobject.AdminInfo;
-
-public interface AdminInfoRepository extends JpaRepository<AdminInfo,String> {
-}
diff --git a/src/main/java/top/fjy8018/fileupload/repository/FileInfoRepository.java b/src/main/java/top/fjy8018/fileupload/repository/FileInfoRepository.java
deleted file mode 100644
index 0aaad11..0000000
--- a/src/main/java/top/fjy8018/fileupload/repository/FileInfoRepository.java
+++ /dev/null
@@ -1,11 +0,0 @@
-
-package top.fjy8018.fileupload.repository;
-/*
-import org.springframework.data.jpa.repository.JpaRepository;
-import top.fjy8018.fileupload.dataobject.FileInfo;
-
-public interface FileInfoRepository extends JpaRepository<FileInfo,String> {
-}
-*/
-public interface FileInfoRepository {
-}
diff --git a/src/main/java/top/fjy8018/fileupload/repository/PermissionRepository.java b/src/main/java/top/fjy8018/fileupload/repository/PermissionRepository.java
new file mode 100644
index 0000000..8f1b051
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/repository/PermissionRepository.java
@@ -0,0 +1,7 @@
+package top.fjy8018.fileupload.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import top.fjy8018.fileupload.dataobject.Permission;
+
+public interface PermissionRepository extends JpaRepository<Permission,Integer> {
+}
diff --git a/src/main/java/top/fjy8018/fileupload/repository/RolePermissionRepository.java b/src/main/java/top/fjy8018/fileupload/repository/RolePermissionRepository.java
new file mode 100644
index 0000000..302d113
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/repository/RolePermissionRepository.java
@@ -0,0 +1,7 @@
+package top.fjy8018.fileupload.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import top.fjy8018.fileupload.dataobject.RolePermission;
+
+public interface RolePermissionRepository extends JpaRepository<RolePermission,Integer> {
+}
diff --git a/src/main/java/top/fjy8018/fileupload/repository/RoleRepository.java b/src/main/java/top/fjy8018/fileupload/repository/RoleRepository.java
new file mode 100644
index 0000000..4375c0a
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/repository/RoleRepository.java
@@ -0,0 +1,7 @@
+package top.fjy8018.fileupload.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import top.fjy8018.fileupload.dataobject.Role;
+
+public interface RoleRepository extends JpaRepository <Role,String> {
+}
diff --git a/src/main/java/top/fjy8018/fileupload/repository/UserInfoRepository.java b/src/main/java/top/fjy8018/fileupload/repository/UserInfoRepository.java
deleted file mode 100644
index dc28f82..0000000
--- a/src/main/java/top/fjy8018/fileupload/repository/UserInfoRepository.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package top.fjy8018.fileupload.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import top.fjy8018.fileupload.dataobject.UserInfo;
-
-public interface UserInfoRepository extends JpaRepository<UserInfo,String> {
-}
diff --git a/src/main/java/top/fjy8018/fileupload/repository/UserRepository.java b/src/main/java/top/fjy8018/fileupload/repository/UserRepository.java
new file mode 100644
index 0000000..29f41f8
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/repository/UserRepository.java
@@ -0,0 +1,7 @@
+package top.fjy8018.fileupload.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import top.fjy8018.fileupload.dataobject.User;
+
+public interface UserRepository extends JpaRepository<User,String> {
+}
diff --git a/src/main/java/top/fjy8018/fileupload/repository/UserRoleRepository.java b/src/main/java/top/fjy8018/fileupload/repository/UserRoleRepository.java
new file mode 100644
index 0000000..11cf986
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/repository/UserRoleRepository.java
@@ -0,0 +1,7 @@
+package top.fjy8018.fileupload.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import top.fjy8018.fileupload.dataobject.UserRole;
+
+public interface UserRoleRepository extends JpaRepository<UserRole,Integer> {
+}
diff --git a/src/main/java/top/fjy8018/fileupload/repository/es/EsFileInfoRepository.java b/src/main/java/top/fjy8018/fileupload/repository/es/EsFileInfoRepository.java
index 436184b..c81eded 100644
--- a/src/main/java/top/fjy8018/fileupload/repository/es/EsFileInfoRepository.java
+++ b/src/main/java/top/fjy8018/fileupload/repository/es/EsFileInfoRepository.java
@@ -13,7 +13,7 @@ public interface EsFileInfoRepository extends ElasticsearchRepository<EsFileInfo
      * @param fileName
      * @return
      */
-    Page<EsFileInfo> findDistinctByFileNameContains(Pageable pageable, String fileName);
+    Page<EsFileInfo> findByFileName(Pageable pageable, String fileName);
 
     /**
      * 通过用户号查询，并去除重复
@@ -23,5 +23,5 @@ public interface EsFileInfoRepository extends ElasticsearchRepository<EsFileInfo
      */
     Page<EsFileInfo> findDistinctByUserId(Pageable pageable, String userId);
 
-    Page<EsFileInfo> findByFileName(Pageable pageable, String fileName);
+
 }
diff --git a/src/main/java/top/fjy8018/fileupload/service/FileService.java b/src/main/java/top/fjy8018/fileupload/service/FileService.java
new file mode 100644
index 0000000..c6733fd
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/service/FileService.java
@@ -0,0 +1,32 @@
+package top.fjy8018.fileupload.service;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import top.fjy8018.fileupload.dataobject.es.EsFileInfo;
+
+public interface FileService {
+
+    /**
+     * 通过文件名查找，并去除重复
+     * @param pageable
+     * @param fileName
+     * @return
+     */
+    Page<EsFileInfo> findByFileName(Pageable pageable, String fileName);
+
+    /**
+     * 通过用户号查询，并去除重复
+     * @param pageable
+     * @param userId
+     * @return
+     */
+    Page<EsFileInfo> findDistinctByUserId(Pageable pageable, String userId);
+
+    EsFileInfo saveFile(EsFileInfo fileInfo);
+
+    void deleteFile(EsFileInfo fileInfo);
+
+    void deleteById(String fileId);
+
+    void deleteAll();
+}
diff --git a/src/main/java/top/fjy8018/fileupload/service/impl/FileServiceImpl.java b/src/main/java/top/fjy8018/fileupload/service/impl/FileServiceImpl.java
new file mode 100644
index 0000000..c8d592c
--- /dev/null
+++ b/src/main/java/top/fjy8018/fileupload/service/impl/FileServiceImpl.java
@@ -0,0 +1,64 @@
+package top.fjy8018.fileupload.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import top.fjy8018.fileupload.dataobject.es.EsFileInfo;
+import top.fjy8018.fileupload.repository.es.EsFileInfoRepository;
+import top.fjy8018.fileupload.service.FileService;
+
+/**
+ * @author F嘉阳
+ * @date 2018-06-23 09:12
+ */
+@Service
+public class FileServiceImpl implements FileService {
+
+    @Autowired
+    private EsFileInfoRepository fileInfoRepository;
+
+    /**
+     * 通过文件名查找，并去除重复
+     *
+     * @param pageable
+     * @param fileName
+     * @return
+     */
+    @Override
+    public Page<EsFileInfo> findByFileName(Pageable pageable, String fileName) {
+        return fileInfoRepository.findByFileName(pageable,fileName);
+    }
+
+    /**
+     * 通过用户号查询，并去除重复
+     *
+     * @param pageable
+     * @param userId
+     * @return
+     */
+    @Override
+    public Page<EsFileInfo> findDistinctByUserId(Pageable pageable, String userId) {
+        return fileInfoRepository.findDistinctByUserId(pageable,userId);
+    }
+
+    @Override
+    public EsFileInfo saveFile(EsFileInfo fileInfo) {
+        return fileInfoRepository.save(fileInfo);
+    }
+
+    @Override
+    public void deleteFile(EsFileInfo fileInfo) {
+        fileInfoRepository.delete(fileInfo);
+    }
+
+    @Override
+    public void deleteById(String fileId) {
+        fileInfoRepository.deleteById(fileId);
+    }
+
+    @Override
+    public void deleteAll() {
+        fileInfoRepository.deleteAll();
+    }
+}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 61adfa4..db84576 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -18,7 +18,7 @@ spring:
       max-request-size: 100Mb
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/db_sysdemo1?useUnicode=true&characterEncoding=utf-8&useSSL=true
+    url: jdbc:mysql://localhost:3306/db_sysrbacdemo?useUnicode=true&characterEncoding=utf-8&useSSL=true
     username: trs
     password: fileupload
   jpa:
diff --git a/src/test/java/top/fjy8018/fileupload/repository/PermissionRepositoryTest.java b/src/test/java/top/fjy8018/fileupload/repository/PermissionRepositoryTest.java
new file mode 100644
index 0000000..7c2df78
--- /dev/null
+++ b/src/test/java/top/fjy8018/fileupload/repository/PermissionRepositoryTest.java
@@ -0,0 +1,70 @@
+package top.fjy8018.fileupload.repository;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import top.fjy8018.fileupload.EstestApplicationTests;
+import top.fjy8018.fileupload.dataobject.Permission;
+
+import javax.transaction.Transactional;
+
+import static org.junit.Assert.*;
+
+@Component
+public class PermissionRepositoryTest extends EstestApplicationTests{
+
+    @Autowired
+    private PermissionRepository repository;
+
+    @Test
+    public void init(){
+        Permission permission3 = new Permission();
+        permission3.setName("权限");
+        permission3.setParentid(0);
+        permission3.setParentids("0/");
+        permission3.setPercode(null);
+        permission3.setSortstring("0");
+        permission3.setType("");
+        permission3.setUrl("");
+
+        Permission permission = new Permission();
+        permission.setName("文件管理");
+        permission.setParentid(1);
+        permission.setParentids("0/1");
+        permission.setPercode(null);
+        permission.setSortstring("1.");
+        permission.setType("menu");
+        permission.setUrl("/fileupload/upload");
+
+        Permission permission2 = new Permission();
+        permission2.setName("文件上传");
+        permission2.setParentid(11);
+        permission2.setParentids("0/1/11");
+        permission2.setPercode("file:upload");
+        permission2.setSortstring("");
+        permission2.setType("permission");
+        permission2.setUrl("/fileupload/upload/addfile");
+
+        repository.save(permission);
+        repository.save(permission2);
+
+        repository.save(permission3);
+    }
+
+    @Test
+    @Transactional
+    public void addOne(){
+        Permission permission = new Permission();
+        permission.setName("用户管理");
+        permission.setParentid(1);
+        permission.setParentids("0/1");
+        permission.setPercode(null);
+        permission.setSortstring("1.");
+        permission.setType("menu");
+        permission.setUrl("/fileupload/upload");
+
+        Permission res = repository.save(permission);
+        Assert.assertNotNull(res);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/top/fjy8018/fileupload/repository/RolePermissionRepositoryTest.java b/src/test/java/top/fjy8018/fileupload/repository/RolePermissionRepositoryTest.java
new file mode 100644
index 0000000..843d0f1
--- /dev/null
+++ b/src/test/java/top/fjy8018/fileupload/repository/RolePermissionRepositoryTest.java
@@ -0,0 +1,31 @@
+package top.fjy8018.fileupload.repository;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import top.fjy8018.fileupload.EstestApplicationTests;
+import top.fjy8018.fileupload.dataobject.RolePermission;
+
+import static org.junit.Assert.*;
+
+@Component
+public class RolePermissionRepositoryTest extends EstestApplicationTests {
+
+    @Autowired
+    private RolePermissionRepository repository;
+
+    private static final String ROLE_ID = "1529723184401294213";
+
+    private static final Integer PERMISSION_ID = 3;
+
+    @Test
+    public void addOne(){
+        RolePermission rolePermission = new RolePermission();
+        rolePermission.setSysPermissionId(PERMISSION_ID);
+        rolePermission.setSysRoleId(ROLE_ID);
+
+        Assert.assertNotNull(repository.save(rolePermission));
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/top/fjy8018/fileupload/repository/RoleRepositoryTest.java b/src/test/java/top/fjy8018/fileupload/repository/RoleRepositoryTest.java
new file mode 100644
index 0000000..44c0bdd
--- /dev/null
+++ b/src/test/java/top/fjy8018/fileupload/repository/RoleRepositoryTest.java
@@ -0,0 +1,41 @@
+package top.fjy8018.fileupload.repository;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import top.fjy8018.fileupload.EstestApplicationTests;
+import top.fjy8018.fileupload.dataobject.Role;
+
+import javax.transaction.Transactional;
+
+import static org.junit.Assert.*;
+
+@Component
+public class RoleRepositoryTest extends EstestApplicationTests {
+
+    @Autowired
+    private RoleRepository roleRepository;
+
+    @Test
+    public void init(){
+        Role role1 = new Role();
+        role1.setName("文件管理员");
+
+        Role role2 = new Role();
+        role2.setName("普通用户");
+
+        roleRepository.save(role1);
+        roleRepository.save(role2);
+    }
+
+    @Test
+    @Transactional
+    public void addOne(){
+        Role role = new Role();
+        role.setName("用户管理员");
+
+        Role res = roleRepository.save(role);
+        Assert.assertNotNull(res);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/top/fjy8018/fileupload/repository/UserRepositoryTest.java b/src/test/java/top/fjy8018/fileupload/repository/UserRepositoryTest.java
new file mode 100644
index 0000000..72affc6
--- /dev/null
+++ b/src/test/java/top/fjy8018/fileupload/repository/UserRepositoryTest.java
@@ -0,0 +1,46 @@
+package top.fjy8018.fileupload.repository;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import top.fjy8018.fileupload.EstestApplicationTests;
+import top.fjy8018.fileupload.dataobject.User;
+
+import javax.transaction.Transactional;
+
+import static org.junit.Assert.*;
+
+@Component
+public class UserRepositoryTest extends EstestApplicationTests{
+
+    @Autowired
+    private UserRepository repository;
+
+    @Test
+    public void init(){
+
+        User user = new User();
+        user.setUsername("admin");
+        user.setPassword("trs");
+        user.setUsercode("admin");
+
+        repository.save(user);
+    }
+
+    @Test
+    @Transactional
+    public void addOne(){
+        User user = new User();
+        user.setUsername("fjy");
+        user.setPassword("trs");
+        user.setUsercode("admin");
+
+        User res = repository.save(user);
+
+        Assert.assertNotNull(res);
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/test/java/top/fjy8018/fileupload/repository/UserRoleRepositoryTest.java b/src/test/java/top/fjy8018/fileupload/repository/UserRoleRepositoryTest.java
new file mode 100644
index 0000000..3a89233
--- /dev/null
+++ b/src/test/java/top/fjy8018/fileupload/repository/UserRoleRepositoryTest.java
@@ -0,0 +1,33 @@
+package top.fjy8018.fileupload.repository;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import top.fjy8018.fileupload.EstestApplicationTests;
+import top.fjy8018.fileupload.dataobject.UserRole;
+
+import javax.transaction.Transactional;
+
+import static org.junit.Assert.*;
+
+@Component
+public class UserRoleRepositoryTest extends EstestApplicationTests {
+
+    @Autowired
+    private UserRoleRepository repository;
+
+    private static final String ROLE_ID = "1529723184401294213";
+
+    private static final String USER_ID = "1529723171835369380";
+
+    @Test
+    public void addOne(){
+        UserRole userRole = new UserRole();
+        userRole.setSysRoleId(ROLE_ID);
+        userRole.setSysUserId(USER_ID);
+
+        Assert.assertNotNull(repository.save(userRole));
+    }
+
+}
\ No newline at end of file