feat: 合并main至dev

Author: LOG1997

.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+dist

.github/workflows/node.js.yml

@@ -15,7 +15,7 @@ jobs:
       contents: read
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

.gitignore

@@ -128,3 +128,4 @@ dist
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.*
+target

Dockerfile

@@ -0,0 +1,37 @@
+# 使用官方的 Node 镜像作为基础镜像
+FROM node:20.12.2
+
+# 设置工作目录
+WORKDIR /usr/src/app
+
+# 将本地的 Vite 项目文件复制到工作目录
+COPY . .
+
+# 安装依赖
+
+RUN npm install pnpm -g
+
+RUN pnpm install
+
+# 执行 Vite 构建命令，生成 dist 目录
+RUN pnpm build
+
+# 使用 Nginx 镜像作为运行时镜像
+FROM nginx:1.26
+
+# 修改nginx配置
+# 向 #error_page 前添加内容
+# location /log-lottery {
+#           alias /usr/share/nginx/log-lottery;
+#           index index.html index.htm;
+#           try_files $uri $uri/ /log-lottery/index.html;
+#         }
+RUN sed -i 's/#error_page/location \/log-lottery {\n          alias \/usr\/share\/nginx\/log-lottery;\n          index index.html index.htm;\n          try_files $uri $uri\/ \/log-lottery\/index.html;\n        }\n#error_page/' /etc/nginx/conf.d/default.conf
+
+# 将 Vite 项目的 dist 目录复制到 Nginx 的默认静态文件目录
+COPY --from=0 /usr/src/app/dist /usr/share/nginx/log-lottery
+
+# 暴露容器的 80 端口
+EXPOSE 80
+
+# Nginx 会在容器启动时自动运行，无需手动设置 CMD

README.md

@@ -1,20 +1,26 @@
-<p align="center">
-    <a href="http://www.form-create.com">
-        <svg t="1704902663531" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4318" width="200" height="200"><path d="M433.230769 630.153846m-275.692307 0a275.692308 275.692308 0 1 0 551.384615 0 275.692308 275.692308 0 1 0-551.384615 0Z" fill="#E2FFFF" p-id="4319"></path><path d="M512 0C228.903385 0 0 228.903385 0 512s228.903385 512 512 512 512-228.903385 512-512S795.096615 0 512 0z m42.968615 938.653538V883.396923c0-27.608615-21.464615-46.040615-46.040615-46.040615-24.536615 0-46.040615 21.504-46.040615 46.08v55.21723c-196.450462-21.464615-356.036923-181.090462-377.540923-377.540923H140.603077c24.536615 0 46.040615-21.504 46.040615-46.08 0-24.536615-21.504-46.001231-46.08-46.00123H85.385846c18.392615-199.522462 178.018462-362.220308 377.540923-383.684923v61.36123c0 24.576 21.504 46.08 46.08 46.08 24.536615 0 46.001231-21.504 46.001231-46.08V85.346462c202.594462 21.464615 365.292308 181.090462 383.684923 383.684923h-61.361231c-27.648 0-46.08 18.392615-46.08 46.040615 0 24.536615 21.504 46.040615 46.08 46.040615h61.361231c-21.464615 199.522462-184.162462 359.148308-383.684923 377.540923z" fill="#437DFF" p-id="4320"></path><path d="M499.396923 291.170462a19.692308 19.692308 0 0 1 25.245539 0.039384l2.520615 2.520616 9.964308 12.169846C625.427692 414.208 669.538462 495.340308 669.538462 549.218462 669.538462 637.44 599.04 708.923077 512 708.923077s-157.538462-71.483077-157.538462-159.704615c0-49.900308 37.809231-123.155692 113.506462-219.72677l18.904615-23.630769 9.964308-12.130461a19.692308 19.692308 0 0 1 2.599385-2.56z m12.603077 110.434461l-9.570462 13.075692-13.23323 18.747077-11.815385 17.644308C447.763692 496.679385 433.230769 530.313846 433.230769 549.218462c0 44.937846 35.524923 80.935385 78.769231 80.935384 43.244308 0 78.769231-35.997538 78.769231-80.935384 0-16.305231-11.027692-43.992615-33.437539-81.053539l-10.318769-16.462769a790.843077 790.843077 0 0 0-11.697231-17.565539l-13.115077-18.668307-10.200615-13.863385z" fill="#437DFF" p-id="4321"></path></svg>
+<div align="center">
+    <a href="https://log1997.github.io/log-lottery/">
+        <img src="./static/images/lottery.png" width="100" height="100" />
     </a>
-</p>
 
 # log-lottery 🚀🚀🚀🚀
 
+[![MIT](https://img.shields.io/github/package-json/v/log1997/log-lottery)](https://github.com/LOG1997/log-lottery)
 [![MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/LOG1997/log-lottery)
 [![github](https://img.shields.io/badge/Author-log1997-blue.svg)](https://github.com/log1997)
-[![vue3](https://img.shields.io/badge/VUE-3.0-green.svg)](https://github.com/log1997)
+[![vue3](https://img.shields.io/badge/VUE-3-green.svg)](https://github.com/log1997)
+[![build](https://img.shields.io/github/actions/workflow/status/log1997/log-lottery/node.js.yml)](https://github.com/log1997)
+
+</div>
 
 log-lottery是一个可配置可定制化的抽奖应用，炫酷3D球体，可用于年会抽奖等活动，支持奖品、人员、界面、图片音乐配置。
 
 > 因原域名到期，现将原域名 (<https://24years.top/log-lottery>)
 迁移到 (<https://1kw20.fun/log-lottery>) 。
-如果进入到新域名遇到图片无法访问的情况，请到【全局配置】-【界面配置】菜单中点击【重置所有数据】按钮进行更新
+
+> 如果进入网站遇到图片无法显示或有报错的情况，请先到【全局配置】-【界面配置】菜单中点击【重置所有数据】按钮清除数据后进行更新。
+
+> 请尽量拉取代码进行构建部署，本线上网站代码会保持更新，可能影响原有功能和数据。
 
 ## 要求
 
@@ -38,10 +44,13 @@ or
 - [x] 🖼️ excel表格导入人员名单、抽奖结果使用excel导出
 - [x] 🎈 可增加临时抽奖
 - [x] 🧨 国际化多语言
-- [ ] 添加docker构建部署和镜像
-- [ ] 更换背景图片
+- [x] 🍃 更换背景图片
+- [x] 🚅 添加docker构建
+- [x] 😘 弹幕（开发中）
+- [ ] 🧵 卡片组成多种形状
+
 ...
-需要更多功能请留言
+需要更多功能或发现bug请留言[issues](https://github.com/LOG1997/log-lottery/issues)
 
 ## 详细介绍
 
@@ -105,24 +114,64 @@ or
 
 ```bash
 pnpm i
+or
+npm install
 ```
 
 开发运行
 
 ```bash
 pnpm dev
+or
+npm run dev
 ```
 
 打包
 
 ```bash
 pnpm build
+or
+npm run build
+```
+
+预览
+
+```bash
+pnpm preview
+or
+npm run preview
+```
+
+若想直接以打开html文件的方式运行，请执行以下命令进行打包。打包完成后在dist目录中直接打开index.html即可。
+
+```bash
+pnpm build:file
+or
+npm run build:file
 ```
 
 > 项目思路来源于 <https://github.com/moshang-xc/lottery>
 
+## Docker支持
+
+构建镜像
+
+```bash
+docker build -t log-lottery .
+```
+
+运行容器
+
+```bash
+docker run -d -p 9279:80 log-lottery
+```
+
+容器运行成功后即可在本地通过<http://localhost:9279/log-lottery/>访问
+
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=LOG1997/log-lottery&type=Date)](https://star-history.com/#LOG1997/log-lottery&Date)
+
 ## License
 
 [MIT](http://opensource.org/licenses/MIT)
-
-Copyright (c) 2024-present log1997

eslint.config.js

@@ -1,12 +1,7 @@
 import antfu from '@antfu/eslint-config'
 
 export default antfu(
-    {
-        ignores: ['**/node_modules', '**/public', '**/dist', '**/package.json', '**/*.yaml', '**/.gitignore', '**/.env*', '**/tsconfig*']
-    },
-    {
-        rules: {
-          "no-console": [1],
-        },
-      },
-)
+  {
+    ignores: ['**/node_modules', '**/public', '**/dist', '**/package.json', '**/*.yaml', '**/.gitignore', '**/.env*', '**/tsconfig*'],
+  },
+)

package.json

@@ -1,13 +1,14 @@
 {
     "name": "log-lottery",
     "private": true,
-    "version": "0.0.2",
+    "version": "0.0.3",
     "type": "module",
     "license": "MIT",
     "scripts": {
         "dev": "vite --host 0.0.0.0",
         "build": "vue-tsc --noEmit && vite build",
         "build:pre": "vue-tsc --noEmit && vite build --mode prebuild",
+        "build:file": "vue-tsc --noEmit && vite build --mode file",
         "test": "vitest",
         "test:ui": "vitest --ui",
         "preview": "vite preview",
@@ -52,6 +53,7 @@
         "@types/three": "^0.166.0",
         "@typescript-eslint/eslint-plugin": "^8.16.0",
         "@typescript-eslint/parser": "^8.16.0",
+        "@vitejs/plugin-legacy": "^6.0.0",
         "@vitejs/plugin-vue": "^5.2.0",
         "@vitest/ui": "^2.1.5",
         "@vue/test-utils": "^2.4.6",