第一轮测试用例bug fix。

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/userdetail/UserDetailController.java

 package cn.quantgroup.xyqb.controller.middleoffice.userdetail;
 
+import cn.quantgroup.xyqb.controller.middleoffice.userdetail.req.UserDetailReq;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.entity.UserDetail;
 import cn.quantgroup.xyqb.model.IdCardInfo;
@@ -13,6 +14,7 @@ import cn.quantgroup.xyqb.validator.IdCard;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.sql.Timestamp;
 
 /**
@@ -35,21 +37,19 @@ public class UserDetailController {
      * 修改用户实名信息
      *
      * @param userId
-     * @param name
-     * @param idNo
+     * @param userDetailReq
      * @return
      */
     @PutMapping("/{userId}")
     public JsonResult update(@PathVariable Long userId,
-                             @ChineseName String name,
-                             @IdCard String idNo) {
+                             @Valid @RequestBody UserDetailReq userDetailReq) {
         UserDetail userDetail = userDetailService.findByUserId(userId);
         if (userDetail == null) {
-            return save(userId, name, idNo);
+            return save(userId, userDetailReq.getName(), userDetailReq.getIdNo());
         }
         //更新
-        userDetail.setName(name);
-        userDetail.setIdNo(idNo);
+        userDetail.setName(userDetailReq.getName());
+        userDetail.setIdNo(userDetailReq.getIdNo());
         userDetail.setUpdatedAt(new Timestamp(System.currentTimeMillis()));
         userDetail = userDetailService.saveUserDetail(userDetail);
         return JsonResult.buildSuccessResultGeneric(userDetail);

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/userdetail/req/UserDetailReq.java

+package cn.quantgroup.xyqb.controller.middleoffice.userdetail.req;
+
+import cn.quantgroup.xyqb.validator.ChineseName;
+import cn.quantgroup.xyqb.validator.IdCard;
+import lombok.Data;
+
+@Data
+public class UserDetailReq {
+
+    @ChineseName
+    private String name;
+    @IdCard
+    private String idNo;
+}

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/userext/UserExtController.java

 package cn.quantgroup.xyqb.controller.middleoffice.userext;
 
 
-import cn.quantgroup.xyqb.entity.Address;
-import cn.quantgroup.xyqb.entity.Contact;
+import cn.quantgroup.xyqb.controller.middleoffice.userext.req.UserExtReq;
 import cn.quantgroup.xyqb.entity.User;
-import cn.quantgroup.xyqb.entity.UserExtInfo;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.service.user.*;
 import org.apache.commons.collections.CollectionUtils;
@@ -12,7 +10,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -39,24 +36,23 @@ public class UserExtController {
 
     //todo 保存失败的各种场景。
     @PutMapping("/{userId}")
-    public JsonResult ext(@PathVariable Long userId, List<Contact> contacts,
-                          Address address, UserExtInfo userExtInfo, String email, String qq) {
-        if (email != null) {
-            userDetailService.updateUserEmail(userId, email);
+    public JsonResult ext(@PathVariable Long userId, @RequestBody UserExtReq userExtReq) {
+        if (userExtReq.getEmail() != null) {
+            userDetailService.updateUserEmail(userId, userExtReq.getEmail());
         }
-        if (qq != null) {
-            userDetailService.updateUserQq(userId, qq);
+        if (userExtReq.getQq() != null) {
+            userDetailService.updateUserQq(userId, userExtReq.getQq());
         }
-        if (CollectionUtils.isNotEmpty(contacts)) {
-            contactService.save(userId, contacts);
+        if (CollectionUtils.isNotEmpty(userExtReq.getContacts())) {
+            contactService.save(userId, userExtReq.getContacts());
         }
-        if (address != null) {
-            address.setUserId(userId);
-            addressService.save(address);
+        if (userExtReq.getAddress() != null) {
+            userExtReq.getAddress().setUserId(userId);
+            addressService.save(userExtReq.getAddress());
         }
-        if (userExtInfo != null) {
-            userExtInfo.setUserId(userId);
-            userExtInfoService.save(userExtInfo);
+        if (userExtReq.getUserExtInfo() != null) {
+            userExtReq.getUserExtInfo().setUserId(userId);
+            userExtInfoService.save(userExtReq.getUserExtInfo());
         }
         return JsonResult.buildSuccessResult();
     }

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/userext/req/UserExtReq.java

+package cn.quantgroup.xyqb.controller.middleoffice.userext.req;
+
+import cn.quantgroup.xyqb.entity.Address;
+import cn.quantgroup.xyqb.entity.Contact;
+import cn.quantgroup.xyqb.entity.UserExtInfo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class UserExtReq {
+    private List<Contact> contacts;
+    private Address address;
+    private UserExtInfo userExtInfo;
+    private String email;
+    private String qq;
+}

src/main/java/cn/quantgroup/xyqb/filter/CrosFilter.java

@@ -26,8 +26,6 @@ public class CrosFilter implements Filter {
 
     static {
         DISALLOWED_METHOD.add("OPTIONS");
-        DISALLOWED_METHOD.add("PUT");
-        DISALLOWED_METHOD.add("DELETE");
     }
 
     @Value("${xyqb.filter.allowedOrigin}")
@@ -46,7 +44,7 @@ public class CrosFilter implements Filter {
         HttpServletResponse response = (HttpServletResponse) servletResponse;
         HttpServletRequest request = (HttpServletRequest) servletRequest;
         response.setHeader("Access-Control-Allow-Origin", allowedOrigin);
-        response.setHeader("Access-Control-Allow-Methods", "POST, GET");
+        response.setHeader("Access-Control-Allow-Methods", "POST, GET, PUT, DELETE, PATCH");
         response.setHeader("Access-Control-Allow-Headers", allowedHeaders);
         response.setHeader("Access-Control-Max-Age", "3600");
         if (DISALLOWED_METHOD.contains(request.getMethod())) {

src/main/java/cn/quantgroup/xyqb/service/user/impl/AddressServiceImpl.java

@@ -9,6 +9,7 @@ import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
+import java.sql.Timestamp;
 import java.util.List;
 
 /**
@@ -29,11 +30,14 @@ public class AddressServiceImpl implements IAddressService {
     @Override
     @CacheEvict(value = "addresscache", key = "'address' + #addressObj.userId", cacheManager = "cacheManager")
     public Address save(Address addressObj) {
+        Timestamp now = new Timestamp(System.currentTimeMillis());
         /* 替换所有,UTF-8编码时4字节的Emoji表情字符 */
         addressObj.setProvince(EmojiUtil.filterUnicode4(addressObj.getProvince()));
         addressObj.setCity(EmojiUtil.filterUnicode4(addressObj.getCity()));
         addressObj.setDistrict(EmojiUtil.filterUnicode4(addressObj.getDistrict()));
         addressObj.setAddress(EmojiUtil.filterUnicode4(addressObj.getAddress()));
+        addressObj.setCreatedAt(now);
+        addressObj.setUpdateAt(now);
         return addressRepository.save(addressObj);
     }