diff --git a/.env.production b/.env.production index b0a7302..d4bf382 100644 --- a/.env.production +++ b/.env.production @@ -23,12 +23,12 @@ VITE_BASE_API_RETRY=5 VITE_BASE_API_RETRY_DELAY=3000 # 是否在打包时使用cdn替换本地库 替换 true 不替换 false -VITE_CDN=true +VITE_CDN=false # 是否启用gzip压缩或brotli压缩（分两种情况，删除原始文件和不删除原始文件） # 压缩时不删除原始文件的配置：gzip、brotli、both（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认） # 压缩时删除原始文件的配置：gzip-clear、brotli-clear、both-clear（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认） -VITE_COMPRESSION="none" +VITE_COMPRESSION="gzip" # 开发环境读取配置文件路径 VITE_PUBLIC_PATH=/ diff --git a/.gitignore b/.gitignore index 423ed2b..72dee2f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,11 @@ dist-ssr report.html vite.config.*.timestamp* +bunny-web.site.csr +bunny-web.site.key +bunny-web.site_bundle.crt +bunny-web.site_bundle.pem + yarn.lock npm-debug.log* .pnpm-error.log* @@ -19,4 +24,5 @@ tests/**/coverage/ *.ntvs* *.njsproj *.sln -tsconfig.tsbuildinfo \ No newline at end of file +tsconfig.tsbuildinfo + diff --git a/ReadMe.md b/ReadMe.md index 7ad029b..344f007 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -1,3 +1,11 @@ +# 感谢 + +项目由[小铭](https://github.com/xiaoxian521)开源权限模板[Pure-admin](https://pure-admin.github.io/vue-pure-admin/) + +Pure-admin文档：https://pure-admin.github.io/pure-admin-doc + +项目整体都由此模板开发 + # 项目预览 不知道为什么，图床用的使自己的，Gitee就是不显示其它GitHub和Gitea都能显示就Gitee显示不出来，如果想用Gitee就把ReadMe文件下载下来也行；或者把项目clone下来看也可以 diff --git a/build/server.ts b/build/server.ts index 016dc2a..e244a00 100644 --- a/build/server.ts +++ b/build/server.ts @@ -10,6 +10,10 @@ export const serverOptions = (mode: string) => { open: true, cors: true, proxy: { + '/api/v1/': { + target: 'http://129.211.31.58:3000', + changeOrigin: true, + }, '/api': { target: VITE_APP_URL, changeOrigin: true, diff --git a/docker/Dockerfile b/docker/Dockerfile index ae2e543..349fcba 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,10 +6,10 @@ RUN rm /etc/nginx/conf.d/default.conf # 将自定义的 Nginx 配置文件复制到容器中 COPY nginx.conf /etc/nginx/conf.d/default.conf -COPY bunny-web.site.csr /etc/nginx/bunny-web.site.csr -COPY bunny-web.site.key /etc/nginx/bunny-web.site.key -COPY bunny-web.site_bundle.crt /etc/nginx/bunny-web.site_bundle.crt -COPY bunny-web.site_bundle.pem /etc/nginx/bunny-web.site_bundle.pem +#COPY bunny-web.site.csr /etc/nginx/bunny-web.site.csr +#COPY bunny-web.site.key /etc/nginx/bunny-web.site.key +#COPY bunny-web.site_bundle.crt /etc/nginx/bunny-web.site_bundle.crt +#COPY bunny-web.site_bundle.pem /etc/nginx/bunny-web.site_bundle.pem # 设置时区，构建镜像时执行的命令 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime @@ -24,7 +24,7 @@ COPY dist/ /usr/share/nginx/html COPY dist/ /etc/nginx/html # 暴露 Nginx 的默认端口 -EXPOSE 443 +EXPOSE 80 # 自动启动 Nginx CMD ["nginx", "-g", "daemon off;"] diff --git a/docker/bunny-web.site.csr b/docker/bunny-web.site.csr deleted file mode 100644 index 8470be1..0000000 --- a/docker/bunny-web.site.csr +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIC/DCCAeQCAQAwgYoxCzAJBgNVBAYTAkNOMRAwDgYDVQQIEwdCZWlqaW5nMRAw -DgYDVQQHEwdCZWlqaW5nMQ8wDQYDVQQKEwZxY2xvdWQxDzANBgNVBAsTBnFjbG91 -ZDEXMBUGA1UEAxMOYnVubnktd2ViLnNpdGUxHDAaBgNVBAUTEzcwMjQ3NDk4NzQ4 -Mjg1OTA5MzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD1Ld0oD+qm -7JM6uEphC+HfNPhVA3IgCSEXxaNOe+WzrvVefopk7odWpjZMCRMm8kS3YUXJI3as -ff0NMJbmih7h7ESeQsd+JoPs+nIwFPovNYzjTfdw2Q0HQZ5zladbg4v7j1JWHQ4/ -7PpxhsD08KJ5hidGO6pq7WF+LDvm824teYhdGBCjqCBfsF7FSe0htVIFF6g1c4fC -s/HLW+PLz/Crkr58OQZHEhyeC+wmnB1H5QBZHh2peNvfSgCXs5CQutGVtewfIsAU -BLkHE6xFeYv1kWIguuycQ6FBFL+fRUAcXS9n8OXAwbIuTLeRLShtqBGQz4meSmC1 -UiJeedsKaawTAgMBAAGgLDAqBgkqhkiG9w0BCQ4xHTAbMBkGA1UdEQQSMBCCDmJ1 -bm55LXdlYi5zaXRlMA0GCSqGSIb3DQEBCwUAA4IBAQAEJRIgGVU0ij9TWdNFJ1y7 -YW67sGKH/zCjNfmwCWjvJ+zDDGxNpuwUiKj6jwDNL/ku99axIbJ3Rzn8HQ75N1M6 -IzNKTUtlEgYcj84khilGFOgS3Fr/BPpRLVjx0BdXHRO+sbKx5Gg2tqQwhVFqlJxM -MYXpSbzjs+RwFZhy30l6Zhpu6nfkj3tBZYE+gTiOQaKXyUNrGZAVdFzesEaOIVcv -oQFYFFU/HVsiizupS4tcL1GFko7fkNwXQ0Da3QEoA++JNC9RAi4iRfRjGxhnpk0N -LqGV9Y2ExFn5VBZNyab1TIGmr3xSeGz1BNLLyoquRbcmSOS0WPW8koawBe/P90bM ------END CERTIFICATE REQUEST----- \ No newline at end of file diff --git a/docker/bunny-web.site.key b/docker/bunny-web.site.key deleted file mode 100644 index e35f4c6..0000000 --- a/docker/bunny-web.site.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEA9S3dKA/qpuyTOrhKYQvh3zT4VQNyIAkhF8WjTnvls671Xn6K -ZO6HVqY2TAkTJvJEt2FFySN2rH39DTCW5ooe4exEnkLHfiaD7PpyMBT6LzWM4033 -cNkNB0Gec5WnW4OL+49SVh0OP+z6cYbA9PCieYYnRjuqau1hfiw75vNuLXmIXRgQ -o6ggX7BexUntIbVSBReoNXOHwrPxy1vjy8/wq5K+fDkGRxIcngvsJpwdR+UAWR4d -qXjb30oAl7OQkLrRlbXsHyLAFAS5BxOsRXmL9ZFiILrsnEOhQRS/n0VAHF0vZ/Dl -wMGyLky3kS0obagRkM+JnkpgtVIiXnnbCmmsEwIDAQABAoIBAGvG2oYG4Sa5rkrM -wl2AxKzC8zsjxaJRgQubJJuWmTXwfgoo5BtUQ4gSjqHEB3hCXXSjPPMbNMrEo12N -83eqVcMIgm1ze5B3y9x7h4CdaBEioCk3l8MylqiO7uFucuAmpn1R1mbmZOIzATCw -hNfng/SZxV/5UIOqkAXP2hE/BzrTapvzmYrKAYLqqLAfkuII5m16FgjbGuG4Dnch -l+voT93fCK0fZkwz70oNYSos1F73XourXXfauuWCBy9kbmizfHU3klqkATZqPt1W -cYSIaamZOWQ3PE66oRPDnGixTdw+IxPrr0htwXN7XKZVKgKzirBfDnI5HplUzPKL -bowZmRECgYEA+dmAjXNPJeIJBgVTIeGZ3Td9jnZq+EeD5LGGfJ2bncZ3ExCNsiV/ -djMSj0KFZlkc7GNydSaig0GMoLJzr3vOpYi4/areWNZ5Ar4BkH/1S/0u9v+kYox4 -5vp1JJ6jRSw60A2YH5LI7Wzs8r7S/rIWo0RT/WFvj2gXqKiEfbwCLWkCgYEA+zbt -88Ex+YOY1I2YYQL0eAH2l3DX4nqjJr6btsTZO/nd7tRI5v7VwOzdhU8YaC+Sj64+ -qPQUg/79cjlMO5FdVdX7k2Dms1ZcT6C9BnZ+NugEaZH9Sgmd2sBJNpGl0rAeZcSn -R/gYTC13Z5vtKbUMtpsXZydKwey4wOT0J7fhkhsCgYAHcBkqnNcrWopIOppZ9Nxe -wIslVZMjpwVfJoXJaeu7C7B5ydFeD023GBgiWamc/WQmCWPb5vWJkMb99bIJ9FaX -iPVw38hUvrXFhiCHy7ditrvSMJQVNvdWcPhRycM0iPeLQAxaTEVdBBQdud6QJH8W -By+06FSo4UFrDPE8yP8LmQKBgBKdJ1SAZCuQzKozM688gNDDlHn0Korle2FLjk4k -l9QR15fystQq3bvF0UQncC+IFtv+lTX/n+WH50+nXzaqtre9ez6YV3/CTmS4DEmG -TiPTXUBVSOdLfx7OUJ5yfE74Lchsodh7UZGTbN2IeDI28BI3u6wxBSEJYUcpr82h -ml0xAoGBALHmuJxcaawZn2KC467Z8xP6+ggxzjsnnk+GlfqeqSmlaSVBo0Di8Nz2 -ekHHzRSIL+YZ3dsfrgR4IVigrlYETHGZl4BAtU2Yi0+1T1qhgTFkPlATuB5uHBhf -dyULEujSQy+yeoS+RR+69XUswhhrNUgij9rKHDDjMHbdnKO0fSgs ------END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/docker/bunny-web.site_bundle.crt b/docker/bunny-web.site_bundle.crt deleted file mode 100644 index 2ad85d6..0000000 --- a/docker/bunny-web.site_bundle.crt +++ /dev/null @@ -1,64 +0,0 @@ ------BEGIN CERTIFICATE----- -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 -QT4W0Lc= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFBzCCA++gAwIBAgIRALIM7VUuMaC/NDp1KHQ76aswDQYJKoZIhvcNAQELBQAw -ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G -A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV -BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yMjAxMTAwMDAwMDBaFw0y -ODEyMzEyMzU5NTlaMFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEg -VGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgUlNBIERWIFRM -UyBDQSBHMjCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKjGDe0GSaBs -Yl/VhMaTM6GhfR1TAt4mrhN8zfAMwEfLZth+N2ie5ULbW8YvSGzhqkDhGgSBlafm -qq05oeESrIJQyz24j7icGeGyIZ/jIChOOvjt4M8EVi3O0Se7E6RAgVYcX+QWVp5c -Sy+l7XrrtL/pDDL9Bngnq/DVfjCzm5ZYUb1PpyvYTP7trsV+yYOCNmmwQvB4yVjf -IIpHC1OcsPBntMUGeH1Eja4D+qJYhGOxX9kpa+2wTCW06L8T6OhkpJWYn5JYiht5 -8exjAR7b8Zi3DeG9oZO5o6Qvhl3f8uGU8lK1j9jCUN/18mI/5vZJ76i+hsgdlfZB -Rh5lmAQjD80M9TY+oD4MYUqB5XrigPfFAUwXFGehhlwCVw7y6+5kpbq/NpvM5Ba8 -SeQYUUuMA8RXpTtGlrrTPqJryfa55hTuX/ThhX4gcCVkbyujo0CYr+Uuc14IOyNY -1fD0/qORbllbgV41wiy/2ZUWZQUodqHWkjT1CwIMbQOY5jmrSYGBwwIDAQABo4IB -JjCCASIwHwYDVR0jBBgwFoAUoBEKIz6W8Qfs4q8p74Klf9AwpLQwHQYDVR0OBBYE -FF86fBEQfgxncWHci6O1AANn9VccMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMBAf8E -CDAGAQH/AgEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAE -GzAZMA0GCysGAQQBsjEBAgIxMAgGBmeBDAECATBDBgNVHR8EPDA6MDigNqA0hjJo -dHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNy -bDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9k -b2NhLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAHMUom5cxIje2IiFU7mOCsBr2F6CY -eU5cyfQ/Aep9kAXYUDuWsaT85721JxeXFYkf4D/cgNd9+hxT8ZeDOJrn+ysqR7NO -2K9AdqTdIY2uZPKmvgHOkvH2gQD6jc05eSPOwdY/10IPvmpgUKaGOa/tyygL8Og4 -3tYyoHipMMnS4OiYKakDJny0XVuchIP7ZMKiP07Q3FIuSS4omzR77kmc75/6Q9dP -v4wa90UCOn1j6r7WhMmX3eT3Gsdj3WMe9bYD0AFuqa6MDyjIeXq08mVGraXiw73s -Zale8OMckn/BU3O/3aFNLHLfET2H2hT6Wb3nwxjpLIfXmSVcVd8A58XH0g== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/bunny-web.site_bundle.pem b/docker/bunny-web.site_bundle.pem deleted file mode 100644 index 2ad85d6..0000000 --- a/docker/bunny-web.site_bundle.pem +++ /dev/null @@ -1,64 +0,0 @@ ------BEGIN CERTIFICATE----- -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 -QT4W0Lc= ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFBzCCA++gAwIBAgIRALIM7VUuMaC/NDp1KHQ76aswDQYJKoZIhvcNAQELBQAw -ezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G -A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV -BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0yMjAxMTAwMDAwMDBaFw0y -ODEyMzEyMzU5NTlaMFkxCzAJBgNVBAYTAkNOMSUwIwYDVQQKExxUcnVzdEFzaWEg -VGVjaG5vbG9naWVzLCBJbmMuMSMwIQYDVQQDExpUcnVzdEFzaWEgUlNBIERWIFRM -UyBDQSBHMjCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKjGDe0GSaBs -Yl/VhMaTM6GhfR1TAt4mrhN8zfAMwEfLZth+N2ie5ULbW8YvSGzhqkDhGgSBlafm -qq05oeESrIJQyz24j7icGeGyIZ/jIChOOvjt4M8EVi3O0Se7E6RAgVYcX+QWVp5c -Sy+l7XrrtL/pDDL9Bngnq/DVfjCzm5ZYUb1PpyvYTP7trsV+yYOCNmmwQvB4yVjf -IIpHC1OcsPBntMUGeH1Eja4D+qJYhGOxX9kpa+2wTCW06L8T6OhkpJWYn5JYiht5 -8exjAR7b8Zi3DeG9oZO5o6Qvhl3f8uGU8lK1j9jCUN/18mI/5vZJ76i+hsgdlfZB -Rh5lmAQjD80M9TY+oD4MYUqB5XrigPfFAUwXFGehhlwCVw7y6+5kpbq/NpvM5Ba8 -SeQYUUuMA8RXpTtGlrrTPqJryfa55hTuX/ThhX4gcCVkbyujo0CYr+Uuc14IOyNY -1fD0/qORbllbgV41wiy/2ZUWZQUodqHWkjT1CwIMbQOY5jmrSYGBwwIDAQABo4IB -JjCCASIwHwYDVR0jBBgwFoAUoBEKIz6W8Qfs4q8p74Klf9AwpLQwHQYDVR0OBBYE -FF86fBEQfgxncWHci6O1AANn9VccMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMBAf8E -CDAGAQH/AgEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAE -GzAZMA0GCysGAQQBsjEBAgIxMAgGBmeBDAECATBDBgNVHR8EPDA6MDigNqA0hjJo -dHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNy -bDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9k -b2NhLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAHMUom5cxIje2IiFU7mOCsBr2F6CY -eU5cyfQ/Aep9kAXYUDuWsaT85721JxeXFYkf4D/cgNd9+hxT8ZeDOJrn+ysqR7NO -2K9AdqTdIY2uZPKmvgHOkvH2gQD6jc05eSPOwdY/10IPvmpgUKaGOa/tyygL8Og4 -3tYyoHipMMnS4OiYKakDJny0XVuchIP7ZMKiP07Q3FIuSS4omzR77kmc75/6Q9dP -v4wa90UCOn1j6r7WhMmX3eT3Gsdj3WMe9bYD0AFuqa6MDyjIeXq08mVGraXiw73s -Zale8OMckn/BU3O/3aFNLHLfET2H2hT6Wb3nwxjpLIfXmSVcVd8A58XH0g== ------END CERTIFICATE----- \ No newline at end of file diff --git a/docker/nginx-ssl b/docker/nginx-ssl new file mode 100644 index 0000000..05490e0 --- /dev/null +++ b/docker/nginx-ssl @@ -0,0 +1,80 @@ +map $http_upgrade $connection_upgrade { + default upgrade; + '' close; +} + +server { + #SSL 默认访问端口号为 443 + listen 443 ssl; + #请填写绑定证书的域名 + server_name localhost; + #请填写证书文件的相对路径或绝对路径 + ssl_certificate bunny-web.site_bundle.crt; + #请填写私钥文件的相对路径或绝对路径 + ssl_certificate_key bunny-web.site.key; + ssl_session_timeout 5m; + #请按照以下协议配置 + ssl_protocols TLSv1.2 TLSv1.3; + #请按照以下套件配置，配置加密套件，写法遵循 openssl 标准。 + ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE; + ssl_prefer_server_ciphers on; + + location / { + root /etc/nginx/html; + index index.html index.htm; + try_files $uri /index.html; + } + + # 后端跨域请求 + location ~/admin/ { + proxy_pass http://172.17.0.1:8000; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + + # 后端跨域请求 + location ~/api/v1/ { + proxy_pass http://129.211.31.58:3000; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_redirect http:// https://; + } + + error_page 404 404.html; + + location = /50x.html { + root html; + } + } + +server { + listen 80 ; + listen [::]:80; + server_name localhost; + return 301 https://$host$request_uri; + + location / { + root /etc/nginx/html; + index index.html index.htm; + try_files $uri /index.html; + } + + # 后端跨域请求 + location ~/admin/ { + proxy_pass http://172.17.0.1:8000; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + + error_page 404 404.html; + + location = /50x.html { + root html; + } +} diff --git a/docker/nginx.conf b/docker/nginx.conf index 4be834d..fca77a4 100644 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -3,58 +3,10 @@ map $http_upgrade $connection_upgrade { '' close; } -server { - #SSL 默认访问端口号为 443 - listen 443 ssl; - #请填写绑定证书的域名 - server_name localhost; - #请填写证书文件的相对路径或绝对路径 - ssl_certificate bunny-web.site_bundle.crt; - #请填写私钥文件的相对路径或绝对路径 - ssl_certificate_key bunny-web.site.key; - ssl_session_timeout 5m; - #请按照以下协议配置 - ssl_protocols TLSv1.2 TLSv1.3; - #请按照以下套件配置，配置加密套件，写法遵循 openssl 标准。 - ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE; - ssl_prefer_server_ciphers on; - - location / { - root /etc/nginx/html; - index index.html index.htm; - try_files $uri /index.html; - } - - # 后端跨域请求 - location ~/admin/ { - proxy_pass http://172.17.0.1:8000; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - - # 后端跨域请求 - location ~/api/v1/ { - proxy_pass http://129.211.31.58:3000; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - - error_page 404 404.html; - - location = /50x.html { - root html; - } - } - server { listen 80 ; listen [::]:80; server_name localhost; - return 301 https://$host$request_uri; location / { root /etc/nginx/html; diff --git a/images/ReadMe/image-20241107133345299.png b/images/ReadMe/image-20241107133345299.png deleted file mode 100644 index c1b212d..0000000 Binary files a/images/ReadMe/image-20241107133345299.png and /dev/null differ diff --git a/index.html b/index.html index 80f6e51..8380b7a 100644 --- a/index.html +++ b/index.html @@ -5,9 +5,9 @@ diff --git a/src/views/welcome/components/server-read-me.vue b/src/views/welcome/components/server-read-me.vue index dbd57c6..bda03ea 100644 --- a/src/views/welcome/components/server-read-me.vue +++ b/src/views/welcome/components/server-read-me.vue @@ -8,7 +8,7 @@ const content = ref(); /** 获取文档信息 */ const onSearch = async () => { - const response = await fetch('/api/v1/repos/auth/auth-server-java/contents/ReadMe.md'); + const response = await fetch('http://129.211.31.58:3000/api/v1/repos/auth/auth-server-java/contents/ReadMe.md'); const json = await response.json(); content.value = decode(json.content); }; diff --git a/src/views/welcome/components/web-read-me.vue b/src/views/welcome/components/web-read-me.vue index 5963d62..3bf6655 100644 --- a/src/views/welcome/components/web-read-me.vue +++ b/src/views/welcome/components/web-read-me.vue @@ -8,7 +8,7 @@ const content = ref(); /** 获取文档信息 */ const onSearch = async () => { - const response = await fetch('/api/v1/repos/auth/auth-web/contents/ReadMe.md'); + const response = await fetch('http://129.211.31.58:3000/api/v1/repos/auth/auth-web/contents/ReadMe.md'); const json = await response.json(); content.value = decode(json.content); }; diff --git a/src/views/welcome/utils/hooks.ts b/src/views/welcome/utils/hooks.ts index 9aff996..be703eb 100644 --- a/src/views/welcome/utils/hooks.ts +++ b/src/views/welcome/utils/hooks.ts @@ -8,7 +8,7 @@ export const serverCommitList = ref([]); /** 获取web代码提交记录 */ export const getWebCommitList = async () => { - const response = await fetch('/api/v1/repos/auth/auth-web/commits?page=1&limit=20'); + const response = await fetch('http://129.211.31.58:3000/api/v1/repos/auth/auth-web/commits?page=1&limit=20'); const json = await response.json(); webCommitList.value = json.map(item => ({ date: dayjs(item?.commit?.committer?.date).format('YYYY-MM-DD HH:mm:ss'), @@ -21,7 +21,7 @@ export const getWebCommitList = async () => { }; /** 获取后端代码提交记录 */ export const getServerCommitList = async () => { - const response = await fetch('/api/v1/repos/auth/auth-server-java/commits?page=1&limit=20'); + const response = await fetch('http://129.211.31.58:3000/api/v1/repos/auth/auth-server-java/commits?page=1&limit=20'); const json = await response.json(); serverCommitList.value = json.map(item => ({ date: dayjs(item?.commit?.committer?.date).format('YYYY-MM-DD HH:mm:ss'),