注册登录接口对接；其他

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -115,7 +115,7 @@ public class SysDeptController {
      * @date 2019/9/7 09:12
      */
     @GetMapping("getCompleteDept/{gridId}")
-    public Result<CompleteDeptDTO> getCompleteDept(@PathVariable("gridId") Long gridId) {
+    public Result<CompleteDeptDTO> getCompleteDept(@PathVariable("gridId") String gridId) {
         return sysDeptService.getCompleteDept(gridId);
     }
 

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java

@@ -71,5 +71,5 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      * @author yujintao
      * @date 2019/9/7 09:13
      */
-    Result<CompleteDeptDTO> getCompleteDept(Long gridId);
+    Result<CompleteDeptDTO> getCompleteDept(String gridId);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -27,6 +27,7 @@ import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
 import com.elink.esua.epdc.entity.SysDeptEntity;
 import com.elink.esua.epdc.service.SysDeptService;
 import com.elink.esua.epdc.service.SysUserService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,6 +44,7 @@ import java.util.Map;
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
+@Slf4j
 @Service
 public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntity> implements SysDeptService {
     @Autowired
@@ -67,7 +69,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     public List<SysSimpleDeptDTO> subList(String pid) {
         QueryWrapper<SysDeptEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("PID", pid)
-                .ne("TYPE_KEY","district_dept")
+                .ne("TYPE_KEY", "district_dept")
                 .select(FieldConstant.ID, FieldConstant.NAME)
                 .orderByAsc(FieldConstant.NAME);
         List<SysDeptEntity> entities = this.baseDao.selectList(wrapper);
@@ -185,8 +187,17 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     }
 
     @Override
-    public Result<CompleteDeptDTO> getCompleteDept(Long gridId) {
-        CompleteDeptDTO completeDept = this.baseDao.getCompleteDept(gridId);
+    public Result<CompleteDeptDTO> getCompleteDept(String gridId) {
+        Long gridIdL = null;
+        try {
+            gridIdL = Long.parseLong(gridId.trim());
+        } catch (Exception e) {
+            log.error("->getCompleteDept:::网格ID格式转换异常:::grid->{}", gridId);
+        }
+        if (null == gridId) {
+            return new Result().error("参数格式异常");
+        }
+        CompleteDeptDTO completeDept = this.baseDao.getCompleteDept(gridIdL);
         return new Result().ok(completeDept);
     }
 

esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java

@@ -16,6 +16,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
 import org.springframework.util.AntPathMatcher;
+import org.springframework.util.StringUtils;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -67,9 +68,9 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
 
             HttpHeaders headers = request.getHeaders();
             String token = headers.getFirst(Constant.AUTHORIZATION_HEADER);
-            if (token == null) {
+            if (StringUtils.isEmpty(token)) {
                 token = request.getQueryParams().getFirst(Constant.AUTHORIZATION_HEADER);
-                if (token == null) {
+                if (StringUtils.isEmpty(token)) {
                     return chain.filter(exchange);
                 }
             }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -267,7 +267,9 @@ public class AppUserServiceImpl implements AppUserService {
                 .concat(StringUtils.isNotBlank(formDto.getHouseCode()) ? formDto.getHouseCode() : "");
         user.setAddress(address);
 
-        user.setRegisterTime(new Date());
+        Date now = new Date();
+        user.setRegisterTime(now);
+        user.setLastLoginTime(now);
         user.setState(AppUserAuditStateEnum.UNDER_AUDIT.value());
         user.setPartyFlag(YesOrNoEnum.NO.value());
         user.setRegisterWay(AppUserRegisterWayEnum.WX.value());

esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml

@@ -114,7 +114,7 @@
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
 
-                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
             </properties>
         </profile>

esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml

@@ -149,7 +149,7 @@
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
 
-                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
             </properties>
         </profile>

esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml

@@ -115,7 +115,7 @@
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
 
-                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
             </properties>
         </profile>

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserRegistFormDTO.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.dto.epdc.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
@@ -42,6 +43,7 @@ public class EpdcUserRegistFormDTO implements Serializable {
      * 网格Id
      */
     @NotNull(message = "网格Id不能为空")
+    @Min(value = 1L, message = "网格Id错误")
     private Long gridId;
     /**
      * 所在道路

esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml

@@ -126,7 +126,7 @@
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
 
-                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
             </properties>
         </profile>