diff --git a/5.调试工具（这个功能全）.bat b/5.调试工具（这个功能全）.bat index 3bf87dd..84a99fa 100644 --- a/5.调试工具（这个功能全）.bat +++ b/5.调试工具（这个功能全）.bat @@ -1,165 +1,329 @@ + @echo off + rem ṩWindowsnginxرչ + + echo ==================begin======================== + + cls + ::ngxin ڵ̷ + set NGINX_PATH=%~d0 + + ::nginx Ŀ¼ + set NGINX_DIR=%~dp0 + ::color 0a + TITLE Nginx ű v1.0 + + CLS + + echo. + echo. *************************** + echo. *************************** + echo. *** Nginx ű v1.0 *** + echo. *** Mashiro *** + echo. *** https://2heng.xin *** + echo. *************************** + echo. *************************** + echo. + + :MENU + + echo. ***** nginx list ****** + ::tasklist|findstr /i "nginx.exe" + tasklist /fi "imagename eq nginx.exe" + + echo. + + if ERRORLEVEL 1 ( + echo nginx.exe + ) else ( + echo nginx.exe + ) + + echo. + ::************************************************************************************************************* + echo. + echo. [1] Nginx + echo. [2] رNginx + echo. [3] Nginx + echo. [4] ˢ¿̨ + echo. [5] ¼Nginxļ + echo. [6] nginxļ + echo. [7] 鿴nginx version + echo. [0] + echo. + + echo.ѡ: + set /p ID= + IF "%id%"=="1" GOTO start + IF "%id%"=="2" GOTO stop + IF "%id%"=="3" GOTO restart + IF "%id%"=="4" GOTO MENU + IF "%id%"=="5" GOTO reloadConf + IF "%id%"=="6" GOTO checkConf + IF "%id%"=="7" GOTO showVersion + IF "%id%"=="0" EXIT + PAUSE + + ::************************************************************************************************************* + :: + :start + call :startNginx + GOTO MENU + + ::ֹͣ + :stop + call :shutdownNginx + GOTO MENU + + :: + :restart + call :shutdownNginx + call :startNginx + GOTO MENU + + ::ļ + :checkConf + call :checkConfNginx + GOTO MENU + + ::¼Nginxļ + :reloadConf + call :checkConfNginx + call :reloadConfNginx + GOTO MENU + + ::ʾnginx汾 + :showVersion + call :showVersionNginx + GOTO MENU + + + ::************************************************************************************* + ::ײ + ::************************************************************************************* + :shutdownNginx + echo. + echo.رNginx...... + taskkill /F /IM nginx.exe > nul + echo.OK,رnginx + goto :eof + + :startNginx + echo. + echo.Nginx...... + IF NOT EXIST "%NGINX_DIR%nginx.exe" ( + echo "%NGINX_DIR%nginx.exe" + goto :eof + ) + + %NGINX_PATH% + cd "%NGINX_DIR%" + + IF EXIST "%NGINX_DIR%nginx.exe" ( + echo "start '' nginx.exe" + start "" nginx.exe + ) + echo.OK + goto :eof + + + :checkConfNginx + echo. + echo. nginx ļ...... + IF NOT EXIST "%NGINX_DIR%nginx.exe" ( + echo "%NGINX_DIR%nginx.exe" + goto :eof + ) + + %NGINX_PATH% + cd "%NGINX_DIR%" + nginx -t -c conf/nginx.conf + + goto :eof + + ::¼ nginx ļ + :reloadConfNginx + echo. + echo.¼ nginx ļ...... + IF NOT EXIST "%NGINX_DIR%nginx.exe" ( + echo "%NGINX_DIR%nginx.exe" + goto :eof + ) + + %NGINX_PATH% + cd "%NGINX_DIR%" + nginx -s reload + + goto :eof + + ::ʾnginx汾 + :showVersionNginx + echo. + %NGINX_PATH% + cd "%NGINX_DIR%" + nginx -V + goto :eof \ No newline at end of file diff --git a/7.更多信息及更新.html b/7.更多信息及更新.html index 8632784..ad98cc9 100644 --- a/7.更多信息及更新.html +++ b/7.更多信息及更新.html @@ -3,5 +3,5 @@


by Mashiro
-

ʱ䣺2018/9/17

+

ʱ䣺2019/6/27

\ No newline at end of file diff --git a/conf/ca/pixiv.net.crt b/conf/ca/pixiv.net.crt index ca52da6..405d2c8 100644 --- a/conf/ca/pixiv.net.crt +++ b/conf/ca/pixiv.net.crt @@ -1,39 +1,39 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: 12 (0xc) + Serial Number: 14 (0xe) Signature Algorithm: sha256WithRSAEncryption Issuer: C=CN, ST=Shanghai, L=Shanghai, O=Mashiro LLC, CN=Mashiro Internet Fake Authority CA Validity - Not Before: Jan 28 15:55:37 2019 GMT - Not After : Jan 25 15:55:37 2029 GMT + Not Before: Jun 22 06:47:53 2019 GMT + Not After : Jun 19 06:47:53 2029 GMT Subject: C=CN, ST=Shanghai, O=Mashiro LLC, CN=*.pixiv.net Subject Public Key Info: Public Key Algorithm: rsaEncryption Public-Key: (2048 bit) Modulus: - 00:b6:69:b0:85:40:ad:74:2c:4a:68:5d:9c:9b:88: - 15:77:95:1e:48:09:bf:49:0e:77:94:fc:66:bd:33: - 05:28:f7:e8:dd:a9:70:59:d3:6a:a2:b3:66:6f:ac: - 37:9f:e6:bd:4b:41:d4:18:1a:db:e6:c7:ca:74:a1: - d7:29:2b:11:5a:b8:59:70:6c:47:c8:77:ed:dc:5e: - 94:cf:a6:95:8c:ab:42:5e:9f:fb:08:98:35:6c:96: - f3:a5:2e:ed:ae:93:e1:d7:48:03:27:43:49:89:19: - c0:51:3a:b2:10:65:4e:79:d9:fa:e6:c0:98:db:34: - 6b:47:61:25:29:4e:23:40:db:0f:06:94:63:04:9c: - b3:af:bd:36:0f:41:38:2c:5e:51:c5:46:17:5c:88: - 2c:95:8e:75:da:5e:81:55:88:df:ad:dd:32:b0:ca: - 96:28:45:6b:c2:13:c6:35:d3:4d:41:e9:f4:f1:c4: - 5d:3a:52:00:ef:b5:96:6b:2d:3f:30:a5:59:c7:51: - 67:41:94:e3:39:f2:a8:ca:f4:ab:e7:3a:f9:f1:dc: - 8f:bb:ae:95:d3:48:e5:48:82:46:94:83:90:44:5f: - 4c:cd:61:c4:b7:27:a8:56:3a:22:b6:c2:05:76:b2: - a7:da:58:58:29:74:16:02:79:bf:16:2d:73:01:a8: - 13:e3 + 00:ce:00:18:cc:64:70:ac:59:b0:45:9e:c3:ee:9e: + 9b:b2:56:59:43:aa:b7:98:6b:bb:86:86:c9:bb:b6: + ed:54:b8:56:de:ec:18:06:62:59:27:3b:d2:16:4a: + 8a:86:ad:40:2b:69:6a:dc:21:12:4b:ca:fd:85:a8: + 01:dd:ec:2a:20:a2:6e:b0:c2:a7:79:88:f9:f4:34: + 95:fb:85:bf:f0:c7:1d:57:29:f8:a5:62:e3:b6:9e: + 52:f7:42:2a:0c:5a:5c:6d:b4:30:51:4e:c1:40:57: + c6:58:57:18:47:9c:59:9d:b7:38:bb:cc:0c:68:aa: + 6c:68:76:be:6f:84:83:12:ef:60:2d:11:61:d8:01: + f0:09:85:8c:80:fa:f0:f6:23:95:c7:97:c1:86:53: + 97:b5:d5:dc:5b:a8:f8:22:49:0a:70:2d:92:77:17: + 41:fd:0e:ba:5b:a7:ce:8f:60:a1:fc:5a:a7:87:19: + 1f:12:f6:c8:b2:32:f4:a8:22:72:ec:97:cc:98:48: + 24:b3:4d:c4:83:7b:9e:1d:15:62:63:37:f5:b6:0c: + 4f:b5:97:33:87:1f:67:cd:0b:bb:71:7b:38:60:c5: + 4f:2f:ad:40:44:0a:8e:af:0c:6c:5a:f4:00:6d:94: + a3:f3:ae:f2:eb:5e:14:68:0a:03:5b:c7:89:09:d0: + f9:bd Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Subject Key Identifier: - 04:79:27:0B:A8:B9:39:9C:2E:F0:A6:88:4A:73:38:D8:BD:2F:4C:BD + 4C:B9:F4:49:C1:82:B5:1E:3A:81:63:FA:0C:15:78:A5:F7:4A:AF:FF X509v3 Authority Key Identifier: keyid:3F:6C:37:71:8F:74:1B:28:5A:0F:C2:29:C1:2B:05:7E:D1:24:D4:54 @@ -42,46 +42,50 @@ Certificate: X509v3 Key Usage: Digital Signature, Key Encipherment X509v3 Subject Alternative Name: - DNS:*.pixiv.net, DNS:pixiv.net, DNS:public-api.secure.pixiv.net, DNS:*.secure.pixiv.net, DNS:www.pixivision.net, DNS:pixiv.me, DNS:pximg.net, DNS:*.pximg.net, DNS:wikipedia.org, DNS:*.wikipedia.org, DNS:google.com, DNS:*.google.com + DNS:*.pixiv.net, DNS:pixiv.net, DNS:*.secure.pixiv.net, DNS:pixivision.net, DNS:*.pixivision.net, DNS:pixiv.me, DNS:*.pixiv.me, DNS:pximg.net, DNS:*.pximg.net, DNS:pixivsketch.net, DNS:*.pixivsketch.net, DNS:public-api.secure.pixiv.net, DNS:wikipedia.org, DNS:*.wikipedia.org, DNS:m.wikipedia.org, DNS:*.m.wikipedia.org, DNS:google.com, DNS:*.google.com, DNS:steamcommunity.com, DNS:*.steamcommunity.com, DNS:steampowered.com, DNS:*.steampowered.com Signature Algorithm: sha256WithRSAEncryption - 32:d9:40:37:83:81:07:2e:ae:8b:bc:be:f6:11:b9:a4:e3:d3: - 28:c9:97:e6:b4:80:1b:69:57:bb:1b:e4:ce:e1:b4:d5:d1:91: - 1c:5d:57:7d:c5:19:15:67:91:c5:db:26:7a:96:fc:70:84:5c: - cb:bf:20:78:f4:2e:a5:16:a5:40:0c:07:b5:c3:b3:f9:5e:1a: - 66:bb:8c:47:ec:bd:6a:cc:7c:a1:2a:d5:5b:e7:bb:91:1e:e5: - d9:43:04:f6:f9:1b:13:a3:d9:ea:7a:4d:ff:ac:d5:b1:1a:f1: - 06:76:b7:9f:ca:25:aa:d3:b3:af:37:3a:1f:4d:f1:50:81:91: - 16:f5:88:5d:ab:6f:19:8c:94:59:64:2e:94:23:66:60:0d:56: - ee:4c:0a:e2:d6:09:b1:42:21:d5:4e:e9:00:c9:1d:23:1a:d9: - d8:1a:81:d1:ef:65:85:3b:61:63:4f:c5:d1:d3:b8:43:cb:14: - 6f:d6:42:6a:57:7a:ca:09:00:04:77:45:f1:05:da:39:bc:ea: - 14:f8:3f:73:43:c5:f1:88:7b:cf:6d:dd:14:3b:88:a0:89:56: - d0:f5:37:9f:65:b7:56:50:e7:91:3a:ef:c9:05:3c:09:87:3c: - 41:fa:f3:bf:64:00:a2:7f:be:5f:2a:e0:9f:0e:05:78:19:b0: - f1:2a:3c:e4 + 6d:0b:ab:0a:a6:08:b1:42:84:15:b9:eb:c8:bf:92:9f:cc:a2: + e1:99:c3:bf:13:b5:6f:dc:9f:4f:d9:dd:91:bc:be:92:c1:f4: + 66:52:8b:e7:aa:aa:7a:9c:5c:1f:e9:ac:d0:5b:77:4a:35:db: + 96:8a:c6:af:29:41:cb:0a:1d:e9:24:a6:45:0d:87:e9:c8:5b: + 74:9b:8a:ac:60:3b:7f:43:8a:6c:a1:4e:4f:d3:c1:c0:ff:a5: + 80:0e:c9:47:df:6b:2a:f1:21:a1:6b:46:25:0f:86:98:92:55: + 1d:d4:b0:ed:61:51:ef:e5:50:db:0e:e2:5b:f5:6c:e7:dc:9f: + f6:2e:b2:0f:30:fc:d3:9c:25:8a:03:d6:8b:5b:98:35:99:e3: + af:cc:a8:83:55:91:b0:8f:ff:8a:12:15:2a:77:b5:38:6a:6d: + 3e:6c:4c:61:4d:33:9a:fb:23:20:6a:4e:bd:a5:f7:f9:04:a3: + 20:89:b5:1f:98:cb:98:19:07:22:90:c2:8b:30:1c:eb:29:d5: + 8f:0e:d6:de:9d:8c:a8:43:cc:a2:02:5d:31:ea:25:91:87:4a: + 1c:2e:ce:f1:e0:d7:0a:69:ac:82:04:c5:c9:34:0c:3d:e0:2c: + 5e:a9:9d:15:ac:4c:8f:b2:9a:7b:a4:7c:b5:d5:ff:58:f8:e1: + 46:fa:a3:71 -----BEGIN CERTIFICATE----- -MIIEYjCCA0qgAwIBAgIBDDANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJDTjER +MIIFFzCCA/+gAwIBAgIBDjANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJDTjER MA8GA1UECBMIU2hhbmdoYWkxETAPBgNVBAcTCFNoYW5naGFpMRQwEgYDVQQKEwtN YXNoaXJvIExMQzErMCkGA1UEAxMiTWFzaGlybyBJbnRlcm5ldCBGYWtlIEF1dGhv -cml0eSBDQTAeFw0xOTAxMjgxNTU1MzdaFw0yOTAxMjUxNTU1MzdaMEwxCzAJBgNV +cml0eSBDQTAeFw0xOTA2MjIwNjQ3NTNaFw0yOTA2MTkwNjQ3NTNaMEwxCzAJBgNV BAYTAkNOMREwDwYDVQQIEwhTaGFuZ2hhaTEUMBIGA1UEChMLTWFzaGlybyBMTEMx FDASBgNVBAMUCyoucGl4aXYubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEAtmmwhUCtdCxKaF2cm4gVd5UeSAm/SQ53lPxmvTMFKPfo3alwWdNqorNm -b6w3n+a9S0HUGBrb5sfKdKHXKSsRWrhZcGxHyHft3F6Uz6aVjKtCXp/7CJg1bJbz -pS7trpPh10gDJ0NJiRnAUTqyEGVOedn65sCY2zRrR2ElKU4jQNsPBpRjBJyzr702 -D0E4LF5RxUYXXIgslY512l6BVYjfrd0ysMqWKEVrwhPGNdNNQen08cRdOlIA77WW -ay0/MKVZx1FnQZTjOfKoyvSr5zr58dyPu66V00jlSIJGlIOQRF9MzWHEtyeoVjoi -tsIFdrKn2lhYKXQWAnm/Fi1zAagT4wIDAQABo4IBIzCCAR8wHQYDVR0OBBYEFAR5 -JwuouTmcLvCmiEpzONi9L0y9MB8GA1UdIwQYMBaAFD9sN3GPdBsoWg/CKcErBX7R -JNRUMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMIHEBgNVHREEgbwwgbmCCyoucGl4 -aXYubmV0gglwaXhpdi5uZXSCG3B1YmxpYy1hcGkuc2VjdXJlLnBpeGl2Lm5ldIIS -Ki5zZWN1cmUucGl4aXYubmV0ghJ3d3cucGl4aXZpc2lvbi5uZXSCCHBpeGl2Lm1l -gglweGltZy5uZXSCCyoucHhpbWcubmV0gg13aWtpcGVkaWEub3Jngg8qLndpa2lw -ZWRpYS5vcmeCCmdvb2dsZS5jb22CDCouZ29vZ2xlLmNvbTANBgkqhkiG9w0BAQsF -AAOCAQEAMtlAN4OBBy6ui7y+9hG5pOPTKMmX5rSAG2lXuxvkzuG01dGRHF1XfcUZ -FWeRxdsmepb8cIRcy78gePQupRalQAwHtcOz+V4aZruMR+y9asx8oSrVW+e7kR7l -2UME9vkbE6PZ6npN/6zVsRrxBna3n8olqtOzrzc6H03xUIGRFvWIXatvGYyUWWQu -lCNmYA1W7kwK4tYJsUIh1U7pAMkdIxrZ2BqB0e9lhTthY0/F0dO4Q8sUb9ZCald6 -ygkABHdF8QXaObzqFPg/c0PF8Yh7z23dFDuIoIlW0PU3n2W3VlDnkTrvyQU8CYc8 -Qfrzv2QAon++Xyrgnw4FeBmw8So85A== +CgKCAQEAzgAYzGRwrFmwRZ7D7p6bslZZQ6q3mGu7hobJu7btVLhW3uwYBmJZJzvS +FkqKhq1AK2lq3CESS8r9hagB3ewqIKJusMKneYj59DSV+4W/8McdVyn4pWLjtp5S +90IqDFpcbbQwUU7BQFfGWFcYR5xZnbc4u8wMaKpsaHa+b4SDEu9gLRFh2AHwCYWM +gPrw9iOVx5fBhlOXtdXcW6j4IkkKcC2SdxdB/Q66W6fOj2Ch/FqnhxkfEvbIsjL0 +qCJy7JfMmEgks03Eg3ueHRViYzf1tgxPtZczhx9nzQu7cXs4YMVPL61ARAqOrwxs +WvQAbZSj867y614UaAoDW8eJCdD5vQIDAQABo4IB2DCCAdQwHQYDVR0OBBYEFEy5 +9EnBgrUeOoFj+gwVeKX3Sq//MB8GA1UdIwQYMBaAFD9sN3GPdBsoWg/CKcErBX7R +JNRUMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMIIBeAYDVR0RBIIBbzCCAWuCCyou +cGl4aXYubmV0gglwaXhpdi5uZXSCEiouc2VjdXJlLnBpeGl2Lm5ldIIOcGl4aXZp +c2lvbi5uZXSCECoucGl4aXZpc2lvbi5uZXSCCHBpeGl2Lm1lggoqLnBpeGl2Lm1l +gglweGltZy5uZXSCCyoucHhpbWcubmV0gg9waXhpdnNrZXRjaC5uZXSCESoucGl4 +aXZza2V0Y2gubmV0ghtwdWJsaWMtYXBpLnNlY3VyZS5waXhpdi5uZXSCDXdpa2lw +ZWRpYS5vcmeCDyoud2lraXBlZGlhLm9yZ4IPbS53aWtpcGVkaWEub3JnghEqLm0u +d2lraXBlZGlhLm9yZ4IKZ29vZ2xlLmNvbYIMKi5nb29nbGUuY29tghJzdGVhbWNv +bW11bml0eS5jb22CFCouc3RlYW1jb21tdW5pdHkuY29tghBzdGVhbXBvd2VyZWQu +Y29tghIqLnN0ZWFtcG93ZXJlZC5jb20wDQYJKoZIhvcNAQELBQADggEBAG0Lqwqm +CLFChBW568i/kp/MouGZw78TtW/cn0/Z3ZG8vpLB9GZSi+eqqnqcXB/prNBbd0o1 +25aKxq8pQcsKHekkpkUNh+nIW3SbiqxgO39DimyhTk/TwcD/pYAOyUffayrxIaFr +RiUPhpiSVR3UsO1hUe/lUNsO4lv1bOfcn/Yusg8w/NOcJYoD1otbmDWZ46/MqINV +kbCP/4oSFSp3tThqbT5sTGFNM5r7IyBqTr2l9/kEoyCJtR+Yy5gZByKQwoswHOsp +1Y8O1t6djKhDzKICXTHqJZGHShwuzvHg1wpprIIExck0DD3gLF6pnRWsTI+ymnuk +fLXV/1j44Ub6o3E= -----END CERTIFICATE----- diff --git a/conf/ca/pixiv.net.key b/conf/ca/pixiv.net.key index 94720a0..b0079b7 100644 --- a/conf/ca/pixiv.net.key +++ b/conf/ca/pixiv.net.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/conf/nginx.conf b/conf/nginx.conf index 9b1104f..ac2db95 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -47,6 +47,14 @@ http { server 210.140.175.130:443; } + upstream sketch-hls-server { + server 210.140.214.58:443; + server 210.140.214.59:443; + server 210.140.214.60:443; + server 210.140.214.63:443; + server 210.140.214.64:443; + } + upstream imgaz-pixiv-net { server 210.140.131.145:443; server 210.140.131.144:443; @@ -144,6 +152,34 @@ http { } } + server { + listen 443 ssl; + server_name hlsa1.pixivsketch.net; + server_name hlsa2.pixivsketch.net; + server_name hlsa3.pixivsketch.net; + server_name hlsa4.pixivsketch.net; + server_name hlsa5.pixivsketch.net; + server_name hlsa6.pixivsketch.net; + server_name hlsa7.pixivsketch.net; + server_name hlsa8.pixivsketch.net; + server_name hlsa9.pixivsketch.net; + server_name hlsa6.pixivsketch.net; + + ssl on; + ssl_certificate ca/pixiv.net.crt; + ssl_certificate_key ca/pixiv.net.key; + + location / { + proxy_pass https://sketch-hls-server; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Real_IP $remote_addr; + proxy_set_header User-Agent $http_user_agent; + proxy_set_header Accept-Encoding ''; + proxy_buffering off; + } + } + server { listen 443 ssl; server_name factory.pixiv.net; @@ -248,8 +284,9 @@ http { ssl_certificate_key ca/pixiv.net.key; location / { - root html; - index index.html index.htm; + #root html; + #index index.html index.htm; + rewrite ^/(.*)$ https://www.recaptcha.net/$1 redirect; } error_page 500 502 503 504 /50x.html; diff --git a/logs/nginx.pid b/logs/nginx.pid index e3d9166..0f2c972 100644 --- a/logs/nginx.pid +++ b/logs/nginx.pid @@ -1 +1 @@ -9560 +9152 diff --git a/配置文件（非Windows用户使用）/nginx.conf b/配置文件（非Windows用户使用）/nginx.conf index 41b7fe4..d124701 100644 --- a/配置文件（非Windows用户使用）/nginx.conf +++ b/配置文件（非Windows用户使用）/nginx.conf @@ -248,7 +248,7 @@ http { ssl_certificate_key ca/pixiv.net.key; location / { - rewrite ^/(.*)$ https://pages.shino.cc/$1 redirect; + rewrite ^/(.*)$ https://www.recaptcha.net/$1 redirect; } }