上传项目

efs-misc/src/main/java/com/zjty/efs/misc/config/Swagger2Config.java

@@ -27,7 +27,7 @@ public class Swagger2Config {
         return new Docket(DocumentationType.SWAGGER_2)
                 .produces(Sets.newHashSet("application/json"))
                 .consumes(Sets.newHashSet("application/json"))
-                .protocols(Sets.newHashSet("http","https"))
+                .protocols(Sets.newHashSet("http"))
                 .apiInfo(apiInfo())
                 .forCodeGeneration(true)
                 .useDefaultResponseMessages(true)

efs-misc/src/main/java/com/zjty/efs/misc/util/MD5Untils.java

@@ -43,7 +43,7 @@ public class MD5Untils {
 
         //27FB10C9C07BC00CD4B8CE3A7F34B8C7
 
-        System.out.println(getMD5Str("meeting" + "1576475225319"));
+        System.out.println(getMD5Str("ljj123456"));
     }
 
 //    public static String MD5ToUpp16(String sourceStr) {

efs-union/src/main/java/com/zjty/efs/union/config/UserInit.java

@@ -8,7 +8,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
-import sun.security.provider.MD5;
 
 import java.util.Date;
 import java.util.List;

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

@@ -20,15 +20,20 @@ spring.jpa.open-in-view=true
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB
 
-server.tomcat.max-http-form-post-size=0
+#server.tomcat.max-http-form-post-size=0
 
 file.address=/Users/ljj/software/ftp
 
-## SSL config f
+# SSL config
+# path
 #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
+#server.ssl.keyAlias= alias
\ No newline at end of file
+
+## spring-security config
+#spring.security.user.name=root
+#spring.security.user.password=root
\ No newline at end of file

efs-user/src/main/java/com/zjty/efs/user/subject/controller/UserController.java

@@ -15,9 +15,6 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Date;
 import java.util.List;
 
-import static org.springframework.web.bind.annotation.RequestMethod.*;
-import static org.springframework.web.bind.annotation.RequestMethod.OPTIONS;
-
 /**
  * @author LJJ cnljj1995@gmail.com
  * on 2020-03-24
@@ -68,22 +65,16 @@ public class UserController {
             @ApiImplicitParam(name="id",value="人员id",dataType="string", paramType = "query")
     })
     public ResponseEntity<UserPwdVo> resetStatus(@RequestParam(value = "id") String id) {
-
         String pwd = "qwer1234";
         UserDo userDo = userService.resetPassword(id, pwd);
-
         return ResponseEntity.ok(new UserPwdVo(id, pwd, userDo.getAccount()));
     }
 
     @PutMapping("/pwd")
     @ApiOperation(value = "用户修改密码")
-    @ApiImplicitParams({
-
-    })
     public ResponseEntity<UserPwdVo> updatePwd(
                                     @RequestBody AccVo accVo
                                    ) {
-
         String oPwd = accVo.getOPwd();
         String nPwd = accVo.getNPwd();
         String id = accVo.getId();
@@ -143,6 +134,7 @@ public class UserController {
         } else {
             return ResponseEntity.ok(user);
         }
+
     }
 
     @Autowired

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

@@ -18,9 +18,7 @@ public interface UserDao extends JpaRepository<UserDo, String>, JpaSpecification
 
     List<UserDo> findByAccount(String account);
 
-
-    void deleteUserDosByAccount(String name);
-
     List<UserDo> findByUnit(String name);
 
+
 }

efs-user/src/main/java/com/zjty/efs/user/subject/entity/RspVo.java

+package com.zjty.efs.user.subject.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 返回给前端的通用类
+ *
+ * @author LJJ cnljj1995@gmail.com
+ * on 2020-04-15
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RspVo<T> {
+
+    private String msg;
+
+    private T data;
+}