From b10977d128dfc77497f1cc33df13d55e8801a3f7 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 20 九月 2024 09:13:18 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html | 2 +- ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html | 2 +- ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html | 2 +- ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html | 2 +- ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html | 2 +- ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html | 2 +- ZuulZYTravel/src/main/java/com/sinata/zuul/util/applets/ChildChannelHandler.java | 2 +- ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html b/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html index d907518..f725552 100644 --- a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html +++ b/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 --> diff --git a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html b/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html index 991ca55..bec076b 100644 --- a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html +++ b/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> @} diff --git a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html b/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html index f749bb9..9176d5e 100644 --- a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html +++ b/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> @} diff --git a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html b/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html index 07b7027..74dc552 100644 --- a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html +++ b/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> @} diff --git a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html b/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html index 308863e..b623d24 100644 --- a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html +++ b/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> @} diff --git a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html b/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html index d72664d..aa390a1 100644 --- a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html +++ b/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> @} diff --git a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html b/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html index 6bdd85e..ae8b9d0 100644 --- a/ManagementZYTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html +++ b/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> @} diff --git a/ZuulZYTravel/src/main/java/com/sinata/zuul/util/applets/ChildChannelHandler.java b/ZuulZYTravel/src/main/java/com/sinata/zuul/util/applets/ChildChannelHandler.java index c096006..f20b34f 100644 --- a/ZuulZYTravel/src/main/java/com/sinata/zuul/util/applets/ChildChannelHandler.java +++ b/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); -- Gitblit v1.7.1