Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-09-20 b10977d128dfc77497f1cc33df13d55e8801a3f7

Merge remote-tracking branch 'origin/master'

 ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html

@@ -6,7 +6,7 @@
    <meta name="renderer" content="webkit"/><!-- 让360浏览器默认选择webkit内核 -->

    <!--地图-->
    <script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
    <script src="https://webapi.amap.com/maps?v=1.4.8&key=83a918fd5e6ed82be74e3056d403dbe6"></script>
    <!--<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=IRKL4FLGKZUFr6T3gFk3t9X6kKarKu1K"></script>-->

    <!-- 全局css -->

 ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html

@@ -101,7 +101,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=83a918fd5e6ed82be74e3056d403dbe6"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js"></script>
@}

 ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html

@@ -46,7 +46,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=83a918fd5e6ed82be74e3056d403dbe6"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js"></script>
@}

 ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html

@@ -120,7 +120,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=83a918fd5e6ed82be74e3056d403dbe6"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
@}

 ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html

@@ -46,7 +46,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=83a918fd5e6ed82be74e3056d403dbe6"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
@}

 ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html

@@ -102,7 +102,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=83a918fd5e6ed82be74e3056d403dbe6"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
@}

 ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html

@@ -46,7 +46,7 @@
    </div>
</div>
<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
<script src="https://webapi.amap.com/maps?v=1.4.8&key=83a918fd5e6ed82be74e3056d403dbe6"></script>
<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
@}

 ZuulZYTravel/src/main/java/com/sinata/zuul/util/applets/ChildChannelHandler.java

@@ -15,7 +15,7 @@
    protected void initChannel(SocketChannel socketChannel) throws Exception {
        String path = "D:\\app\\cert\\tomcat\\9624329_www.zycx.ztrbkj.com.pfx";
        SSLContext sslContext = createSSLContext.createSSLContext("PKCS12"
                , path, "9dtwhooz");
                , path, "v46h878e");
        //SSLEngine 此类允许使用ssl安全套接层协议进行安全通信
        SSLEngine engine = sslContext.createSSLEngine();
        engine.setUseClientMode(false);