绿通前端页面整合

src/main/java/com/nmgs/config/CorsConfig.java

@@ -36,6 +36,8 @@ public class CorsConfig implements WebMvcConfigurer {
                         "/MenuIndex/**",
                         "/ETCLanePay/**",
                         "/Manager/**",
+                        "/queryPage/**",
+                        "/printView/**",
                         "/logManager/**",
                         "/wxCarUserInfo/**",
                         "/showStanEcharts/**",

src/main/java/com/nmgs/config/FilterConfig.java

@@ -33,9 +33,12 @@ public class FilterConfig implements HandlerInterceptor {
         response.setHeader("Access-Control-Allow-Headers", "Authorization,Origin, X-Requested-With, Content-Type, Accept,Access-Token");//Origin, X-Requested-With, Content-Type, Accept,Access-Token
         response.setHeader("Set-Cookie", "SameSite=None");
         String token = request.getHeader("token");
-        if (token.equals("test")) {
+//        if(token == null){
-            return true;
+//            return true;
-        }
+//        }
+//        if (token.equals("test")) {
+//            return true;
+//        }
         if (token != null) {
             boolean result = TokenUtil.verify(token,request);
             //判断绑定

src/main/java/com/nmgs/entity/GreenTrafficCheckPic.java

@@ -17,7 +17,7 @@ import java.util.Date;
 @TableName("GREENTRAFFICCHECKPIC_TABLE")
 @NoArgsConstructor
 @AllArgsConstructor
-public class GreenTrafficCheckPic {;
+public class GreenTrafficCheckPic {
 
   @TableField(value = "LISTNO")
   @MppMultiId

src/main/java/com/nmgs/service/impl/GreenTrafficServiceImpl.java

@@ -14,6 +14,7 @@ import com.nmgs.mapper.GreenTrafficCheckResultMapper;
 import com.nmgs.mapper.GreenTrafficMapper;
 import com.nmgs.service.IGreenTrafficService;
 import com.nmgs.util.PropertiesUtil;
+import com.trkf.PasswordEncryption.PassWordUtils;
 import org.apache.commons.codec.Charsets;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
@@ -23,6 +24,7 @@ import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -268,7 +270,6 @@ public class GreenTrafficServiceImpl implements IGreenTrafficService {
 
         Map<String, Object> resultMap = new HashMap<>();
 
-
         //从配置文件中读取数据库连接类型
         params.put("DBTYPE", PropertiesUtil.getValue("DBType"));
 
@@ -280,10 +281,10 @@ public class GreenTrafficServiceImpl implements IGreenTrafficService {
             throw new Exception("绿通流水号为空");
         }
 
-        //定义循环次数，先定义5次
+        //定义每次取图片的线程数，先定义5次
         int taskCount = 5; // 任务数量
 
-        //定义是第几次取
+        //定义是第几轮次取图片
         int round = 1;
 
         //是否停止线程
@@ -324,13 +325,13 @@ public class GreenTrafficServiceImpl implements IGreenTrafficService {
                 //执行线程
 
                 //定义每张图片要放置的位置，避免顺序错乱
-                int finalI = i-1;
+                int picIndex = i-1;
                 greenTrafficThreadPool.execute( () -> {
                     try {
                         //取出该位置的JSONArray，放置图片
-                        JSONArray pic = (JSONArray) jsonArray.get(finalI);
+                        JSONArray pic = (JSONArray) jsonArray.get(picIndex);
                         pic.set(1,getPic(paramsWebService));
-                        jsonArray.set(finalI,pic);
+                        jsonArray.set(picIndex,pic);
 
                     } catch (Exception e) {
                         logger.info("获取图片失败========"+e);
@@ -795,20 +796,11 @@ public class GreenTrafficServiceImpl implements IGreenTrafficService {
     }
 
 
-    /*@Test
+    @Test
     public void test() throws Exception{
-        Map<String, Object> params = new HashMap<>();
+        System.out.println(PassWordUtils.encrypt("nmjk90[]"));
-        params.put("listNO", "GetImgByListNO2");
+        System.out.println(PassWordUtils.decrypt("dnEoSz5AdTBybzZPdHU3VUtrYlBGZEoq"));
-        params.put("imgType", "1");
+    }
-        Client client = getClient(PropertiesUtil.getValue("LWZXCommonServiceUrl2"));
-        Object[] objects;
-        //json的形式
-        objects = client.invoke("GetWebServiceData", "10",new JSONObject(params).toString());
-        if (objects.length > 0) {
-            System.out.println(objects.toString());
-        }
-
-    }*/
 
 
     public static Client getClient(String path) {

src/main/java/com/nmgs/util/TokenUtil.java

@@ -17,7 +17,8 @@ public class TokenUtil {
     /**
      * token秘钥
      */
-    private static final String TOKEN_SECRET = "apiManager";
+    //private static final String TOKEN_SECRET = "apiManager";
+    private static final String TOKEN_SECRET = "5267915"; //0.13上用
 
     /**
      * 设置过期时间

src/main/resources/static/View/index.html

@@ -5,8 +5,8 @@
     <link rel="icon" href="/favicon.ico"/>
     
     <title></title>
-  <script type="module" crossorigin src="./assets/index.1774c424.js"></script>
+  <script type="module" crossorigin src="./assets/index.3715579c.js"></script>
-  <link rel="stylesheet" href="./assets/index.a8b6c128.css">
+  <link rel="stylesheet" href="./assets/index.a4241367.css">
 </head>
 <body>
 <div id="app">