Merge branch 'develop' of git.yfzx.zjtys.com.cn:zhuangshuang/EncryptedFileSystem

efs-ftp/src/main/java/com/zjty/efs/ftp/config/AppConfig.java

+package com.zjty.efs.ftp.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+@Configuration
+public class AppConfig extends WebMvcConfigurerAdapter {
+
+    @Value("${file.address}")
+    private String baseFilePath;
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/image/**").addResourceLocations("file:" + baseFilePath + "/");
+    }
+}
+
+

efs-ftp/src/main/java/com/zjty/efs/ftp/controller/FileUploadController.java

@@ -72,7 +72,7 @@ public class FileUploadController {
     })
     @ResponseBody
     public ServerResponse upload(@RequestParam(value = "file", required = false) MultipartFile file,
-                                 @RequestParam(value = "md5File") String md5File,
+                                 @RequestParam(value = "md5File",required = false) String md5File,
                                  @RequestParam(value = "chunk",required= false) Integer chunk) { //第几片，从0开始
         return fileUploadService.upload(file,md5File,chunk);
     }

efs-ftp/src/main/java/com/zjty/efs/ftp/service/impl/FileUploadServiceImpl.java

@@ -123,6 +123,10 @@ public class FileUploadServiceImpl implements FileUploadService {
 
     @Override
     public ServerResponse upload(MultipartFile file, String md5File, Integer chunk) {
+        log.info("文件：" + file);
+        log.info("md5File" + md5File);
+        log.info("当前分片" + chunk);
+        log.info("文件名称" + file.getName());
         String chunkPath = fileAddress + "/" + md5File + "/";//分片存放目录
         File dirFile = new File(chunkPath);
         if (!dirFile.exists()) {//目录不存在，创建目录
@@ -144,6 +148,7 @@ public class FileUploadServiceImpl implements FileUploadService {
         } catch (IOException e) {
             log.error(filePath + "文件没有保存");
         }
+        log.info(saveFile.getAbsolutePath() + "文件保存成功");
         return ServerResponse.success("true");
     }
 

efs-union/src/main/java/com/zjty/efs/union/UnionApplication.java

@@ -29,20 +29,20 @@ public class UnionApplication {
         SpringApplication.run(UnionApplication.class, args);
     }
 
-//    @Bean
-//    public ServletWebServerFactory servletContainer() {
-//    TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
-//    tomcat.addAdditionalTomcatConnectors(createHTTPConnector());
-//    return tomcat;
-//    }
-//
-//    private Connector createHTTPConnector() {
-//        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
-//        //同时启用http（8080）、https（8443）两个端口
-//        connector.setScheme("http");
-//        connector.setPort(8081);
-//        connector.setSecure(false);
-//        connector.setRedirectPort(8082);
-//        return connector;
-//    }
+    @Bean
+    public ServletWebServerFactory servletContainer() {
+    TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
+    tomcat.addAdditionalTomcatConnectors(createHTTPConnector());
+    return tomcat;
+    }
+
+    private Connector createHTTPConnector() {
+        Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
+        //同时启用http（8080）、https（8443）两个端口
+        connector.setScheme("http");
+        connector.setPort(8081);
+        connector.setSecure(false);
+        connector.setRedirectPort(8082);
+        return connector;
+    }
 }

efs-union/src/main/resources/application.properties

@@ -23,11 +23,11 @@ spring.servlet.multipart.max-request-size=100MB
 
 file.address=/Users/ljj/software/ftp
 
-## SSL config
-#server.ssl.key-store=classpath:3725333_filetransfer.products.zjtys.com.cn.pfx
-## 证书密码，请修改为您自己证书的密码.
-#server.ssl.key-store-password=lR4072XF
-## 秘钥库类型
-#server.ssl.keyStoreType=PKCS12
-## 证书别名
-#server.ssl.keyAlias= alias
+# SSL config
+server.ssl.key-store=classpath:3725333_filetransfer.products.zjtys.com.cn.pfx
+# 证书密码，请修改为您自己证书的密码.
+server.ssl.key-store-password=lR4072XF
+# 秘钥库类型
+server.ssl.keyStoreType=PKCS12
+# 证书别名
+server.ssl.keyAlias= alias
\ No newline at end of file

efs-user/src/main/java/com/zjty/efs/user/subject/dao/UserDao.java

@@ -2,9 +2,11 @@ package com.zjty.efs.user.subject.dao;
 
 import com.zjty.efs.user.subject.entity.UserDo;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
+import java.awt.print.Pageable;
 import java.util.List;
 
 /**
@@ -12,7 +14,7 @@ import java.util.List;
  * on 2020-03-24
  */
 @Repository
-public interface UserDao extends JpaRepository<UserDo, String> {
+public interface UserDao extends JpaRepository<UserDo, String>, JpaSpecificationExecutor<UserDo> {
 
     List<UserDo> findByAccount(String account);
 

efs-user/src/main/java/com/zjty/efs/user/subject/service/impl/UserServiceImpl.java

@@ -8,13 +8,19 @@ import com.zjty.efs.user.subject.dao.UserDao;
 import com.zjty.efs.user.subject.entity.*;
 import com.zjty.efs.user.subject.service.UserService;
 import lombok.extern.slf4j.Slf4j;
+import org.hibernate.boot.model.source.spi.TableSpecificationSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 import java.util.*;
 
 /**
@@ -45,10 +51,18 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public UserVo findAllUser(String id, Integer page, Integer size) {
-        Pageable pageable = PageRequest.of(page, size, Sort.Direction.ASC, "name");
-        Page<UserDo> all = userDao.findAll(pageable);
 
-        return new UserVo((int) userDao.count(), page, size, all.getContent());
+        Specification<UserDo> specification = new Specification<UserDo>() {
+            @Override
+            public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, CriteriaBuilder criteriaBuilder) {
+                Predicate predicate = criteriaBuilder.notEqual(root.get("account"), "admin");
+                return criteriaBuilder.and(predicate);
+            }
+        };
+        Pageable pageable = PageRequest.of(page, size, Sort.Direction.ASC, "unit", "name");
+        Page<UserDo> all = userDao.findAll(specification, pageable);
+
+        return new UserVo((int) userDao.count() - 1, page, size, all.getContent());
     }
 
     @Override
@@ -91,11 +105,11 @@ public class UserServiceImpl implements UserService {
         userDo.setPassword(MD5Untils.getMD5Str(pwd));
         userDao.save(userDo);
 
-        String msg = "[管理员]重置了" + "["+
+        String msg = "[管理员]重置了" + "[" +
                 userDo.getUnit()
                 + "_" + userDo.getName() + "]的密码";
 
-        efsLogUtil.addLog(new EfsLog(null,"admin",
+        efsLogUtil.addLog(new EfsLog(null, "admin",
                 msg,
                 new Date()));
 
@@ -113,7 +127,7 @@ public class UserServiceImpl implements UserService {
             String msg = "[管理员]新增了用户:[" + userDo.getUnit() +
                     "_" + userDo.getName() +
                     "]";
-            efsLogUtil.addLog(new EfsLog(null,"admin",msg, new Date()));
+            efsLogUtil.addLog(new EfsLog(null, "admin", msg, new Date()));
 
 
             List<Unit> units = unitDao.findByName(userDo.getUnit());
@@ -123,7 +137,7 @@ public class UserServiceImpl implements UserService {
                 log.info("新增单位:{}", unit.getName());
             }
             return userDo;
-        }else {
+        } else {
             log.warn("新增出错；已存在该用户");
             return new UserDo();
         }
@@ -149,7 +163,7 @@ public class UserServiceImpl implements UserService {
                 return new UserDo();
             }
         } else {
-            log.error("用户登陆出错,错误对象：{}",byUsername);
+            log.error("用户登陆出错,错误对象：{}", byUsername);
             return new UserDo();
         }
     }
@@ -173,7 +187,7 @@ public class UserServiceImpl implements UserService {
                 "_" + user.getName() +
                 "]修改了密码";
         efsLogUtil.addLog(new EfsLog(null, id, msg, new Date()));
-    return user;
+        return user;
     }
 
     @Override
@@ -188,8 +202,8 @@ public class UserServiceImpl implements UserService {
         List<UserDo> users = userDao.findByUnit(unit);
         List<UnitMemVo> rs = new ArrayList<>();
         users.forEach(o -> {
-            UnitMemVo unitMemVo = new UnitMemVo(o.getId(), o.getName(), o.getUnit(), o.getDepartment());
-            rs.add(unitMemVo);
+                    UnitMemVo unitMemVo = new UnitMemVo(o.getId(), o.getName(), o.getUnit(), o.getDepartment());
+                    rs.add(unitMemVo);
                 }
         );
         return rs;
@@ -198,23 +212,23 @@ public class UserServiceImpl implements UserService {
     @Override
     public List<DepUser> findDepUserI(String id) {
         List<DepUser> rs = new ArrayList<>();
-        Map<String,List<OneUser>> map = new HashMap<>();
+        Map<String, List<OneUser>> map = new HashMap<>();
         userDao.findAll().forEach(o -> {
             if (!o.getId().equals(id)) {
 
-                if(map.get(o.getUnit()) == null) {
+                if (map.get(o.getUnit()) == null) {
                     List<OneUser> one = new ArrayList<>();
-                    one.add(new OneUser(o.getName(),o.getId()));
+                    one.add(new OneUser(o.getName(), o.getId()));
                     map.put(o.getUnit(), one);
                 } else {
                     List<OneUser> oneUsers = map.get(o.getUnit());
-                    oneUsers.add(new OneUser(o.getName(),o.getId()));
-                    map.put(o.getUnit(),oneUsers);
+                    oneUsers.add(new OneUser(o.getName(), o.getId()));
+                    map.put(o.getUnit(), oneUsers);
                 }
             }
         });
         map.remove("admin");
-        map.forEach((k,v) -> rs.add(new DepUser(k,v)));
+        map.forEach((k, v) -> rs.add(new DepUser(k, v)));
         return rs;
     }
 }