From 831e3312572cf29dd91cbd882ef3dce809ac852d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 14 六月 2023 20:58:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
zuul/src/main/java/com/sinata/zuul/util/applets/ChildChannelHandler.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/zuul/src/main/java/com/sinata/zuul/util/applets/ChildChannelHandler.java b/zuul/src/main/java/com/sinata/zuul/util/applets/ChildChannelHandler.java
index d7c315b..c98f607 100644
--- a/zuul/src/main/java/com/sinata/zuul/util/applets/ChildChannelHandler.java
+++ b/zuul/src/main/java/com/sinata/zuul/util/applets/ChildChannelHandler.java
@@ -14,13 +14,13 @@
@Override
protected void initChannel(SocketChannel socketChannel) throws Exception {
// String path = "C:\\Program Files\\Apache Software Foundation\\Tomcat 8.5\\cert\\SHA256withRSA_lzhyc.cn.pfx";
-// String path = "/usr/local/server/app/cert/tomcat/scs1680576839056_chaoshengdaijia.com_server.jks";
-// SSLContext sslContext = createSSLContext.createSSLContext("JKS"
-// , path, "Zf3^5v6OoWmOVgeQ");
-// //SSLEngine 此类允许使用ssl安全套接层协议进行安全通信
-// SSLEngine engine = sslContext.createSSLEngine();
-// engine.setUseClientMode(false);
-// socketChannel.pipeline().addLast("ssl", new SslHandler(engine));
+ String path = "/usr/local/server/app/cert/tomcat/scs1680576839056_chaoshengdaijia.com_server.jks";
+ SSLContext sslContext = createSSLContext.createSSLContext("JKS"
+ , path, "Zf3^5v6OoWmOVgeQ");
+ //SSLEngine 此类允许使用ssl安全套接层协议进行安全通信
+ SSLEngine engine = sslContext.createSSLEngine();
+ engine.setUseClientMode(false);
+ socketChannel.pipeline().addLast("ssl", new SslHandler(engine));
// 设置30秒没有读到数据，则触发一个READER_IDLE事件。
// pipeline.addLast(new IdleStateHandler(30, 0, 0));
--
Gitblit v1.7.1