diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..28c3dd8 Binary files /dev/null and b/.DS_Store differ diff --git a/.env.development b/.env.development index 38c86b7..634baf7 100644 --- a/.env.development +++ b/.env.development @@ -21,6 +21,3 @@ VITE_GAME_API='https://www.jdt168.com' # 转盘相关 VITE_TRUN_WS_URL='test.wanzhuanyongcheng.cn/admin/turntable' VITE_TRUN_WS1_URL='game2.wanzhuanyongcheng.cn/turntable/home' - -# 是否启用监控 -VITE_SENTRY=false diff --git a/.env.production b/.env.production index 1c4be82..22d5d42 100644 --- a/.env.production +++ b/.env.production @@ -23,6 +23,3 @@ VITE_MER_LOGIN_URL='//jdt-prod-mer.wanzhuanyongcheng.cn/login' # 转盘相关 VITE_TRUN_WS_URL='www.wanzhuanyongcheng.cn/admin/turntable' VITE_TRUN_WS1_URL='turntable.jdt168.com/turntable/home' - -# 是否启用监控 -VITE_SENTRY=true diff --git a/.env.sentry-build-plugin b/.env.sentry-build-plugin deleted file mode 100644 index 8024900..0000000 --- a/.env.sentry-build-plugin +++ /dev/null @@ -1,5 +0,0 @@ -# DO NOT commit this file to your repository! -# The SENTRY_AUTH_TOKEN variable is picked up by the Sentry Build Plugin. -# It's used for authentication when uploading source maps. -# You can also set this env variable in your own `.env` files and remove this file. -SENTRY_AUTH_TOKEN="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" diff --git a/.env.test b/.env.test index ea977af..f9d5019 100644 --- a/.env.test +++ b/.env.test @@ -27,6 +27,3 @@ VITE_MER_LOGIN_URL='//jdt-test-mer.wanzhuanyongcheng.cn/login' # 转盘相关 VITE_TRUN_WS_URL='test.wanzhuanyongcheng.cn/admin/turntable' VITE_TRUN_WS1_URL='game2.wanzhuanyongcheng.cn/turntable/home' - -# 是否启用监控 -VITE_SENTRY=false diff --git a/.vscode/settings.json b/.vscode/settings.json index 552ca0b..71eba6f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -25,7 +25,7 @@ }, "eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"], "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, "files.associations": { "*.env.*": "dotenv", diff --git a/build/plugin/index.js b/build/plugin/index.js index 8bd2520..d7d357a 100644 --- a/build/plugin/index.js +++ b/build/plugin/index.js @@ -14,7 +14,6 @@ import viteCompression from 'vite-plugin-compression' import { configHtmlPlugin } from './html' import { configMockPlugin } from './mock' import unplugin from './unplugin' -import { sentryVitePlugin } from '@sentry/vite-plugin' export function createVitePlugins(viteEnv, isBuild) { const plugins = [vue(), ...unplugin, configHtmlPlugin(viteEnv, isBuild), Unocss()] @@ -36,21 +35,5 @@ export function createVitePlugins(viteEnv, isBuild) { }) ) } - - if (viteEnv.VITE_SENTRY) { - plugins.push( - sentryVitePlugin({ - authToken: process.env.SENTRY_AUTH_TOKEN, - org: 'sentry', - project: 'jdt-admin', - url: 'https://w.huakk.top', - sourcemaps: { - ignore: ['node_modules'], - filesToDeleteAfterUpload: ['dist/**/*.js.map'], - }, - }) - ) - } - return plugins } diff --git a/drone.yml b/drone.yml new file mode 100644 index 0000000..84e91a5 --- /dev/null +++ b/drone.yml @@ -0,0 +1,157 @@ +kind: pipeline +type: docker +name: default + +platform: + os: linux + arch: amd64 + +steps: + - name: 测试服-依赖安装&&编译打包 + image: node:20-alpine + when: + branch: + - test + commands: + - npm config set registry https://registry.npmmirror.com/ + - npm install -g pnpm + - pnpm install + - pnpm build:test + - rm -rf dist.tar + - rm -rf node_modules + - tar -zcvf dist.tar ./dist ./default.conf ./Dockerfile + + - name: 正式服-依赖安装&&编译打包 + image: node:20-alpine + when: + branch: + - master + commands: + - npm config set registry https://registry.npmmirror.com/ + - npm install -g pnpm + - pnpm install + - pnpm build:prod + - rm -rf dist.tar + - rm -rf node_modules + - tar -zcvf dist.tar ./dist ./default.conf ./Dockerfile + + - name: 测试服-产物上传 + image: appleboy/drone-scp + when: + branch: + - test + settings: + host: + from_secret: HOST_DEV + username: + from_secret: USER_DEV + password: + from_secret: PWD_DEV + port: 22 + strip_components: 1 + target: /www/builder + source: + - ./dist.tar + + - name: 测试服-部署 + image: appleboy/drone-ssh + when: + branch: + - test + settings: + host: + from_secret: HOST_DEV + username: + from_secret: USER_DEV + password: + from_secret: PWD_DEV + port: 22 + script: + - cd /www/builder + - mkdir jdt-admin-dev + - tar -xzvf dist.tar -C /www/builder/jdt-admin-dev + - rm -rf dist.tar + - cd jdt-admin-dev + - docker build -t jdt-admin-dev . + - target_container="jdt-admin-dev" + - if docker ps -a --format '{{.Names}}' | grep -q "^$target_container$"; then + - echo "容器存在，执行操作..." + - docker stop jdt-admin-dev + - docker rm jdt-admin-dev + - else + - echo "容器不存在" + - fi + - docker run -d -p 8082:80 --restart=always --name jdt-admin-dev jdt-admin-dev + - cd .. + - rm -rf jdt-admin-dev + + - name: 正式服-产物上传 + image: appleboy/drone-scp + when: + branch: + - main + settings: + host: + from_secret: HOST_PROD + username: + from_secret: USER_PROD + password: + from_secret: PWD_PROD + port: 22 + strip_components: 1 + target: /www/builder + source: + - ./dist.tar + + - name: 正式服-部署 + image: appleboy/drone-ssh + when: + branch: + - main + settings: + host: + from_secret: HOST_PROD + username: + from_secret: USER_PROD + password: + from_secret: PWD_PROD + port: 22 + script: + - cd /www/builder + - mkdir jdt-admin-prod + - tar -xzvf dist.tar -C /www/builder/jdt-admin-prod + - rm -rf dist.tar + - cd jdt-admin-prod + - cd docker build -t jdt-admin-prod . + - target_container="jdt-admin-prod" + - if docker ps -a --format '{{.Names}}' | grep -q "^$target_container$"; then + - echo "容器存在，执行操作..." + - docker stop jdt-admin-prod + - docker rm jdt-admin-prod + - else + - echo "容器不存在" + - fi + - docker run -d -p 8085:80 --restart=always --name jdt-admin-prod jdt-admin-prod + - cd .. + - rm -rf jdt-admin-prod + + - name: 微信通知 + image: plugins/webhook + settings: + urls: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=a2065e21-4f92-4f5b-a432-2c0cd1d965b5 + content_type: application/json + template: | + { + "msgtype": "markdown", + "markdown": { + "content": "{{#success build.status}}✅{{else}}❌{{/success}}**{{ repo.owner }}/{{ repo.name }}** (Build #{{build.number}})\n + >**构建结果**: {{ build.status }} + >**构建详情**: [点击查看]({{ build.link }}) + >**代码分支**: {{ build.branch }} + >**提交标识**: {{ build.commit }} + >**提交发起**: {{ build.author }} + >**提交信息**: {{ build.message }} + >**构建耗时**: {{ job.started }}s + " + } + } diff --git a/package.json b/package.json index ee2a9df..4cd005f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vue-naive-admin", "version": "1.0.0", "scripts": { - "build": "vite build", + "build:prod": "vite build", "build:test": "vite build --mode test", "cz": "cz", "dev": "vite", @@ -32,8 +32,6 @@ ] }, "dependencies": { - "@sentry/vite-plugin": "^2.10.2", - "@sentry/vue": "^7.84.0", "@unocss/eslint-config": "^0.55.7", "@vueuse/core": "^10.6.1", "@wangeditor/editor": "^5.1.23", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2761fbe..f7d6b6a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,12 +5,6 @@ settings: excludeLinksFromLockfile: false dependencies: - '@sentry/vite-plugin': - specifier: ^2.10.2 - version: 2.10.2 - '@sentry/vue': - specifier: ^7.84.0 - version: 7.84.0(vue@3.3.4) '@unocss/eslint-config': specifier: ^0.55.7 version: 0.55.7(eslint@8.54.0)(typescript@5.3.2) @@ -1219,195 +1213,6 @@ packages: picomatch: 2.3.1 dev: true - /@sentry-internal/tracing@7.84.0: - resolution: {integrity: sha512-y9bGYA0OM6PEREfd+nk4UURZy29tpIw+7vQwpxWfEVs2fqq0/5TBFX/tKFb8AKUI9lVM8v0bcF0bNSCnuPQZHQ==} - engines: {node: '>=8'} - dependencies: - '@sentry/core': 7.84.0 - '@sentry/types': 7.84.0 - '@sentry/utils': 7.84.0 - dev: false - - /@sentry/browser@7.84.0: - resolution: {integrity: sha512-X50TlTKY9WzAnHsYc4FYrCWgm+CdVo0h02ggmodVBUpRLUBjj+cs5Q1plov/v/XeorSwmorNEMUu/n+XZNSsrA==} - engines: {node: '>=8'} - dependencies: - '@sentry-internal/tracing': 7.84.0 - '@sentry/core': 7.84.0 - '@sentry/replay': 7.84.0 - '@sentry/types': 7.84.0 - '@sentry/utils': 7.84.0 - dev: false - - /@sentry/bundler-plugin-core@2.10.2: - resolution: {integrity: sha512-7IoekLtROlJZqTxtHQ3IhocBuf9dsEq+JjqlHMyZXoq+QKuvJFvMd/4T+r6KjZ15kMZOIkR+spK3V7duH201hw==} - engines: {node: '>= 14'} - dependencies: - '@sentry/cli': 2.22.3 - '@sentry/node': 7.84.0 - '@sentry/utils': 7.84.0 - dotenv: 16.3.1 - find-up: 5.0.0 - glob: 9.3.2 - magic-string: 0.27.0 - unplugin: 1.0.1 - transitivePeerDependencies: - - encoding - - supports-color - dev: false - - /@sentry/cli-darwin@2.22.3: - resolution: {integrity: sha512-A1DwFTffg3+fF68qujaJI07dk/1H1pRuihlvS5WQ9sD7nQLnXZGoLUht4eULixhDzZYinWHKkcWzQ6k40UTvNA==} - engines: {node: '>=10'} - os: [darwin] - requiresBuild: true - dev: false - optional: true - - /@sentry/cli-linux-arm64@2.22.3: - resolution: {integrity: sha512-PnBPb4LJ+A2LlqLjtVFn4mEizcVdxBSLZvB85pEGzq9DRXjZ6ZEuGWFHTVnWvjd79TB/s0me29QnLc3n4B6lgA==} - engines: {node: '>=10'} - cpu: [arm64] - os: [linux, freebsd] - requiresBuild: true - dev: false - optional: true - - /@sentry/cli-linux-arm@2.22.3: - resolution: {integrity: sha512-mDtLVbqbCu/5b/v2quTAMzY/atGlJVvrqO2Wvpro0Jb/LYhn7Y1pVBdoXEDcnOX82/pseFkLT8PFfq/OcezPhA==} - engines: {node: '>=10'} - cpu: [arm] - os: [linux, freebsd] - requiresBuild: true - dev: false - optional: true - - /@sentry/cli-linux-i686@2.22.3: - resolution: {integrity: sha512-wxvbpQ2hiw4hwJWfJMp7K45BV40nXL62f91jLuftFXIbieKX1Li57NNKNu2JUVn7W1bJxkwz/PKGGTXSgeJlRw==} - engines: {node: '>=10'} - cpu: [x86, ia32] - os: [linux, freebsd] - requiresBuild: true - dev: false - optional: true - - /@sentry/cli-linux-x64@2.22.3: - resolution: {integrity: sha512-0GxsYNO5GyRWifeOpng+MmdUFZRA64bgA1n1prsEsXnoeLcm3Zj4Q63hBZmiwz9Qbhf5ibohkpf94a7dI7pv3A==} - engines: {node: '>=10'} - cpu: [x64] - os: [linux, freebsd] - requiresBuild: true - dev: false - optional: true - - /@sentry/cli-win32-i686@2.22.3: - resolution: {integrity: sha512-YERPsd7ClBrxKcmCUw+ZrAvQfbyIZFrqh269hgDuXFodpsB7LPGnI33ilo0uzmKdq2vGppTb6Z3gf1Rbq0Hadg==} - engines: {node: '>=10'} - cpu: [x86, ia32] - os: [win32] - requiresBuild: true - dev: false - optional: true - - /@sentry/cli-win32-x64@2.22.3: - resolution: {integrity: sha512-NUh56xWvgJo2KuC9lI6o6nTPXdzbpQUB4qGwJ73L9NP3HT2P1I27jtHyrC2zlXTVlYE23gQZGrL3wgW4Jy80QA==} - engines: {node: '>=10'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: false - optional: true - - /@sentry/cli@2.22.3: - resolution: {integrity: sha512-VFHdtrHsMyTRSZhDLeMyXvit7xB4e81KugIEwMve95c7h5HO672bfmCcM/403CAugj4NzvQ+IR2NKF/2SsEPlg==} - engines: {node: '>= 10'} - hasBin: true - dependencies: - https-proxy-agent: 5.0.1 - node-fetch: 2.7.0 - progress: 2.0.3 - proxy-from-env: 1.1.0 - which: 2.0.2 - optionalDependencies: - '@sentry/cli-darwin': 2.22.3 - '@sentry/cli-linux-arm': 2.22.3 - '@sentry/cli-linux-arm64': 2.22.3 - '@sentry/cli-linux-i686': 2.22.3 - '@sentry/cli-linux-x64': 2.22.3 - '@sentry/cli-win32-i686': 2.22.3 - '@sentry/cli-win32-x64': 2.22.3 - transitivePeerDependencies: - - encoding - - supports-color - dev: false - - /@sentry/core@7.84.0: - resolution: {integrity: sha512-tbuwunbBx2kSex15IHCqHDnrMfIlqPc6w/76fwkGqokz3oh9GSEGlLICwmBWL8AypWimUg13IDtFpD0TJTriWA==} - engines: {node: '>=8'} - dependencies: - '@sentry/types': 7.84.0 - '@sentry/utils': 7.84.0 - dev: false - - /@sentry/node@7.84.0: - resolution: {integrity: sha512-Xm3fIXT3TZOQi+6uQBavI8iOehD3PkY7v0y3hog0d4lQTH88vQK9BBsI+jZEq81Em+RG/u7vZNiFo6YMTnWF7Q==} - engines: {node: '>=8'} - dependencies: - '@sentry-internal/tracing': 7.84.0 - '@sentry/core': 7.84.0 - '@sentry/types': 7.84.0 - '@sentry/utils': 7.84.0 - https-proxy-agent: 5.0.1 - transitivePeerDependencies: - - supports-color - dev: false - - /@sentry/replay@7.84.0: - resolution: {integrity: sha512-c4PxT0ZpvkR9zXNfmAk3ojkm6eZ9+NlDze09RFBOCNo69QwIN90hnvbjXFC1+vRIJsfgo78Zr0ya/Wzb3Rog7Q==} - engines: {node: '>=12'} - dependencies: - '@sentry-internal/tracing': 7.84.0 - '@sentry/core': 7.84.0 - '@sentry/types': 7.84.0 - '@sentry/utils': 7.84.0 - dev: false - - /@sentry/types@7.84.0: - resolution: {integrity: sha512-VqGLIF3JOUrk7yIXjLXJvAORkZL1e3dDX0Q1okRehwyt/5CRE+mdUTeJZkBo9P9mBwgMyvtwklzOGGrzjb4eMA==} - engines: {node: '>=8'} - dev: false - - /@sentry/utils@7.84.0: - resolution: {integrity: sha512-qdUVuxnRBvaf05AU+28R+xYtZmi/Ymf8os3Njq9g4XuA+QEkZLbzmIpRK5W9Ja7vUtjOeg29Xgg43A8znde9LQ==} - engines: {node: '>=8'} - dependencies: - '@sentry/types': 7.84.0 - dev: false - - /@sentry/vite-plugin@2.10.2: - resolution: {integrity: sha512-30uu0L8ZCpAKOxAXmtyqwL06sG8UEBXGY5mxUDITyQYDf8pKuiOEf5018KlEDjhYVypfMQH3jq5xXUUka+/ipg==} - engines: {node: '>= 14'} - dependencies: - '@sentry/bundler-plugin-core': 2.10.2 - unplugin: 1.0.1 - transitivePeerDependencies: - - encoding - - supports-color - dev: false - - /@sentry/vue@7.84.0(vue@3.3.4): - resolution: {integrity: sha512-Tbw3ahuChdGIHdE4SvVXj9wUrlR/Z1vKWUebd/8IXEyASJvCRlMJmFCE4R4CPvEQkzFkYN2DHixwZyicxpaFVw==} - engines: {node: '>=8'} - peerDependencies: - vue: 2.x || 3.x - dependencies: - '@sentry/browser': 7.84.0 - '@sentry/core': 7.84.0 - '@sentry/types': 7.84.0 - '@sentry/utils': 7.84.0 - vue: 3.3.4 - dev: false - /@transloadit/prettier-bytes@0.0.7: resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==} dev: false @@ -2251,15 +2056,6 @@ packages: engines: {node: '>=0.8'} dev: false - /agent-base@6.0.2: - resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} - engines: {node: '>= 6.0.0'} - dependencies: - debug: 4.3.4 - transitivePeerDependencies: - - supports-color - dev: false - /ajv@6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} dependencies: @@ -2495,6 +2291,7 @@ packages: resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} dependencies: balanced-match: 1.0.2 + dev: true /braces@2.3.2: resolution: {integrity: sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==} @@ -3328,6 +3125,7 @@ packages: /dotenv@16.3.1: resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==} engines: {node: '>=12'} + dev: true /duplexer@0.1.2: resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} @@ -4209,16 +4007,6 @@ packages: once: 1.4.0 path-is-absolute: 1.0.1 - /glob@9.3.2: - resolution: {integrity: sha512-BTv/JhKXFEHsErMte/AnfiSv8yYOLLiyH2lTg8vn02O21zWFgHPTfxtgn1QRe7NRgggUhC8hacR2Re94svHqeA==} - engines: {node: '>=16 || 14 >=14.17'} - dependencies: - fs.realpath: 1.0.0 - minimatch: 7.4.6 - minipass: 4.2.8 - path-scurry: 1.10.1 - dev: false - /global-dirs@0.1.1: resolution: {integrity: sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==} engines: {node: '>=4'} @@ -4399,16 +4187,6 @@ packages: readable-stream: 3.6.2 dev: true - /https-proxy-agent@5.0.1: - resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} - engines: {node: '>= 6'} - dependencies: - agent-base: 6.0.2 - debug: 4.3.4 - transitivePeerDependencies: - - supports-color - dev: false - /human-signals@2.1.0: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} engines: {node: '>=10.17.0'} @@ -5036,11 +4814,6 @@ packages: tslib: 2.6.2 dev: true - /lru-cache@10.1.0: - resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==} - engines: {node: 14 || >=16.14} - dev: false - /lru-cache@6.0.0: resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} engines: {node: '>=10'} @@ -5052,13 +4825,6 @@ packages: engines: {node: '>=16.14'} dev: false - /magic-string@0.27.0: - resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==} - engines: {node: '>=12'} - dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 - dev: false - /magic-string@0.30.5: resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==} engines: {node: '>=12'} @@ -5266,13 +5032,6 @@ packages: brace-expansion: 2.0.1 dev: true - /minimatch@7.4.6: - resolution: {integrity: sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==} - engines: {node: '>=10'} - dependencies: - brace-expansion: 2.0.1 - dev: false - /minimatch@9.0.3: resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} engines: {node: '>=16 || 14 >=14.17'} @@ -5297,16 +5056,6 @@ packages: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} dev: true - /minipass@4.2.8: - resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==} - engines: {node: '>=8'} - dev: false - - /minipass@7.0.4: - resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} - engines: {node: '>=16 || 14 >=14.17'} - dev: false - /mixin-deep@1.3.2: resolution: {integrity: sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==} engines: {node: '>=0.10.0'} @@ -5428,18 +5177,6 @@ packages: resolution: {integrity: sha512-NsXBU0UgBxo2rQLOeWNZqS3fvflWePMECr8CoSWoSTqCqGbVVsvl9vZu1HfQicYN0g5piV9Gh8RTEvo/uP752w==} dev: true - /node-fetch@2.7.0: - resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==} - engines: {node: 4.x || >=6.0.0} - peerDependencies: - encoding: ^0.1.0 - peerDependenciesMeta: - encoding: - optional: true - dependencies: - whatwg-url: 5.0.0 - dev: false - /node-html-parser@5.4.2: resolution: {integrity: sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==} dependencies: @@ -5706,14 +5443,6 @@ packages: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} dev: true - /path-scurry@1.10.1: - resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==} - engines: {node: '>=16 || 14 >=14.17'} - dependencies: - lru-cache: 10.1.0 - minipass: 7.0.4 - dev: false - /path-to-regexp@6.2.1: resolution: {integrity: sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==} dev: true @@ -5871,11 +5600,6 @@ packages: engines: {node: '>=6'} dev: false - /progress@2.0.3: - resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==} - engines: {node: '>=0.4.0'} - dev: false - /proxy-from-env@1.1.0: resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} dev: false @@ -6661,10 +6385,6 @@ packages: engines: {node: '>=6'} dev: true - /tr46@0.0.3: - resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} - dev: false - /traverse@0.6.7: resolution: {integrity: sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg==} dev: true @@ -6969,15 +6689,6 @@ packages: - supports-color dev: true - /unplugin@1.0.1: - resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==} - dependencies: - acorn: 8.11.2 - chokidar: 3.5.3 - webpack-sources: 3.2.3 - webpack-virtual-modules: 0.5.0 - dev: false - /unplugin@1.5.1: resolution: {integrity: sha512-0QkvG13z6RD+1L1FoibQqnvTwVBXvS4XSPwAyinVgoOCl2jAgwzdUKmEj05o4Lt8xwQI85Hb6mSyYkcAGwZPew==} dependencies: @@ -7280,29 +6991,15 @@ packages: defaults: 1.0.4 dev: true - /webidl-conversions@3.0.1: - resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} - dev: false - /webpack-sources@3.2.3: resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} engines: {node: '>=10.13.0'} - - /webpack-virtual-modules@0.5.0: - resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==} - dev: false + dev: true /webpack-virtual-modules@0.6.1: resolution: {integrity: sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg==} dev: true - /whatwg-url@5.0.0: - resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} - dependencies: - tr46: 0.0.3 - webidl-conversions: 3.0.1 - dev: false - /which@1.3.1: resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==} hasBin: true diff --git a/src/router/index.js b/src/router/index.js index 1193ce2..ef1fdaa 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3,7 +3,6 @@ import { setupRouterGuard } from './guard' import { basicRoutes, EMPTY_ROUTE, NOT_FOUND_ROUTE } from './routes' import { getToken, isNullOrWhitespace } from '@/utils' import { usePermissionStore } from '@/store' -import * as Sentry from '@sentry/vue' const isHash = false export const router = createRouter({ @@ -15,22 +14,6 @@ export const router = createRouter({ export async function setupRouter(app) { await addDynamicRoutes() setupRouterGuard(router) - if (import.meta.env.VITE_SENTRY === 'true') { - Sentry.init({ - app, - dsn: 'https://1c158d5f832eef396e69447959d902d2@w.huakk.top/12', - integrations: [ - new Sentry.BrowserTracing({ - tracePropagationTargets: ['localhost', /^https:\/\/w\.huakk\.top\/api/], - routingInstrumentation: Sentry.vueRouterInstrumentation(router), - }), - new Sentry.Replay(), - ], - tracesSampleRate: 1.0, - replaysSessionSampleRate: 0.1, - replaysOnErrorSampleRate: 1.0, - }) - } app.use(router) } diff --git a/src/views/game/home/index.vue b/src/views/game/home/index.vue index 46a2fd3..e6566c6 100644 --- a/src/views/game/home/index.vue +++ b/src/views/game/home/index.vue @@ -188,6 +188,7 @@ const model = ref({ introduction: '', cover: [], status: 2, + sort: 0, }) const submit = () => { @@ -211,6 +212,7 @@ const clear = () => { introduction: '', cover: [], status: 2, + sort: 0, } formRef.value?.restoreValidation() showModal.value = false @@ -266,6 +268,9 @@ const dropdownSelect = (e) => { + + +
提交