Merge pull request #94 from hezhijie0327/dev

Dev
hezhijie0327 · May 16, 2024 · f6a1f12 · f6a1f12
2 parents 15fae18 + 6b706a3
commit f6a1f12
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 11 deletions.
diff --git a/v2ray/client_trojan.json b/v2ray/client_trojan.json
@@ -4,7 +4,6 @@
         "loglevel": "info"
     },
     "dns": {
-        "clientIp": "127.0.0.1",
         "disableCache": true,
         "disableFallback": false,
         "queryStrategy": "UseIP",

diff --git a/v2ray/client_vless.json b/v2ray/client_vless.json
@@ -4,7 +4,6 @@
         "loglevel": "info"
     },
     "dns": {
-        "clientIp": "127.0.0.1",
         "disableCache": true,
         "disableFallback": false,
         "queryStrategy": "UseIP",

diff --git a/v2ray/client_vmess.json b/v2ray/client_vmess.json
@@ -4,7 +4,6 @@
         "loglevel": "info"
     },
     "dns": {
-        "clientIp": "127.0.0.1",
         "disableCache": true,
         "disableFallback": false,
         "queryStrategy": "UseIP",

diff --git a/v2ray/server_trojan.json b/v2ray/server_trojan.json
@@ -4,7 +4,6 @@
         "loglevel": "info"
     },
     "dns": {
-        "clientIp": "127.0.0.1",
         "disableCache": true,
         "disableFallback": false,
         "queryStrategy": "UseIP",

diff --git a/v2ray/server_vless.json b/v2ray/server_vless.json
@@ -4,7 +4,6 @@
         "loglevel": "info"
     },
     "dns": {
-        "clientIp": "127.0.0.1",
         "disableCache": true,
         "disableFallback": false,
         "queryStrategy": "UseIP",

diff --git a/v2ray/server_vmess.json b/v2ray/server_vmess.json
@@ -4,7 +4,6 @@
         "loglevel": "info"
     },
     "dns": {
-        "clientIp": "127.0.0.1",
         "disableCache": true,
         "disableFallback": false,
         "queryStrategy": "UseIP",

diff --git a/v2ray/v2ray.sh b/v2ray/v2ray.sh
@@ -123,10 +123,6 @@ function DownloadConfiguration() {
     if [ "${DOWNLOAD_CONFIG:-true}" == "true" ]; then
         curl ${CURL_OPTION:--4 -s --connect-timeout 15} "https://${CDN_PATH}/ZJDNS/main/v2ray/${RUNNING_MODE:-server}_${RUNTIME_PROTOCOL:-vmess}.json" > "${DOCKER_PATH}/conf/config.json" && sed -i "s/\"info\"/\"${LOG_LEVEL:-info}\"/g;s/demo.zhijie.online/${CUSTOM_SERVERNAME}/g;s/99235a6e-05d4-2afe-2990-5bc5cf1f5c52/${CUSTOM_UUID}/g;s/fullchain\.cer/${SSL_CERT/./\\.}/g;s/zhijie\.online\.key/${SSL_KEY/./\\.}/g" "${DOCKER_PATH}/conf/config.json"
 
-        if [ "${CUSTOM_CLIENT_IP:-auto}" != "" ]; then
-            sed -i "s|\"clientIp\": \"127.0.0.1\"|\"clientIp\": \"$(StaticIP=${CUSTOM_CLIENT_IP} && Type=${CUSTOM_CLIENT_IP_TYPE:-A} && GetWANIP)\"|g" "${DOCKER_PATH}/conf/config.json"
-        fi
-
         if [ "${CUSTOM_DNS[*]}" != "" ]; then
             JSON_STRING="" && for IP in "${CUSTOM_DNS[@]}"; do
                 IPADDR="" && IPADDR=$(echo ${IP} | cut -d "@" -f 1)
@@ -135,7 +131,7 @@ function DownloadConfiguration() {
                 CLIENT="" && CLIENT=$(echo ${IP} | grep '%' | cut -d "%" -f 2)
 
                 ADDITIONAL="" && if [ "${CLIENT}" != "" ]; then
-                    ADDITIONAL=', "clientIp": "'${CLIENT}'"'
+                    ADDITIONAL=', "clientIp": "'$(StaticIP=${CLIENT} && Type=${CUSTOM_CLIENT_IP_TYPE:-A} && GetWANIP)'"'
                 fi
 
                 if [ "${EXPECT}" != "" ]; then