Browse Source

cdf 批量查询商品列表

lyhzzz 3 năm trước cách đây
mục cha
commit
6ad3c0c80b

+ 19 - 15
src/main/java/com/cdf/interceptor/BackUserInterceptor.java

@@ -39,25 +39,29 @@ public class BackUserInterceptor implements HandlerInterceptor {
 		}
 		log.info("BackUserInterceptor|preHandle|token=" + token);
 		try {
-			Integer userId = JwtUtil.getId(token);
-			User user = userService.getById(userId);
-			UserToken userToken = userTokenService.getById(userId);
-			if(userToken == null ){
-				this.needLogin(request, response);
-				return  false;
-			}
-			if(!token.equals(userToken.getLoginToken())){
-				this.otherLogin(request, response);
-				return  false;
-			}
-			if(user == null ){
-				this.userNotExist(request, response);
-				return  false;
-			}
+			return checkUser(token,request,response);
 		}catch (Exception e){
 			this.needLogin(request, response);
 			return  false;
 		}
+	}
+
+	public boolean checkUser(String token,HttpServletRequest request, HttpServletResponse response){
+		Integer userId = JwtUtil.getId(token);
+		User user = userService.getById(userId);
+		UserToken userToken = userTokenService.getById(userId);
+		if(userToken == null ){
+			this.needLogin(request, response);
+			return  false;
+		}
+		if(!token.equals(userToken.getLoginToken())){
+			this.otherLogin(request, response);
+			return  false;
+		}
+		if(user == null ){
+			this.userNotExist(request, response);
+			return  false;
+		}
 		return true;
 	}
 

+ 36 - 29
src/main/java/com/cdf/interceptor/SceneInterceptor.java

@@ -39,6 +39,9 @@ public class SceneInterceptor implements HandlerInterceptor {
 	private IFdkkUserService fdkkUserService;
 	@Resource
 	FdkkClient fdkkClient;
+	@Autowired
+	private BackUserInterceptor backUserInterceptor;
+
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
 		response.setContentType("text/html;charset=UTF-8");
@@ -47,38 +50,42 @@ public class SceneInterceptor implements HandlerInterceptor {
 			this.needLogin(request, response);
 			return false;
 		}
-		Integer userId = JwtUtil.getId(token);
-		User user = userService.getById(userId);
-		if(user == null ){
-			this.userNotExist(request, response);
-			return  false;
-		}
-		FdkkUser fdkkUser = fdkkUserService.getById(user.getFdkkUserId());
-		String requestURI =   request.getRequestURI();
-		if(request.getMethod().equals("GET")){
-			HashMap<String,String> map = new HashMap<>();
-			for (String key : request.getParameterMap().keySet()) {
-				String parameter = request.getParameter(key);
-				map.put(key,parameter);
+		try {
+			boolean b = backUserInterceptor.checkUser(token, request, response);
+			if(!b){
+				return false;
 			}
-			JSONObject send = fdkkClient.sendGet(requestURI,map, fdkkUser.getToken());
-			response.getWriter().append(JSONObject.toJSONString(send));
-			return false;
-		}
-		JSONObject send;
-		if(request.getContentType().contains("application/json")){
-			 send = fdkkClient.sendPostJson(requestURI, JSONObject.parseObject(ReadAsChars(request)), fdkkUser.getToken());
-		}else {
-			Enumeration<String> parameterNames = request.getParameterNames();
-			HashMap<String,String> map = new HashMap<>();
-			while (parameterNames.hasMoreElements()) {
-				String key =  parameterNames.nextElement();
-				String value = request.getParameter(key);
-				map.put(key,value);
+			Integer userId = JwtUtil.getId(token);
+			User user = userService.getById(userId);
+			FdkkUser fdkkUser = fdkkUserService.getById(user.getFdkkUserId());
+			String requestURI =   request.getRequestURI();
+			if(request.getMethod().equals("GET")){
+				HashMap<String,String> map = new HashMap<>();
+				for (String key : request.getParameterMap().keySet()) {
+					String parameter = request.getParameter(key);
+					map.put(key,parameter);
+				}
+				JSONObject send = fdkkClient.sendGet(requestURI,map, fdkkUser.getToken());
+				response.getWriter().append(JSONObject.toJSONString(send));
+				return false;
+			}
+			JSONObject send;
+			if(request.getContentType().contains("application/json")){
+				send = fdkkClient.sendPostJson(requestURI, JSONObject.parseObject(ReadAsChars(request)), fdkkUser.getToken());
+			}else {
+				Enumeration<String> parameterNames = request.getParameterNames();
+				HashMap<String,String> map = new HashMap<>();
+				while (parameterNames.hasMoreElements()) {
+					String key =  parameterNames.nextElement();
+					String value = request.getParameter(key);
+					map.put(key,value);
+				}
+				send = fdkkClient.sendPost(requestURI, map, fdkkUser.getToken());
 			}
-			send = fdkkClient.sendPost(requestURI, map, fdkkUser.getToken());
+			response.getWriter().append(JSONObject.toJSONString(send));
+		}catch (Exception e){
+			this.needLogin(request, response);
 		}
-		response.getWriter().append(JSONObject.toJSONString(send));
 		return false;
 	}
 

+ 0 - 2
src/main/java/com/cdf/service/impl/FdkkSceneEditService.java

@@ -154,9 +154,7 @@ public class FdkkSceneEditService {
             if(vos.getProductCardList()!=null && vos.getProductCardList().size() >0){
                 tag.put("products",vos.getProductCardList());
             }
-
         }
-
         return tags;
     }