yp 2 жил өмнө
parent
commit
67573e21f8

+ 4 - 4
cms/src/main/java/com/jd/cms/nettySocket/NioWebSocketHandler.java

@@ -23,7 +23,7 @@ public class NioWebSocketHandler extends SimpleChannelInboundHandler<Object> {
 
 
     @Override
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {
     protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {
-        //log.info("收到消息" + msg);
+        log.info("收到消息" + msg);
         if (msg instanceof FullHttpRequest) {
         if (msg instanceof FullHttpRequest) {
             //以http请求形式接入,但是走的是websocket
             //以http请求形式接入,但是走的是websocket
             handleHttpRequest(ctx, (FullHttpRequest) msg);
             handleHttpRequest(ctx, (FullHttpRequest) msg);
@@ -44,7 +44,7 @@ public class NioWebSocketHandler extends SimpleChannelInboundHandler<Object> {
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
         //断开连接
         //断开连接
         log.info("客户端断开连接:" + ctx.channel());
         log.info("客户端断开连接:" + ctx.channel());
-        ChannelManage.removeChannel(ctx.channel());
+        com.jd.cms.nettySocket.ChannelManage.removeChannel(ctx.channel());
     }
     }
 
 
     @Override
     @Override
@@ -76,7 +76,7 @@ public class NioWebSocketHandler extends SimpleChannelInboundHandler<Object> {
                 .set("msg", request);
                 .set("msg", request);
         TextWebSocketFrame tws = new TextWebSocketFrame(msg.toString());
         TextWebSocketFrame tws = new TextWebSocketFrame(msg.toString());
         // 群发,把当前通道传过去,那边排除掉
         // 群发,把当前通道传过去,那边排除掉
-        ChannelManage.send2All(tws, ctx.channel().id());
+        com.jd.cms.nettySocket.ChannelManage.send2All(tws, ctx.channel().id());
     }
     }
 
 
     /**
     /**
@@ -90,7 +90,7 @@ public class NioWebSocketHandler extends SimpleChannelInboundHandler<Object> {
             return;
             return;
         }
         }
         //WebSocketServerHandshakerFactory wsFactory = new WebSocketServerHandshakerFactory("ws://192.168.0.114:8088/websocket", null, true);
         //WebSocketServerHandshakerFactory wsFactory = new WebSocketServerHandshakerFactory("ws://192.168.0.114:8088/websocket", null, true);
-        handshaker = new WebSocketServerHandshaker13("ws://23.37.100.81:8088/websocket", null, true, 1024 * 1024 * 6);
+        handshaker = new WebSocketServerHandshaker13("ws://23.37.100.81:8111/websocket", null, true, 1024 * 1024 * 6);
         if (handshaker == null) {
         if (handshaker == null) {
             WebSocketServerHandshakerFactory.sendUnsupportedVersionResponse(ctx.channel());
             WebSocketServerHandshakerFactory.sendUnsupportedVersionResponse(ctx.channel());
         } else {
         } else {

+ 1 - 1
cms/src/main/java/com/jd/cms/nettySocket/NioWebSocketServer.java

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
 @Component
 @Component
 public class NioWebSocketServer implements Runnable {
 public class NioWebSocketServer implements Runnable {
 
 
-    private Integer port = 8088;
+    private Integer port = 8111;
 
 
     @Override
     @Override
     public void run() {
     public void run() {

+ 4 - 4
cms/src/main/resources/application.yml

@@ -43,7 +43,7 @@ spring:
   datasource:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     driver-class-name: com.mysql.cj.jdbc.Driver
     # 本地开始
     # 本地开始
-    url: jdbc:mysql://localhost:3306/dt2_cms?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://192.168.0.100:3306/dt2_cms?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
     username: root
     username: root
     password: jd123456
     password: jd123456
 #    password: 123456
 #    password: 123456
@@ -54,7 +54,7 @@ spring:
   redis:
   redis:
     database: 0
     database: 0
     # 本地开始
     # 本地开始
-    host: 23.37.100.81
+    host: 192.168.0.100
     port: 6379
     port: 6379
     password: jd123456
     password: jd123456
 #    password: 123456
 #    password: 123456
@@ -86,8 +86,8 @@ path:
     letterpath: D:/nginx-1.21.1/html
     letterpath: D:/nginx-1.21.1/html
 
 
     # 后台-上传文件访问路径
     # 后台-上传文件访问路径
-    letterurl: http://23.37.100.87:8060
-#    letterurl: http://192.168.0.95
+#    letterurl: http://23.37.100.87:8060
+    letterurl: http://192.168.0.95
     # 静态网站文件-资源路径
     # 静态网站文件-资源路径
     staticletterpath: D:/nginx-1.21.1/html
     staticletterpath: D:/nginx-1.21.1/html
     # 静态网站文件-网站路径
     # 静态网站文件-网站路径

+ 1 - 1
cms/src/main/resources/static/ftl/fzzd/dhl/hdgn/wjll.ftl

@@ -34,7 +34,7 @@
         }
         }
 
 
         .box .back {
         .box .back {
-            font-size: 18px;
+            font-size: 18px;back_wj
             width: 10%;
             width: 10%;
             height: 5%;
             height: 5%;
             color: #FFFFFF;
             color: #FFFFFF;

+ 11 - 1
cms/src/main/resources/static/ftl/fzzd/public/css/style.css

@@ -71,6 +71,12 @@ h1 {
     margin-bottom: 1%;
     margin-bottom: 1%;
 }
 }
 
 
+.back>video {
+    width: 100%;
+    max-height: 80%;
+    margin-bottom: 1%;
+}
+
 .back>span {
 .back>span {
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;
@@ -91,7 +97,11 @@ h1 {
     max-height: 80%;
     max-height: 80%;
     margin-bottom: 1%;
     margin-bottom: 1%;
 }
 }
-
+.front>video {
+    width: 100%;
+    max-height: 80%;
+    margin-bottom: 1%;
+}
 .front>span {
 .front>span {
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;

+ 7 - 3
cms/src/main/resources/static/ftl/fzzd/public/js/basic/xxtx.js

@@ -4,7 +4,7 @@ if (!window.WebSocket) {
 }
 }
 
 
 if (window.WebSocket) {
 if (window.WebSocket) {
-    socket = new WebSocket("ws://" + BASE_IP + ":8088/websocket");
+    socket = new WebSocket(BASE_IP + "/websocket");
     socket.onopen = function(event) {
     socket.onopen = function(event) {
         console.log("连接成功!")
         console.log("连接成功!")
     };
     };
@@ -54,7 +54,11 @@ function sent(message) {
 }
 }
 
 
 $(".back-ztzs").on("click", function() {
 $(".back-ztzs").on("click", function() {
-    location.href = "/${data.websiteInfo.rootPath }/dhl/hdgn/list.html"
+    location.href = "/fzzd/dhl/hdgn/list.html"
+})
+
+$(".crumbs").on("click", ".back_wjts", function() {
+    location.href = "/fzzd/dhl/hdgn/list.html"
 })
 })
 
 
 $(".put-img").on("click", function() {
 $(".put-img").on("click", function() {
@@ -114,7 +118,7 @@ function putImg(file) {
     formData.append("file", file);
     formData.append("file", file);
     formData.append("websiteId", "a9302e81ba4c11ec899bd8bbc1a0725c");
     formData.append("websiteId", "a9302e81ba4c11ec899bd8bbc1a0725c");
     $.ajax({
     $.ajax({
-        url: "http://" + BASE_IP + ":8089/cms/file/fileUpload",
+        url: HOME_PATH + "cms/file/fileUpload",
         type: "post",
         type: "post",
         cache: false,
         cache: false,
         contentType: false,
         contentType: false,

+ 2 - 2
cms/src/main/resources/static/ftl/fzzd/public/js/constant.js

@@ -3,7 +3,7 @@
 // var FLAT_PATH_BASIC = FLAT_PATH + 'basic/';
 // var FLAT_PATH_BASIC = FLAT_PATH + 'basic/';
 // var PAGE_PATH = 'http://192.168.0.95:80/';
 // var PAGE_PATH = 'http://192.168.0.95:80/';
 // var HOME_PATH = 'http://192.168.0.95:8089/';
 // var HOME_PATH = 'http://192.168.0.95:8089/';
-// var BASE_IP = '192.168.0.95';
+// var BASE_IP = 'ws://192.168.0.95:8111';
 
 
 var SERVER_IP = 'http://23.37.100.87:8060';
 var SERVER_IP = 'http://23.37.100.87:8060';
 var FLAT_PATH = 'http://23.37.100.87:8084/';
 var FLAT_PATH = 'http://23.37.100.87:8084/';
@@ -13,4 +13,4 @@ var PAGE_PATH = 'http://23.37.100.87:8060/';
 var HOME_PATH = 'http://23.37.100.87:8061/';
 var HOME_PATH = 'http://23.37.100.87:8061/';
 //轻应用文件端口
 //轻应用文件端口
 var QYYFILE_PATH = 'http://23.37.100.87:8062';
 var QYYFILE_PATH = 'http://23.37.100.87:8062';
-var BASE_IP = '23.37.100.87';
+var BASE_IP = 'ws://23.37.100.87:8111';