From 319b3d6d75f9dff2611768cb3f590a4de58bfd25 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Wed, 11 Sep 2019 14:11:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java   | 3 +++
 .../main/java/com/elink/esua/epdc/feign/UserFeignClient.java | 2 +-
 .../com/elink/esua/epdc/service/impl/AppUserServiceImpl.java | 3 +--
 .../elink/esua/epdc/dto/epdc/form/EpdcUserRegistFormDTO.java | 5 +++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java
index b264baa24..ebe6db4bf 100644
--- a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java
+++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java
@@ -69,6 +69,9 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
             String token = headers.getFirst(Constant.AUTHORIZATION_HEADER);
             if (token == null) {
                 token = request.getQueryParams().getFirst(Constant.AUTHORIZATION_HEADER);
+                if (token == null) {
+                    return chain.filter(exchange);
+                }
             }
             Result<TokenDto> result = resourceFeignClient.getLoginUserInfo(token);
             if (!result.success()) {
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
index a62449ce8..e52c8b323 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @email yujintao@elink-cn.com
  * @date 2019/9/7 9:27
  */
-@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class,url = "http://127.0.0.1:9068")
+@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class)
 public interface UserFeignClient {
 
     /**
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index 5e0c230bf..b07956344 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -210,8 +210,7 @@ public class AppUserServiceImpl implements AppUserService {
         }
 
         // 获取网格机构详情
-        String gridId = formDto.getGridId();
-        Result<CompleteDeptDTO> adminDeptResult = adminFeignClient.getCompleteDept(Long.parseLong(gridId));
+        Result<CompleteDeptDTO> adminDeptResult = adminFeignClient.getCompleteDept(formDto.getGridId());
         if (!adminDeptResult.success() || null == adminDeptResult.getData()) {
             throw new RenException("查询网格信息失败");
         }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegistFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegistFormDTO.java
index 1b8df027d..481e5ab6c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegistFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegistFormDTO.java
@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.epdc.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -40,8 +41,8 @@ public class EpdcUserRegistFormDTO implements Serializable {
     /**
      * 网格Id
      */
-    @NotBlank(message = "网格Id不能为空")
-    private String gridId;
+    @NotNull(message = "网格Id不能为空")
+    private Long gridId;
     /**
      * 所在道路
      */