1.0版本定版本

mainFactory/src/main/java/org/bfkj/api/CommonApi.java

@@ -1,5 +1,6 @@
 package org.bfkj.api;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.bfkj.application.AuthApplicationImpl;
 import org.bfkj.application.DataProcess;
 import org.bfkj.config.AppConfig;
@@ -47,6 +48,22 @@ public class CommonApi {
         return authApplication.abnormalDataRecovery(params);
     }
 
+
+    @PostMapping("generalDataReception")
+    public Map<String, Object> dataCollect(@RequestBody Map<String, Object> params, HttpServletRequest httpServletRequest) {
+        params.put("id", "1");
+        Map<String, Object> rsMap = commonInterface(null, params, "1");
+        rsMap.put("requestId", httpServletRequest.getSession().getId());
+        if (rsMap.containsKey("code") && "-1".equals(rsMap.get("code"))) {
+            rsMap.put("code", "1");
+            rsMap.put("message", "数据收集失败");
+        } else {
+            rsMap.put("returnData", "数据收集成功");
+        }
+        return rsMap;
+    }
+
+
     /**
      * 查询入口CRUD
      */
@@ -133,7 +150,7 @@ public class CommonApi {
             return errMap;
 
         }
-        Object serviceId = params.get("serviceId");
+        Object serviceId = params.containsKey("serviceId") ? params.get("serviceId") : params.get("id");
         if (Objects.isNull(serviceId) || !params.containsKey("event")) {
             HashMap<String, Object> errMap = new HashMap<>();
             errMap.put("code", "-1");
@@ -170,7 +187,7 @@ public class CommonApi {
             errMap.put("message", "服务不可用：" + (null == dataProcessObj ? "" : dataProcessObj.getErrorMessage()));
             return errMap;
         }
-        return dataProcessObj.processData(params, token.get("user_id"));
+        return dataProcessObj.processData(params, Objects.nonNull(token) ? token.get("user_id") : null);
     }
 
 

mainFactory/src/main/java/org/bfkj/application/AuthApplicationImpl.java

@@ -4,10 +4,7 @@ package org.bfkj.application;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.bfkj.config.AppConfig;
 import org.bfkj.config.ObjectMap;
-import org.bfkj.utils.LogUtils;
-import org.bfkj.utils.MapTools;
-import org.bfkj.utils.MyDbHelper;
-import org.bfkj.utils.RandomGraphic;
+import org.bfkj.utils.*;
 import org.springframework.stereotype.Service;
 
 import java.util.*;

mainFactory/src/main/java/org/bfkj/protocol/ElasticHandler.java

@@ -8,6 +8,9 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.bfkj.utils.LogUtils;
 import org.bfkj.utils.MapTools;
 import org.elasticsearch.action.ShardOperationFailedException;
+import org.elasticsearch.action.bulk.BulkItemResponse;
+import org.elasticsearch.action.bulk.BulkRequest;
+import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.action.support.WriteRequest;
@@ -19,10 +22,7 @@ import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.xcontent.XContentType;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /*es协议*/
@@ -64,23 +64,22 @@ public class ElasticHandler {
                 return false;
             }
         }
-        String dataJSON = "";
         try {
-            if (dataContent.size() > 0) {
-                IndexRequest request = new IndexRequest(indexName);
+            if (!dataContent.isEmpty()) {
+                BulkRequest bulkRequest = new BulkRequest();
                 for (Object data : dataContent) {
-                    dataJSON = MapTools.objToJSONStr(data);
+                    String dataJson = MapTools.objToJSONStr(data);
+                    IndexRequest request = new IndexRequest(indexName);
                     request.id(createLifeCycleCol(1L, Integer.valueOf(MapTools.isBlank(serviceId) ? "0" : serviceId)));
                     request.timeout("1s");
-                    request.source(dataJSON, XContentType.JSON);
-                    request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
-                    IndexResponse indexResponse = restHighLevelClient.index(request, RequestOptions.DEFAULT);
-                    ReplicationResponse.ShardInfo shardInfo = indexResponse.getShardInfo();
-                    if (shardInfo.getFailed() > 0) {
-                        String collect = Arrays.stream(shardInfo.getFailures()).map(ShardOperationFailedException::reason).collect(Collectors.joining(";\n"));
-                        MapTools.processSuccess(collect);
-                        return false;
-                    }
+                    request.source(dataJson, XContentType.JSON);
+//                    request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
+                    bulkRequest.add(request);
+                }
+                BulkResponse bulkResponse = restHighLevelClient.bulk(bulkRequest, RequestOptions.DEFAULT);
+                if (bulkResponse.hasFailures()){
+                    System.out.println("ES日志发送失败： ".concat(dataContent.toString()));
+                    return false;
                 }
             }
         } catch (IOException e) {

mainFactory/src/main/java/org/bfkj/utils/DataFormat.java

@@ -112,7 +112,7 @@ public class DataFormat {
                 String inData = Objects.toString(o);
                 if (MapTools.isBlank(inData)) continue;
                 int dataObjectIdIndex = inData.indexOf("dataObjectId");
-                String tpDataObjectId = inData.length() > 39 ? inData.substring(dataObjectIdIndex + 15, dataObjectIdIndex + 39) : null;
+                String tpDataObjectId = dataObjectIdIndex !=-1 &&  inData.length() > 39 ? inData.substring(dataObjectIdIndex + 15, dataObjectIdIndex + 39) : null;
                 rsList.addAll(typebHandler(inData, transMaps, MapTools.isBlank(tpDataObjectId) ? dataObjectId : tpDataObjectId));
             }
             return processSuccess(rsList);
@@ -141,7 +141,7 @@ public class DataFormat {
                         HashMap<String, Object> errorMap = new HashMap<>();
                         errorMap.put("dataObjectId", dataObjectId);
                         errorMap.put("errMessage", "报文数据格式错误");
-                        if (AppConfig.SOURCE_DATA){
+                        if (AppConfig.SOURCE_DATA) {
                             errorMap.put("sourceData", tempTypeStr);
                         }
                         if (!returnDataList.contains(errorMap)) {

mainFactory/src/main/java/org/bfkj/utils/GenerateImage.java

@@ -0,0 +1,78 @@
+package org.bfkj.utils;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.security.SecureRandom;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+public class GenerateImage {
+    private static final int WIDTH = 120; // 图片宽度
+    private static final int HEIGHT = 40; // 图片高度
+    private static String IMAGE_FORMAT = "JPG";
+    private static Color[] COLORS = new Color[]{
+            new Color(0, 0, 255),
+            new Color(0, 255, 0),
+            new Color(255, 0, 0)
+    };
+    private static SecureRandom RANDOM = new SecureRandom();
+
+
+    public static Map<String, Object> generateVerifyCode(int verifySize, String sources) {
+        int codesLen = sources.length();
+        try {
+            StringBuilder verifyCode = new StringBuilder(verifySize);
+            for (int i = 0; i < verifySize; i++) {
+                verifyCode.append(sources.charAt(RANDOM.nextInt(codesLen - 1)));
+            }
+
+            BufferedImage image = createImage(verifyCode.toString());
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            ImageIO.write(image, IMAGE_FORMAT, outputStream);
+
+            byte[] data = outputStream.toByteArray();
+            String base64Image = Base64.getEncoder().encodeToString(data).replaceAll("[\\s*\t\n\r]", "");
+            outputStream.close();
+            Map<String, Object> returnData = new HashMap<>();
+            returnData.put("verifyCode", verifyCode);
+            returnData.put("verifyCodeImage", base64Image);
+            return returnData;
+        } catch (IOException e) {
+            return null;
+        }
+    }
+    private static BufferedImage createImage(String verifyCode) {
+        BufferedImage image = new BufferedImage(WIDTH, HEIGHT, BufferedImage.TYPE_INT_RGB);
+        Graphics graphics = image.getGraphics();
+
+        graphics.setColor(Color.WHITE);
+        graphics.fillRect(0, 0, WIDTH, HEIGHT);
+
+        int desX,desY,distance=16;
+        for (int i = 0; i < verifyCode.length(); i++) {
+            graphics.setColor(COLORS[RANDOM.nextInt(COLORS.length)]);
+            desX = (i+1)*distance;
+            desY = distance+RANDOM.nextInt(HEIGHT-2*distance);
+            graphics.drawString(Character.toString(verifyCode.charAt(i)),desX,desY);
+        }
+
+        for(int x=0;x<150;x++){
+            graphics.setColor(getRandomColor());
+            graphics.drawOval(RANDOM.nextInt(WIDTH),RANDOM.nextInt(HEIGHT),1,1);
+        }
+
+        graphics.dispose();
+        return image;
+    }
+
+    private static Color getRandomColor() {
+        int r = RANDOM.nextInt(256);
+        int g = RANDOM.nextInt(256);
+        int b = RANDOM.nextInt(256);
+        return new Color(r,g,b);
+    }
+}

mainFactory/src/main/java/org/bfkj/utils/MapTools.java

@@ -40,7 +40,11 @@ public class MapTools implements Serializable {
             return mapStrToObj(inStr, null);
         }
     }
-
+//
+//    public static void main(String[] args) {
+//        String xx = "{\"code\":200,\"success\":true,\"errorInfo\":\"default success info\",\"AAA\":[{\"messageType\":\"bpm报文\",\"message\":\"BPM\\n{\\\"meta\\\":{\\\"id\\\":\\\"JF03350431732\\\",\\\"type\\\":\\\"node\\\",\\\"st\\\":\\\"2023-05-16\\n17:16:32\\\"},\\\"data\\\":{\\\"code1\\\":\\\"3784602834\\\",\\\"terminal\\\":\\\"T2\\\",\\\"chute\\\":\\\"MU10\\\",\\\"flt\\\":\\\"CZ6738\\\",\\\"ftd\\\":\\\"2023-05-16\\\",\\\"n\\\":\\\"JD03\\\",\\\"t\\\":\\\"2023-05-16\\n17:16:09\\\"}}\\nENDBPM\",\"messageTime\":null,\"uuid\":\"1658401186878423042\"}]}";
+//        System.out.println(strToObj(xx.toString()));
+//    }
 
     private static Object mapStrToObj(String inMapStr, List<Object> itemMapList, String... strType) {//
         String beginChar = strType.length == 0 ? "{" : "[";//为了递归数组准备

mainFactory/src/main/java/org/bfkj/utils/MyDbHelper.java

@@ -70,9 +70,6 @@ public class MyDbHelper {//目前只差主键的条件优化
         }
         config.setJdbcUrl(connectMaps.get("url").toString());
         config.setDriverClassName(connectMaps.get("driver-class-name").toString());
-
-        config.setPoolName("");
-
         theDataSource = new HikariDataSource(config);
         theJdbcTemplate = new JdbcTemplate(theDataSource);
         try (Connection theConnect = theDataSource.getConnection();//用于批量新增以及获取当前数据库的相关信息

mainFactory/src/main/resources/static/config.js

@@ -12,14 +12,23 @@ window.SERVICE_ID = {
   getAppId: 18133, //获取应用列表
   roleListId: 10024, //角色列表
   userListId: 10026, //用户管理列表
-  userAuthorizationId: 10027, //用户授权
+  userAuthorizationId: 200228, //用户授权
+  userGroupAuthorizationId: 10027, //用户组授权
   depTableId: 185, //机器维护-表头
   serTableId: 203, //服务设置-表头
   bagTableId: 20030, //行李详情-表头
   bagDetailId: 20027, //行李详情-表格
   bagViewId: 20036, //航班视图-基础信息
   changePwd: 20045, // 修改密码
-  
+  userColAuthId: 200227, //用户授权-列设置
+  containerId: 200238, //容器历史记录-容器历史
+
+  /***-----首页------***/
+  dashboardHourData: 200246, // 首页-小时行李处理量
+  dashboardDateData: 200247, // 首页-当日航班和行李数量
+  dashboardMap: 200248, // 首页-行李分布
+  dashboardCompanyData: 200249, // 首页-航司行李量排行
+
   /***-----高级查询------***/
   baggageTypeId: 86, //高级查询-特殊行李类型下拉选项查询-id
   advancedQueryId: 30, //高级查询-数据查询-id
@@ -82,6 +91,9 @@ window.SERVICE_ID = {
   termSeleid: 1156, //航站选择下拉
   areaOptions: 1807, // 大区/基地分公司下拉
   AirportId: 1808, // 航站下拉
+  AirportIds: 12004, // 航站下拉2.0
+  AirlineIds: 12005, // 航线下拉2.0
+  AirlinportId: 12003, // 航司下拉
   TerminalId: 1809, // 航站楼下拉
   byOther: 1810, // 大区/分公司以外航班统计（全部）
   byArea: 1811, // 根据大区/分公司航班统计（全部）
@@ -135,5 +147,629 @@ window.SERVICE_ID = {
 
   /***-----速运行李------***/
   expressTransportationUpload: 20034, // 速运行李数据上传
-  expressTransportation: 1803432, // 速运行李数据查询
+  expressTransportation: 1803435, // 速运行李数据查询
+  expressTransportationNum: 1803436, // 速运行李次数查询
+  expressTransportationFail: 1803437, // 速运行李数据查询-失败
+
+  /***-----新统计图------***/
+  LuggageInId: 12001, // 行李进港数量
+  LuggagecId: 12002, // 航司行李量数量 && // 航线行李量数量
+  LuggageHourId: 200246, // 行李小时量
+  LuggageNodeId: 200245, // 节点位置
+}
+
+window.AIRPORT_ID = {
+  EN: '101',
+  EW: '104',
+  AY: '105',
+  BW: '106',
+  FI: '108',
+  '7Q': '110',
+  U1: '111',
+  CK: '112',
+  GW: '113',
+  LY: '114',
+  JU: '115',
+  SK: '117',
+  DT: '118',
+  '8K': '119',
+  JS: '120',
+  ON: '123',
+  AH: '124',
+  BA: '125',
+  GA: '126',
+  G3: '127',
+  UO: '128',
+  MP: '129',
+  JL: '131',
+  MX: '132',
+  LR: '133',
+  AV: '134',
+  VT: '135',
+  CU: '136',
+  AM: '139',
+  LI: '140',
+  FZ: '141',
+  KF: '142',
+  AU: '143',
+  '7T': '144',
+  UC: '145',
+  XK: '146',
+  AT: '147',
+  LN: '148',
+  LG: '149',
+  UG: '150',
+  R5: '151',
+  VH: '152',
+  BU: '154',
+  ES: '155',
+  '2I': '156',
+  QR: '157',
+  CX: '160',
+  MN: '161',
+  '7L': '164',
+  JP: '165',
+  IK: '166',
+  QM: '167',
+  UM: '168',
+  HR: '169',
+  GE: '170',
+  GT: '171',
+  CV: '172',
+  HA: '173',
+  II: '175',
+  EK: '176',
+  OR: '178',
+  '7A': '179',
+  KE: '180',
+  Z6: '181',
+  MA: '182',
+  SW: '186',
+  DW: '187',
+  K6: '188',
+  JI: '189',
+  IG: '191',
+  PY: '192',
+  IE: '193',
+  FV: '195',
+  TC: '197',
+  TU: '199',
+  SD: '200',
+  JM: '201',
+  TA: '202',
+  '5J': '203',
+  NH: '205',
+  B3: '208',
+  UB: '209',
+  '4B': '210',
+  '2P': '211',
+  '5W': '212',
+  PK: '214',
+  TG: '217',
+  NF: '218',
+  YN: '219',
+  LH: '220',
+  AL: '221',
+  HN: '225',
+  KU: '229',
+  CM: '230',
+  NG: '231',
+  MH: '232',
+  TK: '235',
+  BD: '236',
+  IZ: '238',
+  MK: '239',
+  GU: '240',
+  K8: '241',
+  TN: '244',
+  '7F': '245',
+  O6: '247',
+  HY: '250',
+  FG: '255',
+  RD: '256',
+  OS: '257',
+  MD: '258',
+  FN: '259',
+  FJ: '260',
+  I5: '261',
+  U6: '262',
+  EF: '265',
+  LT: '266',
+  BE: '267',
+  EQ: '269',
+  W7: '271',
+  K4: '272',
+  GK: '274',
+  '5L': '275',
+  XF: '277',
+  B6: '279',
+  RO: '281',
+  EC: '284',
+  RA: '285',
+  PU: '286',
+  '4N': '287',
+  LD: '288',
+  OM: '289',
+  BF: '290',
+  WG: '292',
+  WM: '295',
+  CD: '296',
+  CI: '297',
+  UT: '298',
+  '5S': '301',
+  OO: '302',
+  ZW: '303',
+  C2: '304',
+  WE: '307',
+  V0: '308',
+  WZ: '309',
+  '2T': '311',
+  IP: '312',
+  '2S': '315',
+  '5N': '316',
+  '3A': '317',
+  CC: '318',
+  '8D': '319',
+  SC: '324',
+  AQ: '327',
+  DY: '328',
+  RF: '330',
+  S4: '331',
+  FL: '332',
+  MM: '334',
+  SY: '337',
+  ZD: '338',
+  KS: '339',
+  KO: '341',
+  YQ: '342',
+  L2: '344',
+  NC: '345',
+  WP: '347',
+  EE: '350',
+  A7: '352',
+  NU: '353',
+  E7: '355',
+  '3T': '359',
+  Y7: '362',
+  RP: '363',
+  TZ: '366',
+  IN: '367',
+  '0V': '368',
+  '5Y': '369',
+  RZ: '372',
+  NB: '373',
+  '3K': '375',
+  HC: '377',
+  KX: '378',
+  LZ: '379',
+  Q6: '381',
+  T9: '382',
+  RQ: '384',
+  MY: '386',
+  Z4: '389',
+  A3: '390',
+  Q3: '391',
+  '8G': '395',
+  G6: '397',
+  YR: '398',
+  HP: '401',
+  J0: '402',
+  PO: '403',
+  JW: '404',
+  '5X': '406',
+  V7: '407',
+  '4V': '408',
+  YM: '409',
+  ZR: '410',
+  '3G': '411',
+  VI: '412',
+  AX: '414',
+  N8: '416',
+  E6: '417',
+  R9: '418',
+  CF: '419',
+  GI: '420',
+  S7: '421',
+  F9: '422',
+  ER: '423',
+  YD: '425',
+  '9L': '426',
+  TX: '427',
+  '9E': '430',
+  ZA: '433',
+  L6: '434',
+  '3X': '435',
+  KJ: '436',
+  '5A': '437',
+  ZI: '439',
+  OF: '442',
+  GO: '444',
+  F5: '447',
+  '3M': '449',
+  YX: '453',
+  NA: '455',
+  I7: '456',
+  WB: '459',
+  EB: '460',
+  '7W': '461',
+  XL: '462',
+  ZP: '463',
+  KC: '465',
+  '3H': '466',
+  '4M': '469',
+  ZV: '471',
+  SE: '473',
+  UI: '475',
+  XE: '477',
+  R6: '478',
+  ZH: '479',
+  QX: '481',
+  '3W': '482',
+  '8V': '485',
+  NK: '487',
+  W8: '489',
+  WI: '490',
+  B9: '491',
+  '9H': '493',
+  EZ: '494',
+  E3: '497',
+  '7B': '499',
+  Q8: '505',
+  WC: '506',
+  QJ: '508',
+  JF: '510',
+  RJ: '512',
+  '7G': '513',
+  G9: '514',
+  '2F': '517',
+  '5T': '518',
+  FE: '519',
+  '3R': '520',
+  '1P': '523',
+  XM: '524',
+  B7: '525',
+  WN: '526',
+  A2: '529',
+  T0: '530',
+  YV: '533',
+  WQ: '534',
+  S9: '535',
+  GV: '536',
+  W5: '537',
+  TH: '539',
+  '5H': '540',
+  '5Z': '541',
+  '9Q': '543',
+  LP: '544',
+  X8: '545',
+  '8U': '546',
+  '2K': '547',
+  M3: '549',
+  BL: '550',
+  FC: '553',
+  SU: '555',
+  O8: '558',
+  H8: '560',
+  XQ: '564',
+  PS: '566',
+  CE: '567',
+  LW: '568',
+  FO: '569',
+  '9U': '572',
+  G7: '573',
+  '4W': '574',
+  '7C': '575',
+  OX: '578',
+  '4G': '579',
+  RU: '580',
+  XJ: '582',
+  '9W': '589',
+  HW: '590',
+  GX: '591',
+  ZN: '595',
+  CS: '596',
+  '4I': '597',
+  HZ: '598',
+  '8M': '599',
+  BB: '600',
+  UL: '603',
+  UY: '604',
+  H2: '605',
+  A9: '606',
+  EY: '607',
+  XR: '608',
+  KK: '610',
+  JB: '613',
+  IQ: '614',
+  QY: '615',
+  HF: '617',
+  SQ: '618',
+  BZ: '620',
+  MZ: '621',
+  MO: '622',
+  FB: '623',
+  H9: '624',
+  D6: '625',
+  CG: '626',
+  QV: '627',
+  B2: '628',
+  MI: '629',
+  DK: '630',
+  GL: '631',
+  JV: '632',
+  IY: '635',
+  BP: '636',
+  B8: '637',
+  PJ: '638',
+  LV: '639',
+  FA: '640',
+  '5D': '642',
+  KM: '643',
+  '4S': '644',
+  '6P': '645',
+  E0: '646',
+  QI: '647',
+  TS: '649',
+  '6T': '654',
+  DV: '655',
+  PX: '656',
+  BT: '657',
+  M8: '658',
+  J4: '660',
+  '6G': '661',
+  EO: '663',
+  HQ: '668',
+  U8: '669',
+  UN: '670',
+  BI: '672',
+  NX: '675',
+  PC: '677',
+  G0: '678',
+  JK: '680',
+  CL: '683',
+  NI: '685',
+  WX: '689',
+  '8A': '691',
+  PZ: '692',
+  JX: '693',
+  YW: '694',
+  BR: '695',
+  VR: '696',
+  '5C': '700',
+  WF: '701',
+  NO: '703',
+  OL: '704',
+  S2: '705',
+  KQ: '706',
+  JO: '708',
+  K5: '710',
+  S6: '712',
+  RH: '713',
+  MB: '716',
+  F2: '720',
+  YL: '722',
+  QA: '723',
+  LX: '724',
+  W3: '725',
+  VZ: '727',
+  QT: '729',
+  MF: '731',
+  C7: '732',
+  D9: '733',
+  VO: '734',
+  SP: '737',
+  VN: '738',
+  NL: '740',
+  XN: '743',
+  '8T': '744',
+  AB: '745',
+  '3N': '746',
+  YO: '747',
+  DU: '748',
+  '4Z': '749',
+  DB: '750',
+  D4: '751',
+  JZ: '752',
+  LC: '753',
+  BY: '754',
+  '3V': '756',
+  Z3: '757',
+  UU: '760',
+  '7U': '765',
+  RC: '767',
+  EL: '768',
+  UE: '770',
+  J2: '771',
+  V6: '772',
+  FM: '774',
+  CW: '778',
+  Y9: '780',
+  MU: '781',
+  QL: '782',
+  CZ: '784',
+  RT: '785',
+  VK: '786',
+  KB: '787',
+  MG: '791',
+  VA: '795',
+  KR: '798',
+  GD: '800',
+  '8S': '802',
+  AE: '803',
+  '8Y': '804',
+  '4X': '805',
+  '7H': '808',
+  M6: '810',
+  EU: '811',
+  JN: '812',
+  EP: '815',
+  '9P': '816',
+  MJ: '817',
+  '5R': '820',
+  '6K': '821',
+  NN: '823',
+  '9M': '824',
+  F4: '825',
+  GS: '826',
+  PG: '829',
+  OU: '831',
+  GB: '832',
+  RK: '833',
+  NS: '836',
+  E2: '837',
+  WS: '838',
+  RM: '839',
+  '0P': '840',
+  C5: '841',
+  '5M': '842',
+  P5: '845',
+  ZK: '846',
+  PN: '847',
+  R3: '849',
+  HX: '851',
+  KG: '854',
+  DJ: '856',
+  LM: '857',
+  FK: '858',
+  '2M': '860',
+  HK: '861',
+  EV: '862',
+  M7: '865',
+  V8: '868',
+  VV: '870',
+  Y8: '871',
+  CH: '872',
+  '6R': '873',
+  TE: '874',
+  '3U': '876',
+  OQ: '878',
+  RV: '879',
+  HU: '880',
+  DE: '881',
+  NY: '882',
+  '8C': '883',
+  '5G': '884',
+  OH: '886',
+  ZG: '887',
+  QQ: '888',
+  GJ: '891',
+  DZ: '893',
+  BQ: '894',
+  CN: '895',
+  VF: '896',
+  '7D': '897',
+  JD: '898',
+  ZL: '899',
+  FD: '900',
+  '4D': '903',
+  E5: '906',
+  QN: '907',
+  OG: '908',
+  WY: '910',
+  QW: '912',
+  AJ: '914',
+  SS: '923',
+  GR: '924',
+  U7: '926',
+  UZ: '928',
+  VS: '932',
+  KZ: '933',
+  TL: '935',
+  '9N': '938',
+  VW: '942',
+  DI: '944',
+  WK: '945',
+  V4: '946',
+  L3: '947',
+  LS: '949',
+  '6B': '951',
+  JJ: '957',
+  '7I': '958',
+  LE: '959',
+  OV: '960',
+  U9: '966',
+  PB: '967',
+  LU: '972',
+  ZB: '974',
+  HV: '979',
+  VD: '981',
+  QK: '983',
+  VX: '984',
+  G5: '987',
+  OZ: '988',
+  IJ: '989',
+  D3: '991',
+  JA: '995',
+  UX: '996',
+  BG: '997',
+  CA: '999',
+  XH: '000',
+  AA: '001',
+  '2G': '002',
+  CP: '003',
+  BV: '004',
+  CO: '005',
+  DL: '006',
+  '1C': '007',
+  Z5: '009',
+  M9: '011',
+  NW: '012',
+  AC: '014',
+  UA: '016',
+  HO: '018',
+  FX: '023',
+  AS: '027',
+  '3Z': '029',
+  F7: '033',
+  GC: '034',
+  US: '037',
+  TQ: '038',
+  K9: '040',
+  RG: '042',
+  KA: '043',
+  AR: '044',
+  LA: '045',
+  TP: '047',
+  CY: '048',
+  OA: '050',
+  '4U': '051',
+  EI: '053',
+  WL: '054',
+  AP: '055',
+  YK: '056',
+  AF: '057',
+  IC: '058',
+  DF: '059',
+  HM: '061',
+  '5V': '062',
+  SB: '063',
+  OK: '064',
+  SV: '065',
+  '8Q': '066',
+  I9: '067',
+  TM: '068',
+  RB: '070',
+  ET: '071',
+  GF: '072',
+  IA: '073',
+  KL: '074',
+  IB: '075',
+  ME: '076',
+  MS: '077',
+  PR: '079',
+  LO: '080',
+  QF: '081',
+  SN: '082',
+  SA: '083',
+  FT: '084',
+  NZ: '086',
+  IT: '090',
+  DP: '091',
+  MT: '092',
+  KD: '093',
+  C4: '094',
+  '6A': '095',
+  IR: '096',
+  AI: '098',
+  '9S': '099'
 }

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

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta http-equiv=Content-Security-Policy content="script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline'"><meta http-equiv=X-XSS-Protection content="1;mode=block"><meta http-equiv=X-Content-Type-Options content=nosniff><link rel=icon href=favicon.ico><title>Vue3 Admin Ts</title><script src=staticConfig.js></script><script id=configJS src=config.js></script><link href=static/css/app.494c078c.css rel=preload as=style><link href=static/css/chunk-elementUI.0ae24586.css rel=preload as=style><link href=static/css/chunk-libs.bef63a38.css rel=preload as=style><link href=static/js/app.a362bc3f.js rel=preload as=script><link href=static/js/chunk-elementUI.e94dd283.js rel=preload as=script><link href=static/js/chunk-libs.28228a50.js rel=preload as=script><link href=static/css/chunk-elementUI.0ae24586.css rel=stylesheet><link href=static/css/chunk-libs.bef63a38.css rel=stylesheet><link href=static/css/app.494c078c.css rel=stylesheet></head><body><div id=app></div><script src=static/js/runtime.f9f8cc74.js></script><script src=static/js/chunk-elementUI.e94dd283.js></script><script src=static/js/chunk-libs.28228a50.js></script><script src=static/js/app.a362bc3f.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta http-equiv=Content-Security-Policy content="script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline'"><meta http-equiv=X-XSS-Protection content="1;mode=block"><meta http-equiv=X-Content-Type-Options content=nosniff><link rel=icon href=favicon.ico><title>行李全流程跟踪数据系统</title><script src=staticConfig.js></script><script id=configJS src=config.js></script><link href=static/css/app.f1155e8e.css rel=preload as=style><link href=static/css/chunk-elementUI.7091c052.css rel=preload as=style><link href=static/css/chunk-libs.bef63a38.css rel=preload as=style><link href=static/js/app.957cd269.js rel=preload as=script><link href=static/js/chunk-elementUI.47b91bbb.js rel=preload as=script><link href=static/js/chunk-libs.aee8fc35.js rel=preload as=script><link href=static/css/chunk-elementUI.7091c052.css rel=stylesheet><link href=static/css/chunk-libs.bef63a38.css rel=stylesheet><link href=static/css/app.f1155e8e.css rel=stylesheet></head><body><div id=app></div><script src=static/js/runtime.28cf03d5.js></script><script src=static/js/chunk-elementUI.47b91bbb.js></script><script src=static/js/chunk-libs.aee8fc35.js></script><script src=static/js/app.957cd269.js></script></body></html>

mainFactory/src/main/resources/static/staticConfig.js

@@ -6,9 +6,11 @@ window.PLATFROM_CONFIG = {
   appId: 'q7kdjmmaf0kerwpf', //appid
   baggageMessageURL: '/openApi/query',
   getBase64: 'http://10.211.67.163:8083/getBase64',
+  editRule: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[`!@#$%^&*()_+{}":?><`,./';=-])[\da-zA-Z`!@#$%^&*()_+{}":?><`,./';=-]{8,}$/
 }
 
 const baseNewUrl = window.location.hostname
+// const baseNewUrl = '10.211.67.177'
 switch (baseNewUrl) {
   case '10.211.66.23':
     PLATFROM_CONFIG = {
@@ -24,21 +26,36 @@ switch (baseNewUrl) {
       hasStaticRoutes: true,
     }
     break
+  case '10.211.67.177':
+    PLATFROM_CONFIG = {
+      ...PLATFROM_CONFIG,
+      baseNewUrl: 'http://10.211.67.177:8043',
+      baseURLCA: 'http://10.211.67.177:8043',
+      fileUrl: 'http://10.211.67.177:8043',
+      expressUrl: 'http://10.211.67.177:8043',
+      tempUrl: 'http://10.211.67.177:8043', // 1.0临时地址
+      tempToken: 'bb1bcfcb336b40e9b8602e808b053c3b', // 1.0临时token
+      tempUserId: '1656481036109',
+      tempAppToken: '2ecbda35d72c4ae89294464629f29f35',
+      hasStaticRoutes: true,
+    }
+    break
   case '10.199.7.20':
     PLATFROM_CONFIG = {
       ...PLATFROM_CONFIG,
       baseNewUrl: 'http://10.199.7.20:8083',
       baseURLCA: 'http://10.199.7.20:8083',
+      hasStaticRoutes: true,
     }
     break
   case 'localhost':
     PLATFROM_CONFIG = {
       ...PLATFROM_CONFIG,
-      baseNewUrl: 'http://localhost:18400',
-      baseURLCA: 'http://localhost:18400',
-      fileUrl: 'http://localhost:18400',
-      expressUrl: 'http://localhost:8043',
-      tempUrl: 'http://localhost:16300', // 1.0临时地址
+      baseNewUrl: 'http://10.211.66.23:8082',
+      baseURLCA: 'http://10.211.66.23:8082',
+      fileUrl: 'http://10.211.66.23:8082',
+      expressUrl: 'http://10.211.67.177:8043',
+      tempUrl: 'http://10.211.67.163:16300', // 1.0临时地址
       tempToken: 'bb1bcfcb336b40e9b8602e808b053c3b', // 1.0临时token
       tempUserId: '1656481036109',
       tempAppToken: '2ecbda35d72c4ae89294464629f29f35',