From 1045bd02281af78297f06ef6845efaf3bf0f7f95 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 04 四月 2023 19:03:26 +0800
Subject: [PATCH] 提交修改后的版本
---
ZuulZYTravel/src/main/resources/application.yml | 2 +-
ZuulZYTravel/src/main/java/com/sinata/zuul/ZuulApplication.java | 15 +++++++--------
ZuulZYTravel/src/main/java/com/sinata/zuul/util/applets/WebSocketHandler.java | 2 +-
ZuulZYTravel/src/main/java/com/sinata/zuul/util/applets/ChildChannelHandler.java | 15 +++++++--------
ZuulZYTravel/src/main/resources/redis.properties | 6 ++----
5 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/ZuulZYTravel/src/main/java/com/sinata/zuul/ZuulApplication.java b/ZuulZYTravel/src/main/java/com/sinata/zuul/ZuulApplication.java
index bd2a0a3..206997f 100644
--- a/ZuulZYTravel/src/main/java/com/sinata/zuul/ZuulApplication.java
+++ b/ZuulZYTravel/src/main/java/com/sinata/zuul/ZuulApplication.java
@@ -35,7 +35,7 @@
@EnableZuulProxy//开启网关服务
@EnableDiscoveryClient//开启eureka客户端的消费者
@SpringBootApplication
-public class ZuulApplication extends SpringBootServletInitializer {
+public class ZuulApplication /*extends SpringBootServletInitializer*/ {
public static void main(String[] args) {
SpringApplication.run(ZuulApplication.class, args);
@@ -109,9 +109,8 @@
public List<SwaggerResource> get() {
List resource=new ArrayList<>();
//name可以随便写，location前缀要与zuul配置的path一致。zuul开了token验证,要加上token,否则不用加?token=1
-// resource.add(swaggerResource("user","/user-server/v2/api-docs","1.0"));
-// resource.add(swaggerResource("driver","/driver-server/v2/api-docs","1.0"));
-// resource.add(swaggerResource("dispatch","/dispatch-server/v2/api-docs","1.0"));
+ resource.add(swaggerResource("user","/user-server/v2/api-docs","1.0"));
+ resource.add(swaggerResource("driver","/driver-server/v2/api-docs","1.0"));
return resource;
}
@@ -125,8 +124,8 @@
}
}
- @Override
- protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
- return builder.sources(ZuulApplication.class);
- }
+// @Override
+// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+// return builder.sources(ZuulApplication.class);
+// }
}
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 690e3c6..c096006 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
@@ -13,14 +13,13 @@
public class ChildChannelHandler extends ChannelInitializer<SocketChannel> {
@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 = "C:\\cert\\5084549_express.feimadache.com.pfx";
-// SSLContext sslContext = createSSLContext.createSSLContext("PKCS12"
-// , path, "4zw2YVpF");
-// //SSLEngine 此类允许使用ssl安全套接层协议进行安全通信
-// SSLEngine engine = sslContext.createSSLEngine();
-// engine.setUseClientMode(false);
-// socketChannel.pipeline().addLast("ssl", new SslHandler(engine));
+ String path = "D:\\app\\cert\\tomcat\\9624329_www.zycx.ztrbkj.com.pfx";
+ SSLContext sslContext = createSSLContext.createSSLContext("PKCS12"
+ , path, "9dtwhooz");
+ //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));
diff --git a/ZuulZYTravel/src/main/java/com/sinata/zuul/util/applets/WebSocketHandler.java b/ZuulZYTravel/src/main/java/com/sinata/zuul/util/applets/WebSocketHandler.java
index 32c673c..bbb3ba2 100644
--- a/ZuulZYTravel/src/main/java/com/sinata/zuul/util/applets/WebSocketHandler.java
+++ b/ZuulZYTravel/src/main/java/com/sinata/zuul/util/applets/WebSocketHandler.java
@@ -23,7 +23,7 @@
//用于websocket握手的处理类
private WebSocketServerHandshaker handshaker;
- private static final String WEB_SOCKET_URL = "ws://localhost:9090/websocket";
+ private static final String WEB_SOCKET_URL = "wss://localhost:9090/websocket";
diff --git a/ZuulZYTravel/src/main/resources/application.yml b/ZuulZYTravel/src/main/resources/application.yml
index f99aec0..fb375e1 100644
--- a/ZuulZYTravel/src/main/resources/application.yml
+++ b/ZuulZYTravel/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 80
+ port: 81
spring:
application:
name: zuul-gateway #服务名称
diff --git a/ZuulZYTravel/src/main/resources/redis.properties b/ZuulZYTravel/src/main/resources/redis.properties
index 21d109e..72627aa 100644
--- a/ZuulZYTravel/src/main/resources/redis.properties
+++ b/ZuulZYTravel/src/main/resources/redis.properties
@@ -4,12 +4,10 @@
# Redis��������ַ
spring.redis.host=127.0.0.1
# Redis���������Ӷ˿�
-#spring.redis.port=16379
-spring.redis.port=6379
+spring.redis.port=16379
#spring.redis.port=6379
# Redis�������������루Ĭ��Ϊ�գ�
-#spring.redis.password=mPMHThYzlT8DWgl8HLqwPEyPOiHDPPB5
-spring.redis.password=123456
+spring.redis.password=mPMHThYzlT8DWgl8HLqwPEyPOiHDPPB5
#spring.redis.password=123456
# ���ӳ������������ʹ�ø�ֵ��ʾû�����ƣ�
spring.redis.jedis.pool.max-active=1024
--
Gitblit v1.7.1