From 533abaf4c821f0f76a6f18cbb04c07c4968df9ee Mon Sep 17 00:00:00 2001 From: root Date: Tue, 22 Aug 2023 00:10:52 +0900 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9REALITY=E7=9A=84shortId?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V1/Admin/Server/VlessController.php | 2 +- update_dev.sh | 23 ------------------- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100755 update_dev.sh diff --git a/app/Http/Controllers/V1/Admin/Server/VlessController.php b/app/Http/Controllers/V1/Admin/Server/VlessController.php index 18a951b1..c0a403d8 100644 --- a/app/Http/Controllers/V1/Admin/Server/VlessController.php +++ b/app/Http/Controllers/V1/Admin/Server/VlessController.php @@ -41,7 +41,7 @@ class VlessController extends Controller $params['tls_settings']['private_key'] = Helper::base64EncodeUrlSafe(SodiumCompat::crypto_box_secretkey($keyPair)); } if (!isset($params['tls_settings']['shortId'])) { - $params['tls_settings']['shortId'] = substr(sha1($params['name']), 0, 8); + $params['tls_settings']['shortId'] = substr(sha1($params['tls_settings']['private_key']), 0, 8); } } diff --git a/update_dev.sh b/update_dev.sh deleted file mode 100755 index 685c7afa..00000000 --- a/update_dev.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -if [ ! -d ".git" ]; then - echo "Please deploy using Git." - exit 1 -fi - -if ! command -v git &> /dev/null; then - echo "Git is not installed! Please install git and try again." - exit 1 -fi - -git config --global --add safe.directory $(pwd) -git fetch --all && git reset --hard origin/dev && git pull origin dev -git checkout dev -rm -rf composer.lock composer.phar -wget https://github.com/composer/composer/releases/latest/download/composer.phar -O composer.phar -php composer.phar update -vvv -php artisan v2board:update - -if [ -f "/etc/init.d/bt" ]; then - chown -R www $(pwd); -fi