diff --git a/.drone.yml b/.drone.yml index 40c904e..16cd62f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,7 +27,7 @@ steps: image: node:20-alpine when: branch: - - master + - main commands: - npm config set registry https://registry.npmmirror.com/ - npm install -g pnpm @@ -77,14 +77,8 @@ steps: - rm -rf dist.tar - cd jdt-mer-dev - docker build -t jdt-mer-dev . - - target_container="jdt-mer-dev" - - if docker ps -a --format '{{.Names}}' | grep -q "^$target_container$"; then - - echo "容器存在,执行操作..." - docker stop jdt-mer-dev - docker rm jdt-mer-dev - - else - - echo "容器不存在" - - fi - docker run -d -p 8083:80 --restart=always --name jdt-mer-dev jdt-mer-dev - cd .. - rm -rf jdt-mer-dev @@ -129,14 +123,8 @@ steps: - rm -rf dist.tar - cd jdt-mer-prod - cd docker build -t jdt-mer-prod . - - target_container="jdt-mer-prod" - - if docker ps -a --format '{{.Names}}' | grep -q "^$target_container$"; then - - echo "容器存在,执行操作..." - docker stop jdt-mer-prod - docker rm jdt-mer-prod - - else - - echo "容器不存在" - - fi - docker run -d -p 8083:80 --restart=always --name jdt-mer-prod jdt-mer-prod - cd .. - rm -rf jdt-mer-prod diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 10b731c..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# 默认忽略的文件 -/shelf/ -/workspace.xml -# 基于编辑器的 HTTP 客户端请求 -/httpRequests/ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 7b84c3a..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 307554b..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 50c6144..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml deleted file mode 100644 index 63326a8..0000000 --- a/.idea/jsLibraryMappings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/jsLinters/eslint.xml b/.idea/jsLinters/eslint.xml deleted file mode 100644 index e94fc66..0000000 --- a/.idea/jsLinters/eslint.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/mer.iml b/.idea/mer.iml deleted file mode 100644 index 0b872d8..0000000 --- a/.idea/mer.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 947e478..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/prettier.xml b/.idea/prettier.xml deleted file mode 100644 index 8bc49dc..0000000 --- a/.idea/prettier.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index c8397c9..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/build/plugin/unplugin.js b/build/plugin/unplugin.js index c4b59d9..e61066d 100644 --- a/build/plugin/unplugin.js +++ b/build/plugin/unplugin.js @@ -5,7 +5,6 @@ import { NaiveUiResolver } from 'unplugin-vue-components/resolvers' import { FileSystemIconLoader } from 'unplugin-icons/loaders' import IconsResolver from 'unplugin-icons/resolver' import mkcert from 'vite-plugin-mkcert' -import { sentryVitePlugin } from '@sentry/vite-plugin' /** * * unplugin-icons插件,自动引入iconify图标 @@ -46,11 +45,4 @@ export default [ customDomId: '__CUSTOM_SVG_ICON__', }), mkcert(), - sentryVitePlugin({ - authToken: - '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', - org: 'sentry', - project: 'jdt-mer', - url: 'https://w.huakk.top', - }), ]