aop修改

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

 package com.yeejoin.amos.boot.biz.common.aop;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
+import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import org.apache.commons.lang3.ObjectUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -25,22 +36,11 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
-import com.alibaba.fastjson.JSONObject;
-import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
-import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
-import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.CompanyModel;
-import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
-import com.yeejoin.amos.feign.privilege.model.RoleModel;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
-import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
 
 /**
  * controller层切面 用于用户数据缓存 供 sql自动填充使用 (使用粒度过大的Aop会创建大量代理对象，影响性能，占用内存，考虑使用
@@ -80,17 +80,24 @@ public class ControllerAop {
 		} else {
 			return;
 		}
-		// 不需要添加请求头的接口
-		String[] url = new String[] { "/api/user/save/curCompany", "/jcs/command/lookHtmlText",
-				"/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo",
-				"/openapi/bizToken/applyToken"
-				,"/tzs/flc-unit-info/region/tree", "/tzs/reg-unit-info/management-unit/tree","/tzs/flc-unit-info" +
-				"/region/tree", "/tzs/reg-unit-info/unit-type/list"
-				,"/tzs/reg-unit-info/"+"^[A-Za-z0-9]+$"+"/check","/tzs/flc-unit-info/hasExistPhone","/tzs/flc-unit-info/sendTelCode"
-		};
+		// 不需要添加请求头的接口，如使用url中有PathVariable，则使用正则表达式匹配
+		List<String> urls = Lists.newArrayList();
+		urls.add("/api/user/save/curCompany");
+		urls.add("/jcs/command/lookHtmlText");
+		urls.add("^/jcs/common/duty-person/findByDutyAreaId/[A-Za-z0-9]+$");
+		urls.add("/tzs/wechatBack");
+		urls.add("/tzs/elevator/getElevatorInfo");
+		urls.add("/openapi/bizToken/applyToken");
+		urls.add("/tzs/flc-unit-info/region/tree");
+		urls.add("/tzs/reg-unit-info/management-unit/tree");
+		urls.add("/tzs/reg-unit-info/unit-type/list");
+		urls.add("^/tzs/flc-unit-info/hasExistPhone/[0-9]+$");
+		urls.add("^/tzs/flc-unit-info/sendTelCode/[0-9]+$");
+		urls.add("^/tzs/reg-unit-info/[A-Za-z0-9]+/check$");
 		// 获取请求路径
-		for (String uri : url) {
-			if (request.getRequestURI().indexOf(uri) != -1) {
+		for (String uri : urls) {
+			Pattern p = Pattern.compile(uri);
+			if (p.matcher(request.getRequestURI()).matches()) {
 				return;
 			}
 		}