Merge branch 'dev' into v1.0.2

.cz-config.js

@@ -1,27 +1,25 @@
-'use strict';
-module.exports = {
-  types: [
-    { value: 'feat', name: 'feat[新增]:    新的内容' },
-    { value: 'fix', name: 'fix[修复]:    修复一个Bug' },
-    { value: 'docs', name: 'docs[文档]:    变更的只有文档' },
-    { value: 'refactor', name: 'refactor[重构]:    代码重构，注意和特性、修复区分开' },
-    { value: 'chore', name: 'chore[工具]:    开发工具变动(构建、脚手架工具等)' },
-    { value: 'revert', name: 'revert[回滚]:    代码回退' },
-  ],
-  scopes: [{ name: 'javascript' }, { name: 'typescript' }, { name: 'Vue' }, { name: 'node' }],
-  // override the messages, defaults are as follows
-  messages: {
-    type: '选择一种你的提交类型:',
-    scope: '选择一个scope (可选):',
-    // used if allowCustomScopes is true
-    customScope: 'Denote the SCOPE of this change:',
-    subject: '短说明:\n',
-    body: '长说明，使用"|"换行(可选)：\n',
-    breaking: '非兼容性说明 (可选):\n',
-    footer: '关联关闭的issue，例如：#31, #34(可选):\n',
-    confirmCommit: '确定提交说明?(yes/no)',
-  },
-  allowCustomScopes: true,
-  allowBreakingChanges: ['特性', '修复'],
-  subjectLimit: 100,
-};
+'use strict';
+module.exports = {
+  types: [
+    { value: 'feat', name: 'feat[新增]:    新的内容' },
+    { value: 'fix', name: 'fix[修复]:    修复一个Bug' },
+    { value: 'config', name: 'config[配置]:    配置变更' },
+    { value: 'docs', name: 'docs[文档]:    变更的只有文档' },
+    { value: 'refactor', name: 'refactor[重构]:    代码重构，注意和特性、修复区分开' },
+    { value: 'chore', name: 'chore[工具]:    开发工具变动(构建、脚手架工具等)' },
+    { value: 'revert', name: 'revert[回滚]:    代码回退' },
+  ],
+  // override the messages, defaults are as follows
+  messages: {
+    type: '选择一种你的提交类型:',
+    // used if allowCustomScopes is true
+    customScope: 'Denote the SCOPE of this change:',
+    subject: '短说明:\n',
+    body: '长说明，使用"|"换行(可选)：\n',
+    breaking: '非兼容性说明 (可选):\n',
+    footer: '关联关闭的issue，例如：#31, #34(可选):\n',
+    confirmCommit: '确定提交说明?(yes/no)',
+  },
+  allowBreakingChanges: ['特性', '修复'],
+  subjectLimit: 100,
+};

.env

@@ -1,2 +1,2 @@
-VUE_APP_PORT='8888'
+VUE_APP_PORT='8888'
 VUE_APP_TARGET_API='http://www.octoveau.cn:8401'

.env.development

@@ -1,2 +1,2 @@
-VUE_APP_TARGET_SITE_KEY='5ba7b6fe36a04ce0bab97f103907123f'
+VUE_APP_TARGET_SITE_KEY='5ba7b6fe36a04ce0bab97f103907123f'
 VUE_APP_TARGET_SITE_SECRET='1ff77c23c2ea440d84ab17505b4588026233c709bf5d489aae07cd3b788999e1'

.env.production

@@ -1,2 +1,2 @@
-VUE_APP_TARGET_SITE_KEY='e17abffae39143a6a154a7eb91b42eb6'
-VUE_APP_TARGET_SITE_SECRET='e46365a18fe141e7908e5710aa2232efca863b4c42be42289723c88c2a4a6888'
+VUE_APP_TARGET_SITE_KEY='e17abffae39143a6a154a7eb91b42eb6'
+VUE_APP_TARGET_SITE_SECRET='e46365a18fe141e7908e5710aa2232efca863b4c42be42289723c88c2a4a6888'

.eslintignore

@@ -1,3 +1,3 @@
-webpack/dll
-
+webpack/dll
+
 commitlint.config.js

.eslintrc.js

@@ -1,95 +1,95 @@
-module.exports = {
-  env: {
-    browser: true,
-    es2021: true,
-  },
-  extends: [
-    'airbnb-base',
-    // 特别注意：plugin:vue/recommended 用于矫正vue文件结构顺序乱写问题
-    'plugin:vue/recommended',
-    'prettier',
-  ],
-  plugins: ['vue', 'prettier'],
-  overrides: [],
-  parserOptions: {
-    ecmaVersion: 'latest',
-    sourceType: 'module',
-  },
-  settings: {
-    // 配置此配置后即可解决vue中通过alias引入文件的报错问题
-    'import/resolver': {
-      alias: {
-        map: [
-          ['@', './src'],
-          ['@components', './src/components'],
-        ],
-        extensions: ['.js', '.jsx', '.vue'],
-      },
-    },
-  },
-  rules: {
-    'import/no-cycle': 'off',
-    'prettier/prettier': ['error'],
-    semi: 'error',
-    radix: 'off',
-    'class-methods-use-this': 'off',
-    'import/prefer-default-export': 'off',
-    'no-multi-assign': 'off',
-    'no-param-reassign': 'off',
-    'func-names': ['error', 'never'],
-    'no-underscore-dangle': 'off',
-    'vue/no-reserved-component-names': 'off',
-    'import/extensions': ['error', { vue: 'never' }],
-    'vue/multi-word-component-names': 'off',
-    'no-unused-expressions': 'off',
-    // 特别注意：vue/order-in-components，此规则用于矫正vue文件结构顺序乱写问题
-    'vue/order-in-components': [
-      'error',
-      {
-        order: [
-          'el',
-          'name',
-          'key',
-          'parent',
-          'functional',
-          ['delimiters', 'comments'],
-          ['components', 'directives', 'filters'],
-          'extends',
-          'mixins',
-          ['provide', 'inject'],
-          'ROUTER_GUARDS',
-          'layout',
-          'middleware',
-          'validate',
-          'scrollToTop',
-          'transition',
-          'loading',
-          'inheritAttrs',
-          'model',
-          ['props', 'propsData'],
-          'emits',
-          'setup',
-          'fetch',
-          'asyncData',
-          'data',
-          'head',
-          'computed',
-          'watch',
-          'watchQuery',
-          'LIFECYCLE_HOOKS',
-          'methods',
-          ['template', 'render'],
-          'renderError',
-        ],
-      },
-    ],
-  },
-  globals: {
-    _: true,
-    $api: true,
-    $auth: true,
-    $util: true,
-    $validate: true,
-    $is: true,
-  },
-};
+module.exports = {
+  env: {
+    browser: true,
+    es2021: true,
+  },
+  extends: [
+    'airbnb-base',
+    // 特别注意：plugin:vue/recommended 用于矫正vue文件结构顺序乱写问题
+    'plugin:vue/recommended',
+    'prettier',
+  ],
+  plugins: ['vue', 'prettier'],
+  overrides: [],
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+  },
+  settings: {
+    // 配置此配置后即可解决vue中通过alias引入文件的报错问题
+    'import/resolver': {
+      alias: {
+        map: [
+          ['@', './src'],
+          ['@components', './src/components'],
+        ],
+        extensions: ['.js', '.jsx', '.vue'],
+      },
+    },
+  },
+  rules: {
+    'import/no-cycle': 'off',
+    'prettier/prettier': ['error'],
+    semi: 'error',
+    radix: 'off',
+    'class-methods-use-this': 'off',
+    'import/prefer-default-export': 'off',
+    'no-multi-assign': 'off',
+    'no-param-reassign': 'off',
+    'func-names': ['error', 'never'],
+    'no-underscore-dangle': 'off',
+    'vue/no-reserved-component-names': 'off',
+    'import/extensions': ['error', { vue: 'never' }],
+    'vue/multi-word-component-names': 'off',
+    'no-unused-expressions': 'off',
+    // 特别注意：vue/order-in-components，此规则用于矫正vue文件结构顺序乱写问题
+    'vue/order-in-components': [
+      'error',
+      {
+        order: [
+          'el',
+          'name',
+          'key',
+          'parent',
+          'functional',
+          ['delimiters', 'comments'],
+          ['components', 'directives', 'filters'],
+          'extends',
+          'mixins',
+          ['provide', 'inject'],
+          'ROUTER_GUARDS',
+          'layout',
+          'middleware',
+          'validate',
+          'scrollToTop',
+          'transition',
+          'loading',
+          'inheritAttrs',
+          'model',
+          ['props', 'propsData'],
+          'emits',
+          'setup',
+          'fetch',
+          'asyncData',
+          'data',
+          'head',
+          'computed',
+          'watch',
+          'watchQuery',
+          'LIFECYCLE_HOOKS',
+          'methods',
+          ['template', 'render'],
+          'renderError',
+        ],
+      },
+    ],
+  },
+  globals: {
+    _: true,
+    $api: true,
+    $auth: true,
+    $util: true,
+    $validate: true,
+    $is: true,
+  },
+};

.github/workflows/deploy.yml

@@ -1,49 +1,49 @@
-name: deploy vue2-template-protal 🚀
-on:
-  push:
-    branches:
-      - release
-jobs:
-  build-sso-admin-portal-deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: step Checkout 🚀
-        uses: actions/checkout@v3
-      - name: step Use Node.js 16 🚀
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16.x'
-      - name: step Build Project 🚀
-        run: |
-          yarn install
-          yarn run build
-      - name: SSH Server Deploy 🚀
-        uses: easingthemes/[email protected]
-        env:
-          SSH_PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
-          ARGS: '-avzr --delete'
-          SOURCE: './*'
-          REMOTE_HOST: ${{ secrets.USER_HOST }}
-          REMOTE_USER: ${{ secrets.USER_NAME }}
-          TARGET: ${{secrets.SERVER_SAVE_PATH}}
-          EXCLUDE: '/node_modules/'
-      - name: Login To Docker 🚀
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USER_NAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          registry: ${{ secrets.DOCKER_PATH }}
-      - name: push Docker Hub 🚀
-        run: |
-          docker build -t ${{ secrets.DOCKER_PATH }}:latest .
-          docker push ${{ secrets.DOCKER_PATH }}:latest
-      - name: deploy Docker Images 🚀
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.USER_HOST }}
-          username: ${{ secrets.USER_NAME }}
-          password: ${{ secrets.SSH_PASSWORD }}
-          script: |
-            docker pull ${{ secrets.DOCKER_PATH }}:latest
-            ssh  root@${{ secrets.USER_HOST }} "cd /www/looper/vue2-template-protal/;docker-compose -f docker-compose.yml pull;docker-compose -f docker-compose.yml up -d;exit"
-            ssh  root@${{ secrets.USER_HOST }} "docker rmi $(docker images -q -f dangling=true)"
+name: deploy vue2-template-protal 🚀
+on:
+  push:
+    branches:
+      - release
+jobs:
+  build-sso-admin-portal-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: step Checkout 🚀
+        uses: actions/checkout@v3
+      - name: step Use Node.js 16 🚀
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16.x'
+      - name: step Build Project 🚀
+        run: |
+          yarn install
+          yarn run build
+      - name: SSH Server Deploy 🚀
+        uses: easingthemes/[email protected]
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
+          ARGS: '-avzr --delete'
+          SOURCE: './*'
+          REMOTE_HOST: ${{ secrets.USER_HOST }}
+          REMOTE_USER: ${{ secrets.USER_NAME }}
+          TARGET: ${{secrets.SERVER_SAVE_PATH}}
+          EXCLUDE: '/node_modules/'
+      - name: Login To Docker 🚀
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USER_NAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          registry: ${{ secrets.DOCKER_PATH }}
+      - name: push Docker Hub 🚀
+        run: |
+          docker build -t ${{ secrets.DOCKER_PATH }}:latest .
+          docker push ${{ secrets.DOCKER_PATH }}:latest
+      - name: deploy Docker Images 🚀
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.USER_HOST }}
+          username: ${{ secrets.USER_NAME }}
+          password: ${{ secrets.SSH_PASSWORD }}
+          script: |
+            docker pull ${{ secrets.DOCKER_PATH }}:latest
+            ssh  root@${{ secrets.USER_HOST }} "cd /www/looper/vue2-template-protal/;docker-compose -f docker-compose.yml pull;docker-compose -f docker-compose.yml up -d;exit"
+            ssh  root@${{ secrets.USER_HOST }} "docker rmi $(docker images -q -f dangling=true)"