合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -361,15 +361,13 @@ public class TaUserServiceImpl implements ITaUserService {
             int VerifyStatus= Integer.parseInt(taUser.getVerifyStatus());
             int Role= TaSysUserRole.getRoleId();
             if (1==VerifyStatus &&1==Role) {
-                //根据手机号查当前信息
-            TpBuildingOwnerInfo tpBuildingOwnerInfoId=tpBuildingOwnerInfoMapper.selectOwnerTel(taUser.getLoginName());          //
             TpBuildingOwnerInfo TpBuildingOwnerInfo = new TpBuildingOwnerInfo();
             TpBuildingOwnerInfo.setOwnerName(user.getUserName());
             TpBuildingOwnerInfo.setGender(user.getGender());
             TpBuildingOwnerInfo.setOwnerTel(user.getLoginName());
             TpBuildingOwnerInfo.setUpdateDate(new Date());
             TpBuildingOwnerInfo.setUpdateUser(taUser.getId());
-            TpBuildingOwnerInfo.setId(tpBuildingOwnerInfoId.getId());
+            TpBuildingOwnerInfo.setId(taUser.getBuildingOwnerInfoId());
             tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(TpBuildingOwnerInfo);
         }
         if (result > 0){

CODE/smart-community/zuul/src/main/java/com/community/huiju/constant/RequestURI.java

@@ -0,0 +1,40 @@
+package com.community.huiju.constant;
+
+/**
+ * 请求定义
+ * @author weiximei
+ */
+public enum RequestURI {
+
+    APP_API("/app-api", "APP端请求路径"),
+
+    OPERATE_API("/operate-api", "运营端请求路径"),
+
+    PROPERTY_API("/property-api", "物业端请求路径");
+
+
+    RequestURI(String url, String comment) {
+        this.url = url;
+        this.comment = comment;
+    }
+
+    private String url;
+
+    private String comment;
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+}

CODE/smart-community/zuul/src/main/java/com/community/huiju/filter/DomainZuulPostFilter.java

@@ -5,15 +5,15 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.constant.Header;
+import com.community.huiju.constant.RequestURI;
 import com.community.huiju.constant.Status;
 import com.netflix.zuul.ZuulFilter;
 import com.netflix.zuul.context.RequestContext;
 import com.netflix.zuul.exception.ZuulException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
+import org.springframework.util.AntPathMatcher;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -26,9 +26,11 @@ import javax.servlet.http.HttpServletResponse;
 @Slf4j
 public class DomainZuulPostFilter extends ZuulFilter {
 
+    private AntPathMatcher matcher = new AntPathMatcher();
+
     @Override
     public String filterType() {
-        return "post";
+        return "pre";
     }
 
     @Override
@@ -54,30 +56,33 @@ public class DomainZuulPostFilter extends ZuulFilter {
         response.setContentType("application/json;charset=UTF-8");
         HttpServletRequest request = ctx.getRequest();
         String token = request.getHeader(Header.REQUEST_X_AUTH_TOKEN.getValue());
-        String loginType = request.getHeader(Header.LOGIN_TYPE.getValue());
+        // String loginType = request.getHeader(Header.LOGIN_TYPE.getValue());
+        // 根据URL判断是访问哪一个端
+        String requestURI = request.getRequestURI();
+        ResponseBean responseBean = new ResponseBean();
+
         if (StringUtils.isBlank(token)) {
 
         }else {
             log.info("获取的token: {}", token);
-            ResponseBean responseBean = new ResponseBean();
-            // APP 端
-            if (Constant.APP_LOGIN_TYPE.equals(loginType.trim())){
+
+            if (matcher.match(RequestURI.APP_API.getUrl(), requestURI)) {
                 UserElement appElement = (UserElement) request.getSession().getAttribute(Constant.APP_USER_SESSION);
                 if (null == appElement) {
                     responseBean.addError(Status.RESPONSE_STATUS_803.getValue(),Status.RESPONSE_STATUS_803.getComment());
+                    ctx.setSendZuulResponse(false);
                     ctx.setResponseBody(JSONObject.toJSONString(responseBean));
                 }
 
-                // WEB 端
-            } else {
+            } else if (matcher.match(RequestURI.OPERATE_API.getUrl(), requestURI) || matcher.match(RequestURI.PROPERTY_API.getUrl(), requestURI)) {
                 UserElement webOperateElement = (UserElement) request.getSession().getAttribute(Constant.WEB_USER_SESSION);
                 if (null == webOperateElement) {
                     responseBean.addError(Status.RESPONSE_STATUS_803.getValue(),Status.RESPONSE_STATUS_803.getComment());
+                    ctx.setSendZuulResponse(false);
                     ctx.setResponseBody(JSONObject.toJSONString(responseBean));
                 }
             }
 
-
         }
 
         return null;