finikes alpha 26

pom.xml

@@ -103,6 +103,12 @@
             <artifactId>pagehelper-spring-boot-starter</artifactId>
             <version>1.2.5</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.5</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/finikes/oc/base/controller/PassportController.java

@@ -4,20 +4,14 @@ import com.finikes.oc.BaseDTO;
 import com.finikes.oc.BizException;
 import com.finikes.oc.Passports;
 import com.finikes.oc.base.dao.PassportDAO;
-import com.finikes.oc.base.dto.PageResponse;
 import com.finikes.oc.base.dto.PassportHouseInfoResponseDTO;
 import com.finikes.oc.base.dto.RegisterResponseDTO;
 import com.finikes.oc.base.entity.Passport;
-import com.finikes.oc.common.SMSSender;
 import com.finikes.oc.estate.dao.EstateUnitDAO;
 import com.finikes.oc.estate.dao.HouseDAO;
 import com.finikes.oc.estate.entity.EstateUnit;
 import com.finikes.oc.estate.entity.House;
-import com.finikes.oc.management.HouseRelationViewDto;
 import com.finikes.oc.management.dao.HouseRelationDAO;
-import com.finikes.oc.management.entity.HouseRelation;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -26,7 +20,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/finikes/oc/base/controller/VerificationCodeController.java

@@ -2,7 +2,6 @@ package com.finikes.oc.base.controller;
 
 import com.finikes.oc.BaseDTO;
 import com.finikes.oc.BizException;
-import com.finikes.oc.Passports;
 import com.finikes.oc.base.dao.PassportDAO;
 import com.finikes.oc.base.dto.RegisterResponseDTO;
 import com.finikes.oc.base.entity.Passport;

src/main/java/com/finikes/oc/base/dto/NoticeCreateDto.java

@@ -1,6 +1,5 @@
 package com.finikes.oc.base.dto;
 
-
 import javax.validation.constraints.*;
 
 public class NoticeCreateDto {

src/main/java/com/finikes/oc/base/dto/NoticeUpdateDto.java

@@ -1,6 +1,5 @@
 package com.finikes.oc.base.dto;
 
-
 import javax.validation.constraints.*;
 
 public class NoticeUpdateDto {

src/main/java/com/finikes/oc/base/service/NoticeService.java

@@ -2,8 +2,6 @@ package com.finikes.oc.base.service;
 
 import com.finikes.oc.base.dto.*;
 
-import java.util.List;
-
 /**
  * 通知服务
  */

src/main/java/com/finikes/oc/common/HttpServletRequestParams.java

@@ -0,0 +1,52 @@
+package com.finikes.oc.common;
+
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.multipart.MultipartResolver;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class HttpServletRequestParams {
+    private final Map<String, Class> PARAMS_TYPE = new HashMap<>();
+
+    private final Map<String, Object> PARAMS = new HashMap<>();
+
+    public HttpServletRequestParams(HttpServletRequest request) {
+        //下面这句必须加，不然报错
+        MultipartResolver resolver = new CommonsMultipartResolver(request.getServletContext());
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+
+        //获取上传上来的文件
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entry : fileMap.entrySet()) {
+            MultipartFile file = entry.getValue();
+            String fileName = file.getName();
+            PARAMS_TYPE.put(fileName, file.getClass());
+            PARAMS.put(fileName, file);
+        }
+
+        Map<String, String[]> params = multipartRequest.getParameterMap();
+        Set<String> keySet = params.keySet();
+        for (String key : keySet) {
+            String value = params.get(key)[0];
+            PARAMS_TYPE.put(key, value.getClass());
+            PARAMS.put(key, value);
+        }
+    }
+
+    public Class getParamType(String paramId) {
+        return PARAMS_TYPE.get(paramId);
+    }
+
+    public Object getParam(String paramId) {
+        return PARAMS.get(paramId);
+    }
+
+    public Set<String> getParamIds() {
+        return PARAMS.keySet();
+    }
+}

src/main/java/com/finikes/oc/estate/controller/EstateController.java

@@ -1,7 +1,6 @@
 package com.finikes.oc.estate.controller;
 
 import com.finikes.oc.BaseDTO;
-import com.finikes.oc.base.dto.RegisterResponseDTO;
 import com.finikes.oc.estate.dao.EstateUnitDAO;
 import com.finikes.oc.estate.dao.HouseDAO;
 import com.finikes.oc.estate.dto.EstatesResponseDTO;
@@ -12,7 +11,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Map;
 
 @RequestMapping("/estates")
 @ResponseBody

src/main/java/com/finikes/oc/estate/controller/HouseController.java

@@ -18,10 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 @RequestMapping("/house")
 @ResponseBody

src/main/java/com/finikes/oc/estate/dao/HouseDAO.java

@@ -1,7 +1,6 @@
 package com.finikes.oc.estate.dao;
 
 import com.finikes.oc.estate.entity.House;
-import com.finikes.oc.management.HouseRelationViewDto;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/finikes/oc/estate/dto/EstatesResponseDTO.java

@@ -1,7 +1,6 @@
 package com.finikes.oc.estate.dto;
 
 import com.finikes.oc.estate.entity.EstateUnit;
-import com.finikes.oc.estate.entity.House;
 
 import java.util.List;
 

src/main/java/com/finikes/oc/filter/AuthFilter.java

@@ -8,7 +8,6 @@ import com.finikes.oc.management.dao.ResourceDAO;
 import com.finikes.oc.management.entity.Authority;
 import com.finikes.oc.management.entity.Manager;
 import com.finikes.oc.management.entity.Resource;
-import org.apache.tomcat.util.http.fileupload.impl.FileSizeLimitExceededException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MaxUploadSizeExceededException;

src/main/java/com/finikes/oc/filter/CorsFilter.java

@@ -1,6 +1,5 @@
 package com.finikes.oc.filter;
 
-import org.apache.tomcat.util.http.fileupload.impl.FileSizeLimitExceededException;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MaxUploadSizeExceededException;
 

src/main/java/com/finikes/oc/management/controller/AuthController.java

@@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;

src/main/java/com/finikes/oc/vote/controller/ChoicesController.java

@@ -1,20 +1,11 @@
 package com.finikes.oc.vote.controller;
 
 import com.finikes.oc.BaseDTO;
-import com.finikes.oc.BizException;
 import com.finikes.oc.Passports;
-import com.finikes.oc.base.dao.PassportDAO;
-import com.finikes.oc.base.dto.PassportHouseInfoResponseDTO;
-import com.finikes.oc.base.dto.RegisterResponseDTO;
-import com.finikes.oc.base.entity.Passport;
 import com.finikes.oc.estate.Houses;
-import com.finikes.oc.estate.dao.EstateUnitDAO;
 import com.finikes.oc.estate.dao.HouseDAO;
-import com.finikes.oc.estate.entity.EstateUnit;
-import com.finikes.oc.estate.entity.House;
 import com.finikes.oc.management.dao.HouseRelationDAO;
 import com.finikes.oc.management.dto.HouseChoiceInfoDTO;
-import com.finikes.oc.management.entity.HouseRelation;
 import com.finikes.oc.vote.dao.ChoiceDao;
 import com.finikes.oc.vote.dao.OptionDao;
 import com.finikes.oc.vote.dao.VoteDao;
@@ -28,12 +19,9 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 @Controller
 public class ChoicesController {

src/main/java/com/finikes/oc/vote/controller/OptionController.java

@@ -1,29 +1,14 @@
 package com.finikes.oc.vote.controller;
 
 import com.finikes.oc.BaseDTO;
-import com.finikes.oc.BizException;
-import com.finikes.oc.base.dao.PassportDAO;
-import com.finikes.oc.base.dto.PassportHouseInfoResponseDTO;
-import com.finikes.oc.base.dto.RegisterResponseDTO;
-import com.finikes.oc.base.entity.Passport;
-import com.finikes.oc.estate.dao.EstateUnitDAO;
-import com.finikes.oc.estate.dao.HouseDAO;
-import com.finikes.oc.estate.entity.EstateUnit;
-import com.finikes.oc.estate.entity.House;
-import com.finikes.oc.management.dao.HouseRelationDAO;
-import com.finikes.oc.management.entity.HouseRelation;
 import com.finikes.oc.vote.dao.OptionDao;
 import com.finikes.oc.vote.entity.Option;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 @RequestMapping("/option")
 @ResponseBody

src/main/java/com/finikes/oc/vote/dto/VoteActivityCreateDto.java

@@ -1,6 +1,5 @@
 package com.finikes.oc.vote.dto;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;

src/main/java/com/finikes/oc/vote/dto/VoteActivityUpdateDto.java

@@ -1,6 +1,5 @@
 package com.finikes.oc.vote.dto;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;

src/main/java/com/finikes/oc/vote/dto/VoteActivityViewDto.java

@@ -1,7 +1,5 @@
 package com.finikes.oc.vote.dto;
 
-import java.util.Date;
-
 public class VoteActivityViewDto {
     private Integer id;
     private String title;

src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
   datasource:
     # matrix34.tpddns.cn:13306
     # localhost:3306
-    url: jdbc:mysql://localhost:3306/community?useSSL=false&useUnicode=true&characterEncoding=utf-8&useAffectedRows=true&serverTimezone=UTC
+    url: jdbc:mysql://matrix34.tpddns.cn:13306/community?useSSL=false&useUnicode=true&characterEncoding=utf-8&useAffectedRows=true&serverTimezone=UTC
     username: root
     password: 9a41012499f38251
     driver-class-name: com.mysql.cj.jdbc.Driver