From 70451e735a13ec8435bb0e53d17755efe86120e3 Mon Sep 17 00:00:00 2001
From: amass <168062547@qq.com>
Date: Fri, 7 Feb 2025 17:18:10 +0000
Subject: [PATCH] resume wt.

---
 CMakeLists.txt                    |  4 ++--
 Dockerfiles/ubuntu2404.dockerfile | 12 +++++++++++-
 Server/conf/nginx.conf            | 12 ++++++------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 649ccf1..5da791b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,9 +7,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(Libraries_ROOT /opt/Libraries)
 
-set(Wt_DIR ${Libraries_ROOT}/wt-4.11.1/lib/cmake/wt)
+set(Wt_DIR ${Libraries_ROOT}/wt-4.11.2/lib/cmake/wt)
 set(MbedTLS_DIR ${Libraries_ROOT}/mbedtls-3.6.2/lib/cmake/MbedTLS)
-set(nng_DIR ${Libraries_ROOT}/nng-1.10/lib/cmake/nng)
+set(nng_DIR ${Libraries_ROOT}/nng-1.10.1/lib/cmake/nng)
 set(LibDataChannel_DIR ${Libraries_ROOT}/libdatachannel-0.22.4/lib/cmake/LibDataChannel)
 
 if(APPLE)
diff --git a/Dockerfiles/ubuntu2404.dockerfile b/Dockerfiles/ubuntu2404.dockerfile
index 2808700..b828d86 100644
--- a/Dockerfiles/ubuntu2404.dockerfile
+++ b/Dockerfiles/ubuntu2404.dockerfile
@@ -2,11 +2,12 @@ FROM ubuntu:24.04
 LABEL maintainer="amass <168062547@qq.com>"
 ENV DEBIAN_FRONTEND=noninteractive
 
-ENV BOOST_VERSION=1_87_0
+ENV BOOST_VERSION=1_86_0
 ENV QT_VERSION=6.8.2
 ENV CODE_VERSION=4.96.4
 ENV LIBDATACHANNEL_VERSION=0.22.4
 ENV NNG_VERSION=1.10.1
+ENV WT_VERSION=4.11.2
 ENV TCPING_VERSION=2.7.1
 
 RUN sed -i 's@//.*archive.ubuntu.com@//mirrors.ustc.edu.cn@g' /etc/apt/sources.list.d/ubuntu.sources \
@@ -125,6 +126,15 @@ RUN cd /root \
     && cmake --build build --target all \
     && cmake --install build \
     && rm -fr /root/libjpeg-turbo-3.1.0*
+
+RUN cd /root \
+    && wget https://github.com/emweb/wt/archive/${WT_VERSION}.tar.gz -O wt-${WT_VERSION}.tar.gz \
+    && tar xvf wt-${WT_VERSION}.tar.gz \
+    && cd /root/wt-${WT_VERSION} \
+    && cmake -G Ninja -B build -S . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/Libraries/wt-${WT_VERSION} -DENABLE_QT4=OFF -DENABLE_QT5=OFF -DENABLE_QT6=OFF -DBOOST_ROOT=/opt/Libraries/boost_${BOOST_VERSION} \
+    && cmake --build build --target all \
+    && cmake --install build \
+    && rm -fr /root/wt-${WT_VERSION}*
     
 RUN wget https://github.com/pouriyajamshidi/tcping/releases/download/v${TCPING_VERSION}/tcping-linux-amd64-static.tar.gz -O /tmp/tcping-linux-amd64-static.tar.gz \
     && tar -xzf /tmp/tcping-linux-amd64-static.tar.gz -C /usr/bin \
diff --git a/Server/conf/nginx.conf b/Server/conf/nginx.conf
index 6a94893..2cdcc6f 100644
--- a/Server/conf/nginx.conf
+++ b/Server/conf/nginx.conf
@@ -42,21 +42,21 @@ http {
     }
 
     upstream twikoo {
-        server 127.0.0.1:8083;
-    }
-
-    upstream frp_http_proxy {
         server 127.0.0.1:8084;
     }
 
-    upstream frp_https_proxy {
+    upstream frp_http_proxy {
         server 127.0.0.1:8085;
     }
 
-    upstream frp_board {
+    upstream frp_https_proxy {
         server 127.0.0.1:8086;
     }
 
+    upstream frp_board {
+        server 127.0.0.1:8087;
+    }
+
     upstream frp_pve {
         server 127.0.0.1:8088;
     }