From f5d8a46829f0762cdda1d2a2121a25b755d320a0 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Tue, 6 Aug 2024 06:31:07 +0000 Subject: [PATCH 01/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aed9a8a..faa8a39 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# 科研管理平台 +# 绉戠爺绠＄悊骞冲彴銆 From 6aeb846ca442c7bd66fdd14b2a983382def58474 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Tue, 6 Aug 2024 06:58:23 +0000 Subject: [PATCH 02/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e0b66f4..0b3ea13 100644 --- a/.drone.yml +++ b/.drone.yml @@ -65,7 +65,7 @@ steps: - cat docker.sh - sh docker.sh # 鎵ц瀹岃剼鏈垹闄ゆ湰娆″埗浣滅殑docker闀滃儚,閬垮厤澶氭鍚庡綋鍓峳unner绌洪棿涓嶈冻 - - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') + # - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') when: branch: - prod From 522eb5025ce112661ecb6b6f2752c5aa8de7b6cc Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Tue, 6 Aug 2024 07:05:02 +0000 Subject: [PATCH 03/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 0b3ea13..e0b66f4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -65,7 +65,7 @@ steps: - cat docker.sh - sh docker.sh # 鎵ц瀹岃剼鏈垹闄ゆ湰娆″埗浣滅殑docker闀滃儚,閬垮厤澶氭鍚庡綋鍓峳unner绌洪棿涓嶈冻 - # - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') + - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') when: branch: - prod From 3b1b822882f40cf6c0ba3155d95d321a7d5989a0 Mon Sep 17 00:00:00 2001 From: zhangkaihuai <1942223609@qq.com> Date: Wed, 19 Mar 2025 15:29:56 +0800 Subject: [PATCH 04/19] =?UTF-8?q?nginx=20ssl=20=E8=AF=81=E4=B9=A6=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 ++ mosr.feashow.cn_chain.crt | 72 +++++++++++++++++++++++++++++++++++++++ nginx.conf | 25 +++++++++++++- private.key | 28 +++++++++++++++ 4 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 mosr.feashow.cn_chain.crt create mode 100644 private.key diff --git a/Dockerfile b/Dockerfile index d19f127..df6a735 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,8 @@ RUN rm -rf /etc/nginx/conf.d/default.conf RUN rm -rf /etc/nginx/nginx.conf COPY default.conf /etc/nginx/conf.d COPY nginx.conf /etc/nginx/ +COPY mosr.feashow.cn_chain.crt /etc/nginx/ +COPY private.key /etc/nginx/ #RUN useradd -b /home/clay -m -s /bin/bash clay #RUN chmod a+xr -R /home/clay && chown clay:clay -R /home/clay diff --git a/mosr.feashow.cn_chain.crt b/mosr.feashow.cn_chain.crt new file mode 100644 index 0000000..163064c --- /dev/null +++ b/mosr.feashow.cn_chain.crt @@ -0,0 +1,72 @@ +-----BEGIN CERTIFICATE----- +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 +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFnjCCBIagAwIBAgIQCSYyO0lk42hGFRLe8aXVLDANBgkqhkiG9w0BAQsFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH +MjAeFw0yNTAxMDgwMDAwMDBaFw0zNTAxMDcyMzU5NTlaMFsxCzAJBgNVBAYTAkNO +MSUwIwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSUwIwYDVQQD +ExxUcnVzdEFzaWEgRFYgVExTIFJTQSBDQSAyMDI1MIICIjANBgkqhkiG9w0BAQEF +AAOCAg8AMIICCgKCAgEA0fuEmuBIsN6ZZVq+gRobMorOGIilTCIfQrxNpR8FUZ9R +/GfbiekbiIKphQXEZ7N1uBnn6tXUuZ32zl6jPkZpHzN/Bmgk1BWSIzVc0npMzrWq +/hrbk5+KddXJdsNpeG1+Q8lc8uVMBrztnxaPb7Rh7yQCsMrcO4hgVaqLJWkVvEfW +ULtoCHQnNaj4IroG6VxQf1oArQ8bPbwpI02lieSahRa78FQuXdoGVeQcrkhtVjZs +ON98vq5fPWZX2LFv7e5J6P9IHbzvOl8yyQjv+2/IOwhNSkaXX3bI+//bqF9XW/p7 ++gsUmHiK5YsvLjmXcvDmoDEGrXMzgX31Zl2nJ+umpRbLjwP8rxYIUsKoEwEdFoto +Aid59UEBJyw/GibwXQ5xTyKD/N6C8SFkr1+myOo4oe1UB+YgvRu6qSxIABo5kYdX +FodLP4IgoVJdeUFs1Usa6bxYEO6EgMf5lCWt9hGZszvXYZwvyZGq3ogNXM7eKyi2 +20WzJXYMmi9TYFq2Fa95aZe4wki6YhDhhOO1g0sjITGVaB73G+JOCI9yJhv6+REN +D40ZpboUHE8JNgMVWbG1isAMVCXqiADgXtuC+tmJWPEH9cR6OuJLEpwOzPfgAbnn +2MRu7Tsdr8jPjTPbD0FxblX1ydW3RG30vwLF5lkTTRkHG9epMgpPMdYP7nY/08MC +AwEAAaOCAVYwggFSMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFLQSKKW0 +wB2fKXFpPNkRlkp1aVDAMB8GA1UdIwQYMBaAFE4iVCAYlebjbuYP+vq5Eu0GF485 +MA4GA1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw +dgYIKwYBBQUHAQEEajBoMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2Vy +dC5jb20wQAYIKwYBBQUHMAKGNGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9E +aWdpQ2VydEdsb2JhbFJvb3RHMi5jcnQwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDov +L2NybDMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdEcyLmNybDARBgNV +HSAECjAIMAYGBFUdIAAwDQYJKoZIhvcNAQELBQADggEBAJ4a3svh316GY2+Z7EYx +mBIsOwjJSnyoEfzx2T699ctLLrvuzS79Mg3pPjxSLlUgyM8UzrFc5tgVU3dZ1sFQ +I4RM+ysJdvIAX/7Yx1QbooVdKhkdi9X7QN7yVkjqwM3fY3WfQkRTzhIkM7mYIQbR +r+y2Vkju61BLqh7OCRpPMiudjEpP1kEtRyGs2g0aQpEIqKBzxgitCXSayO1hoO6/ +71ts801OzYlqYW9OQQQ2GCJyFbD6XHDjdpn+bWUxTKWaMY0qedSCbHE3Kl2QEF0C +ynZ7SbC03yR+gKZQDeTXrNP1kk5Qhe7jSXgw+nhbspe0q/M1ZcNCz+sPxeOwdCcC +gJE= +-----END CERTIFICATE----- diff --git a/nginx.conf b/nginx.conf index 564c0ff..50961c8 100644 --- a/nginx.conf +++ b/nginx.conf @@ -25,9 +25,31 @@ http { keepalive_timeout 65; + # HTTP閲嶅畾鍚戝埌HTTPS server { listen 80; listen [::]:80; + server_name www.abc.com; + return 301 https://$host$request_uri; # 寮哄埗璺宠浆HTTPS + } + # 鏂板HTTPS鏈嶅姟鍣ㄥ潡 + server { + listen 443 ssl; + listen [::]:443 ssl; + server_name www.abc.com; + + # SSL璇佷功閰嶇疆锛堣矾寰勬牴鎹疄闄呬綅缃皟鏁达級 + ssl_certificate /etc/nginx/mosr.feashow.cn_chain.crt; + ssl_certificate_key /etc/nginx/private.key; + + # 浼樺寲SSL閰嶇疆 + ssl_protocols TLSv1.2 TLSv1.3; + ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; + ssl_prefer_server_ciphers off; + ssl_session_cache shared:SSL:10m; + ssl_session_timeout 1d; + ssl_session_tickets off; + location /api { proxy_pass http://gateway.$PROFILES.svc.cluster.local:8080; @@ -47,5 +69,6 @@ http { index index.html index.htm; try_files $uri $uri/ /index.html; } -} + + } } diff --git a/private.key b/private.key new file mode 100644 index 0000000..8f04a11 --- /dev/null +++ b/private.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCvdm0msnelqMBS +c/pXV/EBIEIlIxD8kAdK1fjqff3mUpqQusvg7kvwnXTj2l7PrdX1fS9pENclgwcn +O3GStj58xm/PlIfQUd1LVWgsSEhqsY77dldZSMF2wQzlI7ZFVZXIYRkfgazcz2Bs +jC4YHQQ8YSiuKIATTsdtwMwqUxhbFO7C/feqsGKNq4SBPFLmHMN3XkuEbXzFMc7e +fMJ9bPvZJIukLYu3S8NwYNHgl6Kfu/xQtPX4OTYdxMoDJWby8rzThYoPqPxZN+om +6djeeshSxH3vljY+MTwmnf9wnr4eQSIE7EgDwYeieSZOCF6C/D7gknPene/QYElR +jRoUbgoHAgMBAAECggEABmJQMV6/9LKRoM5gduoXtjtGvNQsS4wv/7yOTHXeFZG+ +1vI89cel0rDf7mRlG7hO9xohbfizY0WDrp0+kiB4YJDVw587W8yGuTV3z1in7d3c +/nA9WF3J0DjQ78tfV+F3zC0gPWG5+OTAtOJa0PzJSSsd0Exf8JPmtKsVopqYYcPv +RL2uP+NfcsxIEPz7rBBqiTGbOgsoKIpVZWiV6dmGOHLnI3ktWE8GXyIFv0VO6kp2 +fk/Z2uU9rfS9Qc9NijVdZ5AejdSh70iWNdiVMTSXZ69XLQCiY1h/376mraAPZTC1 +T0fYAtaOdyRrYLIW3yuznZa6hz351+t4TjJHQGjAUQKBgQDe8FS3yM85Ve3qlNaV +pzjpjkv8cn8u43Hyk88owNACxkvzUXx15YE+AGjjycVO5rbyC1mtdE2MKX8cd5T/ +cA75RoSDxBTR7xi9eqBzJpQ7hm2rTaZSkHhu4P9KsthgQFFYQB6EkZgYczLOs/OV +UmPMuKwL7HcwuRf00jjAOoJPdwKBgQDJe7R4PS0VBAWnh3lC9R/NEbEoFQ6LUwPh +Qgmgj6LRB/1NgaC7ekDCSyfFlTtpnRDD+WqCrZDiB1ZZehyUObvr0Y0Cb4Y77Fjh +lPVG0kfcKUldMpJIfeex0LPBwYHC62Y0ztNQmtgTldDjX04b4gAEgpUReHVTJtDr +6S1wRPVd8QKBgHIL0+roqUmVcc5NMbEBCJZCGxEbqYBdDg+gGZupdz/UHUpt5xOQ +wprrLr1InM0OLYyIzelz06/eEo6HhgteUeqnbmbRyizS+X8E2kvN8oq47CVz5Z/b +FCD0rOSTtSkX/gT9WB9NM9deJyGi4PsEWNWDq0+2OgsMxPqTCEEeLUdlAoGAHNmB +tdXMpr20sZBMZLIEo7Bs1XhuZLS2UYLLLhpjDds/AeIVycJvk2J/h2Me5rh+thD4 +l02S+Upjqtw5S2AY8GNI9ZhSeDIXZ/WUSVfCwluHDbk4CPk+O8/ObWfv1KEwOU+E +In6JggRprKTw4j0yE3M/NQkyg32DXMQ+pVy6ZYECgYEAmW/+vm3X2NMj8yjr0Io2 +P3F/9EHPkrGHNC3Qj6Q2mFus6oDe6NwOQg5Su0fFC77spHFi1g/MlGUxbzoxjVxH +1wQmwCHBJuJ97H9MOJ9K2v88/pkvfFGthkTLpbcJLqX57WVEVnVKBMNhpLrlp+0r +T3tV8tN010INwiQkaoqCsuw= +-----END PRIVATE KEY----- From 6bdbde262f5ab3b5fa180459d7a9bcf8e62e505c Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Wed, 19 Mar 2025 07:34:04 +0000 Subject: [PATCH 05/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20nginx.conf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.conf b/nginx.conf index 50961c8..8a98e07 100644 --- a/nginx.conf +++ b/nginx.conf @@ -29,7 +29,7 @@ http { server { listen 80; listen [::]:80; - server_name www.abc.com; + server_name mosr.feashow.cn; return 301 https://$host$request_uri; # 寮哄埗璺宠浆HTTPS } # 鏂板HTTPS鏈嶅姟鍣ㄥ潡 @@ -38,7 +38,7 @@ http { listen [::]:443 ssl; server_name www.abc.com; - # SSL璇佷功閰嶇疆锛堣矾寰勬牴鎹疄闄呬綅缃皟鏁达級 + # SSL璇佷功閰嶇疆 ssl_certificate /etc/nginx/mosr.feashow.cn_chain.crt; ssl_certificate_key /etc/nginx/private.key; From 42499bcb227dee8bd4e6cebb28d59878169f3141 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Wed, 19 Mar 2025 07:40:27 +0000 Subject: [PATCH 06/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20nginx.conf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index 8a98e07..4cdf0be 100644 --- a/nginx.conf +++ b/nginx.conf @@ -36,7 +36,7 @@ http { server { listen 443 ssl; listen [::]:443 ssl; - server_name www.abc.com; + server_name mosr.feashow.cn; # SSL璇佷功閰嶇疆 ssl_certificate /etc/nginx/mosr.feashow.cn_chain.crt; From d5a07e772f4bab8e6adefd8722d02b25289e0dd5 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Wed, 19 Mar 2025 07:55:07 +0000 Subject: [PATCH 07/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20nginx.conf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/nginx.conf b/nginx.conf index 4cdf0be..4ae9484 100644 --- a/nginx.conf +++ b/nginx.conf @@ -37,6 +37,7 @@ http { listen 443 ssl; listen [::]:443 ssl; server_name mosr.feashow.cn; + ssl on; # SSL璇佷功閰嶇疆 ssl_certificate /etc/nginx/mosr.feashow.cn_chain.crt; From 9a55494da7f178e3daa4ba1495ef2eaac94e01cf Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Wed, 19 Mar 2025 08:07:37 +0000 Subject: [PATCH 08/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20nginx.conf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index 4ae9484..9a9987c 100644 --- a/nginx.conf +++ b/nginx.conf @@ -37,7 +37,7 @@ http { listen 443 ssl; listen [::]:443 ssl; server_name mosr.feashow.cn; - ssl on; + # SSL璇佷功閰嶇疆 ssl_certificate /etc/nginx/mosr.feashow.cn_chain.crt; From f65663071a1013c652b1f34c5031112e790455a2 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Wed, 19 Mar 2025 12:13:31 +0000 Subject: [PATCH 09/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20nginx.conf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/nginx.conf b/nginx.conf index 9a9987c..ce43ff4 100644 --- a/nginx.conf +++ b/nginx.conf @@ -25,32 +25,10 @@ http { keepalive_timeout 65; - # HTTP閲嶅畾鍚戝埌HTTPS + server { listen 80; listen [::]:80; - server_name mosr.feashow.cn; - return 301 https://$host$request_uri; # 寮哄埗璺宠浆HTTPS - } - # 鏂板HTTPS鏈嶅姟鍣ㄥ潡 - server { - listen 443 ssl; - listen [::]:443 ssl; - server_name mosr.feashow.cn; - - - # SSL璇佷功閰嶇疆 - ssl_certificate /etc/nginx/mosr.feashow.cn_chain.crt; - ssl_certificate_key /etc/nginx/private.key; - - # 浼樺寲SSL閰嶇疆 - ssl_protocols TLSv1.2 TLSv1.3; - ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; - ssl_prefer_server_ciphers off; - ssl_session_cache shared:SSL:10m; - ssl_session_timeout 1d; - ssl_session_tickets off; - location /api { proxy_pass http://gateway.$PROFILES.svc.cluster.local:8080; @@ -70,6 +48,5 @@ http { index index.html index.htm; try_files $uri $uri/ /index.html; } - - } +} } From 023256630e48945116ac2ef63c754fa3d24423d6 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Wed, 19 Mar 2025 12:24:06 +0000 Subject: [PATCH 10/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index df6a735..0acc1eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ RUN rm -rf /etc/nginx/conf.d/default.conf RUN rm -rf /etc/nginx/nginx.conf COPY default.conf /etc/nginx/conf.d COPY nginx.conf /etc/nginx/ -COPY mosr.feashow.cn_chain.crt /etc/nginx/ -COPY private.key /etc/nginx/ +#COPY mosr.feashow.cn_chain.crt /etc/nginx/ +#COPY private.key /etc/nginx/ #RUN useradd -b /home/clay -m -s /bin/bash clay #RUN chmod a+xr -R /home/clay && chown clay:clay -R /home/clay From 3588257f610b500dfe4a0df652da13b941e52aa0 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Fri, 13 Jun 2025 06:18:21 +0000 Subject: [PATCH 11/19] revert 215f7c6bbf084b0bf6dbee1303a2539a3c21c3ad MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert feat(expense-management): 娣诲姞鐮斿彂宸ユ椂瓒呰繃21.75澶╃殑鎻愮ず鍔熻兘 - 鍦ㄤ繚瀛樺垎閰嶆槑缁嗘椂锛屽鍔犲鐮斿彂浜哄憳鎬诲伐鏃剁殑璁＄畻 - 濡傛灉鎬诲伐鏃惰秴杩21.75澶╋紝绯荤粺灏嗗彂鍑鸿鍛婇氱煡- 浼樺寲浜嗘帶鍒跺彴鏃ュ織杈撳嚭锛屼究浜庤皟璇曞拰鐩戞帶 From f42eacd06e7ed85359b91ed5e34078f7e294c2a9 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Sat, 14 Jun 2025 14:56:50 +0000 Subject: [PATCH 12/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 6cf24bb..42813b0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,6 +14,8 @@ steps: path: /drone/src/node_modules commands: - export CI=false + - rm -rf /drone/src/node_modules/* + - npm cache clean --force - mkdir -p /app/build/$DRONE_REPO_NAME - rm -rf /app/build/$DRONE_REPO_NAME/* - cp deployment.yml /app/build/$DRONE_REPO_NAME/ From f9ef5c70878e80c8a624953b6c0ffdeb51b34e2d Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Sat, 14 Jun 2025 15:20:57 +0000 Subject: [PATCH 13/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 42813b0..edb8e8f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,8 +13,6 @@ steps: - name: cache path: /drone/src/node_modules commands: - - export CI=false - - rm -rf /drone/src/node_modules/* - npm cache clean --force - mkdir -p /app/build/$DRONE_REPO_NAME - rm -rf /app/build/$DRONE_REPO_NAME/* From 4371ccb5e7c0ecead8b69d3ee6144694f8c71ca5 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Sat, 14 Jun 2025 15:25:22 +0000 Subject: [PATCH 14/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.drone.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index edb8e8f..6cf24bb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,7 +13,7 @@ steps: - name: cache path: /drone/src/node_modules commands: - - npm cache clean --force + - export CI=false - mkdir -p /app/build/$DRONE_REPO_NAME - rm -rf /app/build/$DRONE_REPO_NAME/* - cp deployment.yml /app/build/$DRONE_REPO_NAME/ From 5c000cdba3f25256ef82f21fdf45dfffe69e2d34 Mon Sep 17 00:00:00 2001 From: dj <1042039504@qq.com> Date: Sun, 15 Jun 2025 00:06:42 +0800 Subject: [PATCH 15/19] test : ci/cd --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6cf24bb..ac2133f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -29,8 +29,8 @@ steps: - npm config set registry https://registry.npmmirror.com - set NODE_OPTIONS=--openssl-legacy-provider - npm install --legacy-peer-deps - - npm install patch-package - - npx patch-package +# - npm install patch-package +# - npx patch-package # - npm info unplugin-icons - npm list package-manager-detector # - npm install unplugin-icons@latest @antfu/install-pkg@latest package-manager-detector@latest From 81d4002034bddd9e5a215ed1056b604a4eb00e64 Mon Sep 17 00:00:00 2001 From: dj <1042039504@qq.com> Date: Sun, 15 Jun 2025 00:10:47 +0800 Subject: [PATCH 16/19] test : ci/cd --- vite.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vite.config.js b/vite.config.js index c82dfb2..919142f 100644 --- a/vite.config.js +++ b/vite.config.js @@ -39,7 +39,7 @@ export default defineConfig({ ], }), Icons({ - autoInstall: true, + autoInstall: false, }), viteSvgIcons({ // 鎸囧畾闇瑕佺紦瀛樼殑鍥炬爣鏂囦欢澶 From 37a3cd75a201efb56315aa04fc2606a59c9f3e25 Mon Sep 17 00:00:00 2001 From: dj <1042039504@qq.com> Date: Sun, 15 Jun 2025 00:25:25 +0800 Subject: [PATCH 17/19] test : ci/cd --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 73ca23d..f865dd1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "mosr-web", "version": "0.0.0", + "type": "module", "private": true, "scripts": { "dev": "vite", From 34b0b88f07d83821a89cc24329ffd51e07282c11 Mon Sep 17 00:00:00 2001 From: dj <1042039504@qq.com> Date: Sun, 15 Jun 2025 00:31:01 +0800 Subject: [PATCH 18/19] test : ci/cd --- package.json | 2 +- vite.config.js => vite.config.mjs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) rename vite.config.js => vite.config.mjs (96%) diff --git a/package.json b/package.json index f865dd1..95c0889 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "scripts": { "dev": "vite", - "build": "vite build", + "build": "vite build --config vite.config.mjs", "preview": "vite preview" }, "overrides": { diff --git a/vite.config.js b/vite.config.mjs similarity index 96% rename from vite.config.js rename to vite.config.mjs index 919142f..756b64f 100644 --- a/vite.config.js +++ b/vite.config.mjs @@ -8,8 +8,10 @@ import IconsResolver from 'unplugin-icons/resolver' import vue from '@vitejs/plugin-vue' import vueJsx from '@vitejs/plugin-vue-jsx' import Inspect from 'vite-plugin-inspect' -import viteSvgIcons from 'vite-plugin-svg-icons' +// import viteSvgIcons from 'vite-plugin-svg-icons' import path from 'path' +import pkg from 'vite-plugin-svg-icons' +const viteSvgIcons = pkg.default // https://vitejs.dev/config/ export default defineConfig({ From 26e0009ebd72e9e4ff3b61e2153053807dc36a8b Mon Sep 17 00:00:00 2001 From: dj <1042039504@qq.com> Date: Sun, 15 Jun 2025 00:36:56 +0800 Subject: [PATCH 19/19] test : ci/cd --- vite.config.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vite.config.mjs b/vite.config.mjs index 756b64f..701ed03 100644 --- a/vite.config.mjs +++ b/vite.config.mjs @@ -41,7 +41,7 @@ export default defineConfig({ ], }), Icons({ - autoInstall: false, + autoInstall: true, }), viteSvgIcons({ // 鎸囧畾闇瑕佺紦瀛樼殑鍥炬爣鏂囦欢澶