1./external相关接口

王通
1 parent dd8abac8
Showing 4 changed files with 32 additions and 33 deletions
src/main/java/com/bsth/filter/AccessFilter.java
src/main/java/com/bsth/server_rs/AuthorizeInterceptor_IN.java
src/main/java/com/bsth/server_rs/dks/BxRestService.java
src/main/java/com/bsth/util/ThreadLocalUtils.java
@@ -40,8 +40,8 @@ public class AccessFilter extends BaseFilter{
 		logger.info(s.toString());
 		chain.doFilter(request, response);
-		s.append("<time:").append(System.currentTimeMillis() - start).append(">");
-		logger.info(s.toString());
+		//s.append("<time:").append(System.currentTimeMillis() - start).append(">");
+		//logger.info(s.toString());
 	}
 	private String getParams(HttpServletRequest request) throws JsonProcessingException {
@@ -5,7 +5,6 @@ import com.bsth.entity.Resource;
 import com.bsth.server_rs.exception.AesException;
 import com.bsth.service.SystemParamService;
 import com.bsth.service.UserService;
-import com.bsth.util.ThreadLocalUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Message;
@@ -134,7 +133,6 @@ public class AuthorizeInterceptor_IN extends AbstractPhaseInterceptor&lt;Message&gt; i
             throw new AesException(AesException.SIGN_CHECK_FAIL);
         }
-        ThreadLocalUtils.setPassword(map.get(PASSWORD));
         validate(map, message);
     }
@@ -20,7 +20,6 @@ import com.bsth.server_rs.gps.dao.HistoryGpsDao;
 import com.bsth.server_rs.gps.entity.GpsEntity;
 import com.bsth.server_rs.gps.entity.HistoryArrivalEntity;
 import com.bsth.server_rs.schedule.dto.ScheduleRealInfoDTO_JK;
-import com.bsth.util.ThreadLocalUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
@@ -30,7 +29,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import java.util.*;
@@ -62,9 +63,11 @@ public class BxRestService {
     @GET
     @Path("/line")
-    public List<Map<String, Object>> findAllLine() {
+    public List<Map<String, Object>> findAllLine(@Context HttpServletRequest request) {
         List<Map<String, Object>> result = new ArrayList<>();
-        String password = ThreadLocalUtils.getPassword();
+        String password = request.getParameter("password");
+        log.error("log password: {}", password);
+        System.out.println("stdio password: " + password);
         Set<String> limitLines = authorizeInterceptorIn.getLimitLines(password);
         if (limitLines == null || limitLines.isEmpty()) {
             return result;
@@ -103,9 +106,11 @@ public class BxRestService {
     @GET
     @Path("/station")
-    public List<Map<String, Object>> findAllStation() {
+    public List<Map<String, Object>> findAllStation(@Context HttpServletRequest request) {
         List<Map<String, Object>> result = new ArrayList<>();
-        String password = ThreadLocalUtils.getPassword();
+        String password = request.getParameter("password");
+        log.error("log password: {}", password);
+        System.out.println("stdio password: " + password);
         Set<String> limitLines = new HashSet<>(authorizeInterceptorIn.getLimitLines(password));
         if (limitLines == null || limitLines.isEmpty()) {
             return result;
@@ -163,10 +168,12 @@ public class BxRestService {
     @GET
     @Path("/vehicle")
-    public List<Map<String, Object>> findAllVehicle() {
+    public List<Map<String, Object>> findAllVehicle(@Context HttpServletRequest request) {
         List<Map<String, Object>> result = new ArrayList<>();
         Map<String, String> device2line = GpsRealDataBuffer.getDevice2Line();
-        String password = ThreadLocalUtils.getPassword();
+        String password = request.getParameter("password");
+        log.error("log password: {}", password);
+        System.out.println("stdio password: " + password);
         Set<String> limitLines = authorizeInterceptorIn.getLimitLines(password);
         Set<String> limitDevices = authorizeInterceptorIn.getLimitDevices(password);
         if (limitLines == null || limitLines.isEmpty()) {
@@ -199,9 +206,11 @@ public class BxRestService {
     @GET
     @Path("/parking")
-    public List<Map<String, Object>> findAllParking() {
+    public List<Map<String, Object>> findAllParking(@Context HttpServletRequest request) {
         List<Map<String, Object>> result = new ArrayList<>();
-        String password = ThreadLocalUtils.getPassword();
+        String password = request.getParameter("password");
+        log.error("log password: {}", password);
+        System.out.println("stdio password: " + password);
         Set<String> limitLines = authorizeInterceptorIn.getLimitLines(password);
         if (limitLines == null || limitLines.isEmpty()) {
             return result;
@@ -234,9 +243,11 @@ public class BxRestService {
     @GET
     @Path("/gps/all")
-    public List<Map<String, Object>> findAllGps() {
+    public List<Map<String, Object>> findAllGps(@Context HttpServletRequest request) {
         List<Map<String, Object>> result = new ArrayList<>();
-        String password = ThreadLocalUtils.getPassword();
+        String password = request.getParameter("password");
+        log.error("log password: {}", password);
+        System.out.println("stdio password: " + password);
         Set<String> limitLines = authorizeInterceptorIn.getLimitLines(password);
         Set<String> limitDevices = authorizeInterceptorIn.getLimitDevices(password);
         if (limitLines == null || limitLines.isEmpty()) {
@@ -267,9 +278,11 @@ public class BxRestService {
     }
     @GET
     @Path("/history-arrival/{line}/{st}/{et}")
-    public List<HistoryArrivalEntity> historyArrival(@PathParam("line") String line, @PathParam("st") String st, @PathParam("et") String et) {
+    public List<HistoryArrivalEntity> historyArrival(@PathParam("line") String line, @PathParam("st") String st, @PathParam("et") String et, @Context HttpServletRequest request) {
         List<HistoryArrivalEntity> result = new ArrayList<>();
-        String password = ThreadLocalUtils.getPassword();
+        String password = request.getParameter("password");
+        log.error("log password: {}", password);
+        System.out.println("stdio password: " + password);
         Set<String> limitLines = authorizeInterceptorIn.getLimitLines(password);
         Set<String> limitDevices = authorizeInterceptorIn.getLimitDevices(password);
         if (limitLines == null || limitLines.isEmpty()) {
@@ -316,8 +329,10 @@ public class BxRestService {
     @GET
     @Path("/limits/reload")
-    public void reload() {
-        String password = ThreadLocalUtils.getPassword();
+    public void reload(@Context HttpServletRequest request) {
+        String password = request.getParameter("password");
+        log.error("log password: {}", password);
+        System.out.println("stdio password: " + password);
         authorizeInterceptorIn.loadLimit(password);
     }
 }
-package com.bsth.util;
-
-public class ThreadLocalUtils {
-
-    private static ThreadLocal<String> passwords = new ThreadLocal<>();
-
-    public static void setPassword(String password) {
-        passwords.set(password);
-    }
-
-    public static String getPassword() {
-        return passwords.get();
-    }
-}