Merge branch 'master' of http://116.63.33.55/git/dt2

spring-cloud/configer/src/main/resources/config/dev/basic-dev.yml

@@ -27,4 +27,8 @@ mybatis:
 
 web:
   file: D:/files
-  rootPath: uploadFiles
+  rootPath: uploadFiles
+
+contrl:
+  # 设置连接超时，单位：毫秒
+  connection-timeout: 5000

spring-cloud/configer/src/main/resources/config/dev/gateway-dev.yml

@@ -87,7 +87,7 @@ filter:
     /AttackEvent/getAttackEventByInfo,/AttackType/getAttackTypeByMonth,/SystemAttacked/getSystemAttackedByInfo,/businessSystem/getSystemInfoByVoiceKeyword,\
     /safetyInfor/getWebSafetyStatusByOrg,/OfficeVirus/getOfficeSafetyInfo,/GuaranteeGroup/getAllGuaranteeGroup,/monitoringResources/getMonitorListByName,/monitoringResources/creatRelay,\
     /monitoringResources/closeAllRelay,/monitoringResources/getStreamForKaiKang,/SystemRisk/GetSystemRiskList,/SystemRisk/getSysInfoByOffice,/flat/door/personRegister,/flat/sendMessage,/businessSystem/getSystemInfoByShow,\
-    /commandTranscription/insertCommandTranscription"
+    /commandTranscription/insertCommandTranscription,/safetyInfor/analysisWebSafetyInfo,/safetyInfor/analysisSafetyStatus"
 
   # 不需要过参数过滤器的uri
   parameter:
@@ -100,7 +100,8 @@ filter:
     /safetyInfor/getRiskInfoByOrg,/safetyInfor/getSysStatusByOrg,/SystemRisk/getHighStatus,/SystemRisk/getHighStatusByMonth,\
     /AttackEvent/getAttackEventByInfo,/AttackType/getAttackTypeByMonth,/SystemAttacked/getSystemAttackedByInfo,/businessSystem/getSystemInfoByVoiceKeyword,\
     /safetyInfor/getWebSafetyStatusByOrg,/OfficeVirus/getOfficeSafetyInfo,/GuaranteeGroup/getAllGuaranteeGroup,/monitoringResources/getMonitorListByName,/monitoringResources/creatRelay,/monitoringResources/closeAllRelay,\
-    /SystemRisk/GetSystemRiskList,/SystemRisk/getSysInfoByOffice,/monitoringResources/getStreamForKaiKang,/businessSystem/getSystemInfoByShow"
+    /SystemRisk/GetSystemRiskList,/SystemRisk/getSysInfoByOffice,/monitoringResources/getStreamForKaiKang,/businessSystem/getSystemInfoByShow,\
+    /safetyInfor/analysisWebSafetyInfo,/safetyInfor/analysisSafetyStatus"
 
   # 不需要过返回封装过滤器的uri
   response:
@@ -114,7 +115,7 @@ filter:
     /AttackEvent/getAttackEventByInfo,/AttackType/getAttackTypeByMonth,/SystemAttacked/getSystemAttackedByInfo,/businessSystem/getSystemInfoByVoiceKeyword,\
     /safetyInfor/getWebSafetyStatusByOrg,/OfficeVirus/getOfficeSafetyInfo,/GuaranteeGroup/getAllGuaranteeGroup,/monitoringResources/getMonitorListByName,/monitoringResources/creatRelay,/monitoringResources/closeAllRelay,\
     /SystemRisk/GetSystemRiskList,/SystemRisk/getSysInfoByOffice,/monitoringResources/getStreamForKaiKang,/flat/door/personRegister,/flat/sendMessage,/businessSystem/getSystemInfoByShow,\
-    /commandTranscription/insertCommandTranscription"
+    /commandTranscription/insertCommandTranscription,/safetyInfor/analysisWebSafetyInfo,/safetyInfor/analysisSafetyStatus"
 
   # 登录接口
   login:

spring-cloud/configer/src/main/resources/config/prod/basic-prod.yml

@@ -26,4 +26,8 @@ mybatis:
 
 web:
   file: D:/files
-  rootPath: uploadFiles
+  rootPath: uploadFiles
+
+contrl:
+  # 设置连接超时，单位：毫秒
+  connection-timeout: 5000

spring-cloud/configer/src/main/resources/config/prod/gateway-prod.yml

@@ -86,7 +86,8 @@ filter:
     /safetyInfor/getRiskInfoByOrg,/safetyInfor/getSysStatusByOrg,/SystemRisk/getHighStatus,/SystemRisk/getHighStatusByMonth,\
     /AttackEvent/getAttackEventByInfo,/AttackType/getAttackTypeByMonth,/SystemAttacked/getSystemAttackedByInfo,/businessSystem/getSystemInfoByVoiceKeyword,\
     /safetyInfor/getWebSafetyStatusByOrg,/OfficeVirus/getOfficeSafetyInfo,/GuaranteeGroup/getAllGuaranteeGroup,/monitoringResources/getMonitorListByName,/monitoringResources/creatRelay,\
-    /monitoringResources/closeAllRelay,/monitoringResources/getStreamForKaiKang,/SystemRisk/GetSystemRiskList,/SystemRisk/getSysInfoByOffice,/flat/door/personRegister,/flat/sendMessage,/businessSystem/getSystemInfoByShow"
+    /monitoringResources/closeAllRelay,/monitoringResources/getStreamForKaiKang,/SystemRisk/GetSystemRiskList,/SystemRisk/getSysInfoByOffice,/flat/door/personRegister,/flat/sendMessage,/businessSystem/getSystemInfoByShow,\
+    /safetyInfor/analysisWebSafetyInfo,/safetyInfor/analysisSafetyStatus"
 
   # 不需要过参数过滤器的uri
   parameter:
@@ -99,7 +100,8 @@ filter:
     /safetyInfor/getRiskInfoByOrg,/safetyInfor/getSysStatusByOrg,/SystemRisk/getHighStatus,/SystemRisk/getHighStatusByMonth,\
     /AttackEvent/getAttackEventByInfo,/AttackType/getAttackTypeByMonth,/SystemAttacked/getSystemAttackedByInfo,/businessSystem/getSystemInfoByVoiceKeyword,\
     /safetyInfor/getWebSafetyStatusByOrg,/OfficeVirus/getOfficeSafetyInfo,/GuaranteeGroup/getAllGuaranteeGroup,/monitoringResources/getMonitorListByName,/monitoringResources/creatRelay,/monitoringResources/closeAllRelay,\
-    /SystemRisk/GetSystemRiskList,/SystemRisk/getSysInfoByOffice,/monitoringResources/getStreamForKaiKang,/businessSystem/getSystemInfoByShow"
+    /SystemRisk/GetSystemRiskList,/SystemRisk/getSysInfoByOffice,/monitoringResources/getStreamForKaiKang,/businessSystem/getSystemInfoByShow,/safetyInfor/analysisWebSafetyInfo,\
+    /safetyInfor/analysisSafetyStatus"
 
   # 不需要过返回封装过滤器的uri
   response:
@@ -112,7 +114,8 @@ filter:
     /safetyInfor/getRiskInfoByOrg,/safetyInfor/getSysStatusByOrg,/SystemRisk/getHighStatus,/SystemRisk/getHighStatusByMonth,\
     /AttackEvent/getAttackEventByInfo,/AttackType/getAttackTypeByMonth,/SystemAttacked/getSystemAttackedByInfo,/businessSystem/getSystemInfoByVoiceKeyword,\
     /safetyInfor/getWebSafetyStatusByOrg,/OfficeVirus/getOfficeSafetyInfo,/GuaranteeGroup/getAllGuaranteeGroup,/monitoringResources/getMonitorListByName,/monitoringResources/creatRelay,/monitoringResources/closeAllRelay,\
-    /SystemRisk/GetSystemRiskList,/SystemRisk/getSysInfoByOffice,/monitoringResources/getStreamForKaiKang,/flat/door/personRegister,/flat/sendMessage,/businessSystem/getSystemInfoByShow"
+    /SystemRisk/GetSystemRiskList,/SystemRisk/getSysInfoByOffice,/monitoringResources/getStreamForKaiKang,/flat/door/personRegister,/flat/sendMessage,/businessSystem/getSystemInfoByShow,/safetyInfor/analysisWebSafetyInfo,\
+    /safetyInfor/analysisSafetyStatus"
   # 登录接口
   login:
     skip-uri: /user/userLogin,/flat/guide/login

spring-cloud/server-basic/src/main/java/com/jd/service/impl/SafetyInfoServiceImpl.java

@@ -281,8 +281,10 @@ public class SafetyInfoServiceImpl implements SafetyInfoService {
             }
         }
         ApiUrl apiUrl = new ApiUrl();
-        apiUrl.setUrlApi("https://23.37.0.200/api/security/incident/overview");
-
+        apiUrl.setUrlPrefix("https://23.37.0.200");
+        apiUrl.setUrlApi("/api/security/incident/overview");
+        apiUrl.setUrlMethod("GET");
+        apiUrl.setUrlParamType(1);
         String params = "{\"keyword\":\"\",\"startTime\":\"2022-04-10 17:05:00\"," +
                 "\"endTime\":\"2022-05-10 17:05:00\"}";
         //通过threeAPI调用第三方接口
@@ -292,15 +294,21 @@ public class SafetyInfoServiceImpl implements SafetyInfoService {
 
         Map<String, Object> attackMap = JSONObject.parseObject(parseObj.get("data").toString());
         //风险系数
-        Integer attackHighNum = Convert.toInt(attackMap.get("High").toString());
-        if(attackHighNum < riskFlag_1){
-            riskCoefficient = 1;
-        }else if (attackHighNum > riskFlag_1 && attackHighNum < riskFlag_2){
-            riskCoefficient = 2;
-        }else {
-            riskCoefficient = 3;
+        Integer attackHighNum = 0;
+        if(Blank.isNotEmpty(attackMap)){
+            if(Blank.isNotEmpty(attackMap.get("High"))){
+                attackHighNum = Convert.toInt(attackMap.get("High").toString());
+                if(attackHighNum < riskFlag_1){
+                    riskCoefficient = 1;
+                }else if (attackHighNum > riskFlag_1 && attackHighNum < riskFlag_2){
+                    riskCoefficient = 2;
+                }else {
+                    riskCoefficient = 3;
+                }
+            }
         }
 
+
         resultMap.put("safetyLevel", safetyLevel);
         resultMap.put("riskCoefficient", riskCoefficient);
         resultMap.put("highRiskNumber", highRiskNumber);

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test2/test2.css

@@ -28,7 +28,7 @@
   position: relative;
 }
 .visits .vis-top .left .vis h4 {
-  /* border-radius: 0.26rem; */
+  border-radius: 0.26rem;
   color: #fff;
   font-family: "RUIZIZHENYANTIMIANFEISHANGYONG-2";
   padding: 0.2rem;
@@ -51,7 +51,7 @@
 }
 .visits .vis-top .left .one h4 {
   left: 33%;
-  top: -14%;
+  top: -18%;
   font-size: 0.15rem !important;
 }
 .visits .vis-top .left .one p {
@@ -105,15 +105,14 @@
   height: 60%;
 }
 .text-title-one {
-  width: 20%;
-  height: 2%;
+  width: 10%;
+  height: 20%;
+  /* background: #ff8019; */
   background: rgba(200, 154, 54, 0.5);
 }
 .vis-img {
   position: absolute;
   /* left: 354%; */
   left: 34%;
-  top: 3%;
-  height: 11%;
   width: 5% !important;
 }

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test2/test2.html

@@ -16,7 +16,7 @@
         <div class="vis-top">
           <div class="left">
             <div class="one vis">
-              <img class="vis-img" src="../images/图层 789.png" alt="" />
+              <img class="vis-img" src="../../css/modules/layer/default/图层 789.png" alt="" />
               <h4 class="text-title-one">重庆动物园</h4>
               <p>01</p>
             </div>

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test27/test27.js

@@ -34,7 +34,7 @@ const test27 = (function() {
     }
 
     $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/RiskType/getSysRiskType",
+        url: "http://23.37.100.87:8084" + "/basic/RiskType/getSysRiskType",
         data: {
             orgType: 1,
             riskClassify: 1

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test29/test29.js

@@ -24,7 +24,7 @@ const test29 = (function() {
         eventClick('.test29');
         // setCharts(`.test29 .floor-dist`);
         $.ajax({
-            url: "http://23.37.100.80:8084" + "/basic/AttackType/getAttackTypeBymonth",
+            url: "http://23.37.100.87:8084" + "/basic/AttackType/getAttackTypeBymonth",
             data: {
                 orgType: 1
             },

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test3/test3.css

@@ -49,5 +49,5 @@
 .details-num {
   font-size: 120px !important;
   font-family: "LESLIE";
-  color: rgb(58, 175, 184);
+  color: #5c96ff;
 }

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test3/test3.js

@@ -39,7 +39,7 @@ const test3 = (function() {
                     $('.test3 .box3 li').eq(4).find('.details p').eq(1).find('span').eq(0).find('sapn').html(dataObj.siteGardenCount); // 园林 -
                     $('.test3 .box3 li').eq(4).find('.details p').eq(1).find('span').eq(1).find('sapn').html(dataObj.siteFacilitiesCount); // 设施
                     $('.test3 .box3 li').eq(4).find('.details p').eq(1).find('span').eq(2).find('sapn').html(dataObj.siteSanitationCount); // 环卫
-
+                    // $('.test3 .box3 li').eq(4).find('.details p').eq(1).find('span').eq(3).find('sapn').html(dataObj.siteLightCount); // 现场照明
                     
                 },
                 error: function() {

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test34/test34 copy.js

@@ -21,7 +21,7 @@ const test34 = (function() {
 
 
         $.ajax({
-            url: "http://23.37.100.80:8084" + "/basic/RiskNews/getRiskNewsByInfo",
+            url: "http://23.37.100.87:8084" + "/basic/RiskNews/getRiskNewsByInfo",
             data: {},
             success: function(res) {
                 console.log('漏洞情报', res);

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test43/test43.js

@@ -293,7 +293,8 @@ const test43 = (function() {
                 detail: {
                     valueAnimation: true,
                     formatter: '{value} %',
-                    color: 'white'
+                    color: 'white',
+                    fontSize:100
                 },
                 data: [{
                     value: data

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test62/test62.css

@@ -65,8 +65,8 @@
   top: 16%;
 }
 .box62 .c-center5 {
-  left: 55%;
-  top: 36%;
+  left: 51%;
+  top: 39%;
 }
 .box62 .c-center6 {
   left: 40%;
@@ -84,103 +84,3 @@
   right: 11%;
   top: 15%;
 }
-
-/* svg */
-.svg-item {
-  position: relative;
-  z-index: 66;
-  left: 516%;
-  top: 2786px;
-  transform: scale(8.5);
-}
-
-svg {
-  width: 1540px;
-  height: 650px;
-}
-
-svg path {
-  stroke: #4ae3ff;
-  fill: none;
-  stroke-width: 3;
-}
-
-.rect {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 10px;
-  height: 10px;
-  background: transparent;
-}
-.rect::after {
-  height: 0px;
-  width: 0px;
-  /* background-color: aqua; */
-  position: absolute;
-  right: 0px;
-  top: -5px;
-  content: "";
-  border-top: 10px solid transparent;
-  border-right: 10px solid aqua;
-  border-bottom: 10px solid transparent;
-  transform: rotate(180deg);
-}
-
-.qxRect {
-  offset-path: path("M875 320, L 940 350");
-  offset-distance: 0%;
-  animation: svg-path-animation 5s ease-in-out 0s infinite normal;
-}
-
-.qxRect2 {
-  offset-path: path("M780 320, L 850 370, L 763 410");
-  offset-distance: 0%;
-  animation: svg-path-animation 5s ease-in-out 0s infinite normal;
-}
-
-.qxRect3 {
-  offset-path: path("M720 320, L 680 340, L 610 305, L 483 360");
-  offset-distance: 0%;
-  animation: svg-path-animation 5s ease-in-out 0s infinite normal;
-}
-
-.qxRect4 {
-  offset-path: path("M715 220, L 695 210, L 654 230");
-  offset-distance: 0%;
-  animation: svg-path-animation 5s ease-in-out 0s infinite normal;
-}
-
-.qxRect5 {
-  offset-path: path("M880 290, L 1020 245");
-  offset-distance: 0%;
-  animation: svg-path-animation 5s ease-in-out 0s infinite normal;
-}
-
-.qxRect6 {
-  offset-path: path("M240 300, L 150 230, L 220 210, L 140 150");
-  offset-distance: 0%;
-  animation: svg-path-animation 5s ease-in-out 0s infinite normal;
-}
-
-.qxRect7 {
-  offset-path: path(
-    "M155 40, L 600 40, L 630 10, L 900 10, L 930 40, L 1440 40"
-  );
-  offset-distance: 0%;
-  animation: svg-path-animation 5s ease-in-out 0s infinite normal;
-}
-.qxRect8 {
-  offset-path: path("M1370 180, L 1300 210, L 1350 230,L 1180 295");
-  offset-distance: 0%;
-  animation: svg-path-animation 5s ease-in-out 0s infinite normal;
-}
-@keyframes svg-path-animation {
-  from {
-    offset-distance: 0%;
-  }
-
-  to {
-    offset-distance: 100%;
-  }
-}

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test62/test62.html

@@ -6,14 +6,14 @@
   <div class="svg-contanier">
     <div class="svg-item">
       <svg>
-        <path d="M875 320, L 940 350" />
-        <path d="M780 320, L 850 370, L 763 410" />
-        <path d="M720 320, L 680 340, L 610 305, L 483 360" />
-        <path d="M715 220, L 695 210, L 654 230" />
-        <path d="M880 290, L 1020 245" />
-        <path d="M240 300, L 150 230, L 220 210, L 140 150" />
-        <path d="M155 40, L 600 40, L 630 10, L 900 10, L 930 40, L 1440 40" />
-        <path d="M1370 180, L 1300 210, L 1350 230,L 1180 295" />
+        <path d="M800 260, L 860 300, L 900 250,L 1000 300" />
+        <path d="M780 320, L 820 340, L 760 400" />
+        <path d="M700 240, L 600 280, L 630 305, L 530 350" />
+        <path d="M700 220, L 660 195, L 740 155" />
+        <path d="M750 220, L 900 220" />
+        <path d="M400 260, L 320 220, L 400 190, L 320 140" />
+        <path d="M280 60, L 600 60, L 630 30, L 900 30, L 930 60, L 1180 60" />
+        <path d="M1120 140, L 1060 190, L 1130 220" />
       </svg>
       <div class="rect qxRect"></div>
       <div class="rect qxRect2"></div>
@@ -22,7 +22,6 @@
       <div class="rect qxRect5"></div>
       <div class="rect qxRect6"></div>
       <div class="rect qxRect7"></div>
-      <div class="rect qxRect8"></div>
     </div>
   </div>
   <div class="test-box">
@@ -37,7 +36,7 @@
       </div>
       <div style="width: 5%;" class="c-left-img-two">
         <img src="../images/zybz/ybq拷贝2.png" alt="">
-        <p>远郊区县</p>
+        <p>郊区区县</p>
       </div>
       <div class="c-center1">
         <img src="../images/zybz/组240拷贝.png" alt="" style="width: 1660px" />
@@ -56,7 +55,7 @@
         <p>2号楼中心机房</p>
       </div>
       <div class="c-center5">
-        <img src="../images/zybz/icon_jifang拷贝3.png" alt="" style="width: 75%">
+        <img src="../images/zybz/icon_jifang拷贝3.png" alt="" style="width: 5%">
         <p>档案室库房</p>
       </div>
       <div class="c-center6">

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test7/test7.js

@@ -52,7 +52,7 @@ const test7 = (function () {
         // text: "请求数",
         textStyle: {
           fontWeight: "normal",
-          fontSize: 80,
+          fontSize: 30,
           color: "#F1F1F3",
         },
         left: "6%",
@@ -67,12 +67,11 @@ const test7 = (function () {
       },
       legend: {
         icon: "rect",
-        itemWidth: 140,
-        itemHeight: 50,
+        itemWidth: 14,
+        itemHeight: 5,
         itemGap: 13,
-        data: ["新闻动态", "信息公开"],
+        data: ["移动", "电信"],
         right: "4%",
-        top: "5%",
         textStyle: {
           fontSize: 80,
           color: "#fff",
@@ -93,12 +92,6 @@ const test7 = (function () {
               color: "#57617B",
             },
           },
-          axisLabel: {
-            margin: 20,
-            textStyle: {
-              fontSize: 80,
-            },
-          },
           data: [
             "13:00",
             "13:05",
@@ -124,7 +117,7 @@ const test7 = (function () {
             },
           },
           axisLabel: {
-            margin: 20,
+            margin: 10,
             textStyle: {
               fontSize: 80,
             },
@@ -138,7 +131,7 @@ const test7 = (function () {
       ],
       series: [
         {
-          name: "新闻动态",
+          name: "移动",
           type: "line",
           smooth: true,
           symbol: "circle",
@@ -195,7 +188,7 @@ const test7 = (function () {
           data: [220, 182, 191, 134, 150, 120, 110, 125],
         },
         {
-          name: "信息公开",
+          name: "电信",
           type: "line",
           smooth: true,
           symbol: "circle",
@@ -204,7 +197,7 @@ const test7 = (function () {
           lineStyle: {
             normal: {
               width: 10,
-              top: 100,
+              top:100
             },
           },
           areaStyle: {

spring-cloud/server-page/src/main/resources/static/testEcharts/test/js/common.js

@@ -1,17 +1,17 @@
-let baseURL = 'http://23.37.100.80:8088/itsm/openInterface'; // 资源保障管理专题（运维）
+let baseURL = 'http://23.37.100.87:8088/itsm/openInterface'; // 资源保障管理专题（运维）
 
 
-const FLAT_PATH_THREE = "http://23.37.100.80:8084/threeapi";
+const FLAT_PATH_THREE = "http://23.37.100.87:8084/threeapi";
 
-const ZQURL = 'http://23.37.100.80:8181/InterfaceController.asmx'; // 站群
-const imgURL = 'http://23.37.100.80:8182'; // 站群
+const ZQURL = 'http://23.37.100.87:8181/InterfaceController.asmx'; // 站群
+const imgURL = 'http://23.37.100.87:8182'; // 站群
 
-// const FLAT_PATH_THREE = "http://23.37.100.80:8084/threeapi"
-// 23.37.100.80
+// const FLAT_PATH_THREE = "http://23.37.100.87:8084/threeapi"
+// 23.37.100.87
 // 机房 - DH
-const ROOM = 'http://23.37.100.80:7002';
-// const DH = 'http://23.37.100.80:8084/threeapi/';
-const DH = 'http://23.37.100.80:8084/imcp-api/';
+const ROOM = 'http://23.37.100.87:7002';
+// const DH = 'http://23.37.100.87:8084/threeapi/';
+const DH = 'http://23.37.100.87:8084/imcp-api/';
 
 function getDateString(date) {
     const dt = new Date(date)

spring-cloud/server-page/src/main/resources/static/testEcharts/test/main/js/common.js

@@ -1,7 +1,7 @@
 const basicUrl = 'http://23.37.100.87:8084/basic';
 // const basicUrl = "http://192.168.0.100:8084/basic";
 
-// http://23.37.100.80:8084
+// http://23.37.100.87:8084
 
 let pages = [];
 let themeId; // 主题id

spring-cloud/server-page/src/main/resources/static/testEcharts/test/main/springFrame1.html

@@ -339,7 +339,7 @@
   // 数据统计
   function sp1Ajax11() {
     $.ajax({
-    url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
+    url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
     data: {
       orgType: 3
     },
@@ -363,7 +363,7 @@
   // 局本级门户网站
   function sp1Ajax12() {
     $.ajax({
-      url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getWebSafetyStatusByOrg",
+      url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getWebSafetyStatusByOrg",
       data: {
         orgType: 3
       },
@@ -418,7 +418,7 @@
   // 终端安全态势
   function sp1Ajax14() {
     $.ajax({
-      url: "http://23.37.100.80:8084" + "/basic/OfficeVirus/getOfficeSafetyInfo",
+      url: "http://23.37.100.87:8084" + "/basic/OfficeVirus/getOfficeSafetyInfo",
       data: {
         orgType: 3
       },
@@ -455,7 +455,7 @@
   let sp1flag = false;
   function sp1Ajax15() {
     $.ajax({
-      url: "http://23.37.100.80:8084" + "/basic/AttackType/getTopAttackType",
+      url: "http://23.37.100.87:8084" + "/basic/AttackType/getTopAttackType",
       data: {
         orgType: 3
       },
@@ -491,7 +491,7 @@
   // 应急保障组成员信息
   function sp1Ajax17() {
     $.ajax({
-      url: "http://23.37.100.80:8084" + "/basic/GuaranteeGroup/getAllGuaranteeGroup",
+      url: "http://23.37.100.87:8084" + "/basic/GuaranteeGroup/getAllGuaranteeGroup",
       success: function (res) {
         const result = res.result;
         console.log('应急保障组成员信息', result);

spring-cloud/server-page/src/main/resources/static/testEcharts/test/main/springFrame3.html

@@ -371,7 +371,7 @@
     // 数据统计
     function sp3Ajax18() {
       $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
+        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
         data: {
             orgType: 2
         },
@@ -390,7 +390,7 @@
 
 function sp3Ajax19() {
   $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getRiskInfoByOrg",
+        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getRiskInfoByOrg",
         data: {
             orgType: 2
         },
@@ -440,7 +440,7 @@ function sp3Ajax19() {
     //  漏洞趋势
     function myAjax1() {
         $.ajax({
-            url: "http://23.37.100.80:8084" +
+            url: "http://23.37.100.87:8084" +
                 "/basic/SystemRisk/analyzeSystemRiskByMonth",
             data: {},
             success: function(res) {
@@ -462,7 +462,7 @@ function sp3Ajax19() {
     //   业务系统
 function sp3Ajax21() {
   $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getSysStatusByOrg",
+        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSysStatusByOrg",
         data: {
             orgType: 2
         },
@@ -484,7 +484,7 @@ function sp3Ajax21() {
     let flag22 = false;
     function sp3Ajax22() {
       $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/SystemRisk/getHighStatus",
+        url: "http://23.37.100.87:8084" + "/basic/SystemRisk/getHighStatus",
         data: {
             orgType: 2,
             Status: 1
@@ -523,7 +523,7 @@ function sp3Ajax21() {
     //   高危业务系统趋势
     function myAjax2() {
         $.ajax({
-            url: "http://23.37.100.80:8084" + "/basic/SystemRisk/getHighStatusByMonth",
+            url: "http://23.37.100.87:8084" + "/basic/SystemRisk/getHighStatusByMonth",
             data: {
                 orgType: 2
             },
@@ -543,7 +543,7 @@ function sp3Ajax21() {
     //   攻击事件类型
     function myAjax3() {
         $.ajax({
-            url: "http://23.37.100.80:8084" + "/basic/AttackEvent/getAttackEventByInfo",
+            url: "http://23.37.100.87:8084" + "/basic/AttackEvent/getAttackEventByInfo",
             data: {
                 orgType: 2
             },

spring-cloud/server-page/src/main/resources/static/testEcharts/test/main/springFrame4.html

@@ -264,7 +264,7 @@
     // 数据统计
     function sp4Ajax25() {
       $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
+        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSafetyInfoByMonth",
         data: {
             orgType: 1
         },
@@ -295,7 +295,7 @@
     let flag26 = false;
     function sp4Ajax26() {
       $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getRiskInfoByOrg",
+        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getRiskInfoByOrg",
         data: {
             orgType: 1
         },
@@ -344,7 +344,7 @@
     }, 60*1000);
     function sp4Ajax27() {
       $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/RiskType/getSysRiskType",
+        url: "http://23.37.100.87:8084" + "/basic/RiskType/getSysRiskType",
         data: {
             orgType: 1,
             riskClassify: 1
@@ -377,7 +377,7 @@
     // 业务系统
     function sp4Ajax28() {
     $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/safetyInfor/getSysStatusByOrg",
+        url: "http://23.37.100.87:8084" + "/basic/safetyInfor/getSysStatusByOrg",
         data: {
             orgType: 1
         },
@@ -409,7 +409,7 @@
     // 攻击拦截类型
     function sp4Ajax29() {
       $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/AttackType/getAttackTypeByMonth",
+        url: "http://23.37.100.87:8084" + "/basic/AttackType/getAttackTypeByMonth",
         data: {
             orgType: 1
         },
@@ -445,7 +445,7 @@
     let flag30 = false;
     function sp4Ajax30() {
       $.ajax({
-        url: "http://23.37.100.80:8084" + "/basic/SystemAttacked/getSystemAttackedByInfo",
+        url: "http://23.37.100.87:8084" + "/basic/SystemAttacked/getSystemAttackedByInfo",
         data: {
             orgType: 1
         },