2024年的一些功能和更新 #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

VecHK wants to merge 132 commits into main from dev

.github/workflows/pullrequest.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -23,7 +23,7 @@ jobs:
  
            collation server: 'utf8_general_ci' # Optional, default value is 'utf8mb4_general_ci'. The '--collation-server' option for mysqld

            mysql version: '5' # Optional, default value is "latest". The version of the MySQL

            mysql database: 'torzo_photo_test' # Optional, default value is "test". The specified database which will be create

            mysql root password: 'vechk123' # Required if "mysql user" is empty, default is empty. The root superuser password

            mysql root password: '7355608' # Required if "mysql user" is empty, default is empty. The root superuser password

            mysql user: 'developer' # Required if "mysql root password" is empty, default is empty. The superuser for the specified database. Can use secrets, too

            mysql password: 123 # Required if "mysql user" exists. The password for the "mysql user"

    @@ -75,7 +75,7 @@ jobs:
  
        - name: Use Node.js

          uses: actions/setup-node@v1

          with:

            node-version: '16'

            node-version: '18'

        - name: ESLint

          run: |

    @@ -96,7 +96,7 @@ jobs:
  
        - name: Use Node.js

          uses: actions/setup-node@v1

          with:

            node-version: '16'

            node-version: '18'

        - name: yarn tsc --noEmit

          run: |

.github/workflows/release-dev.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -48,7 +48,7 @@ jobs:
  
          - name: Use Node.js

            uses: actions/setup-node@v1

            with:

              node-version: '16'

              node-version: '18'

          - name: yarn build:development

            env:

    @@ -87,7 +87,7 @@ jobs:
  
              key: ${{ secrets.SSH_PRIVATE_KEY }}

              known_hosts: 'a'

          - name: Upload Builds

            run: |

              ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts

              scp -r releases/* ${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_HOST }}:${{ secrets.DEV_REMOTE_UPLOAD_PATH }}

          # - name: Upload Builds

          #   run: |

          #     ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts

          #     scp -r releases/* ${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_HOST }}:${{ secrets.DEV_REMOTE_UPLOAD_PATH }}

.github/workflows/server-refresh.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -24,21 +24,45 @@ jobs: @@
             key: ${{ secrets.SSH_PRIVATE_KEY }}
             known_hosts: 'a'
-        - name: construct script
-          env:
-            NODE_ENV: development
-          run: |
-            printf "#!/bin/bash\n" > ./server_exec.sh
-            printf "SERVER_PATH=${{secrets.SERVER_PATH}}\n" >> ./server_exec.sh
-            cat ./scripts/server-refresh.sh >> ./server_exec.sh
-            chmod +x ./server_exec.sh
-        - name: Exec Script
-          env:
-            SSH_USERNAME: ${{ secrets.SSH_USERNAME }}
-            SSH_HOST: ${{ secrets.SSH_HOST }}
-            PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-          run: |
-            ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
-            cat ./server_exec.sh
-            ssh ${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_HOST }} < ./server_exec.sh
+        # - name: construct script
+        #   env:
+        #     NODE_ENV: development
+        #   run: |
+        #     printf "#!/bin/bash\n" > ./server_exec.sh
+        #     printf "SERVER_PATH=${{secrets.SERVER_PATH}}\n" >> ./server_exec.sh
+        #     cat ./scripts/server-refresh.sh >> ./server_exec.sh
+        #     chmod +x ./server_exec.sh
+        # - name: Exec Script
+        #   env:
+        #     SSH_USERNAME: ${{ secrets.SSH_USERNAME }}
+        #     SSH_HOST: ${{ secrets.SSH_HOST }}
+        #     PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+        #   run: |
+        #     ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
+        #     cat ./server_exec.sh
+        #     ssh ${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_HOST }} < ./server_exec.sh
+        # - name: Telegram send success message
+        #   if: ${{ success() }}
+        #   env:
+        #     TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+        #     TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
+        #     COMMITS: ${{ toJSON(github.event.commits) }}
+        #     RUN_NUMBER: ${{ github.run_number }}
+        #     BUILD_DESCRIPTION: ✅ 呵呵，相册测试服前端已经部署。
+        #   run: |
+        #     node ./scripts/tg-message.js
+        # - name: Telegram send failure message
+        #   if: ${{ failure() }}
+        #   env:
+        #     TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+        #     TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
+        #     COMMITS: ${{ toJSON(github.event.commits) }}
+        #     RUN_NUMBER: ${{ github.run_number }}
+        #     BUILD_DESCRIPTION: |
+        #       ❌ 呵呵，相册测试服前端部署失败。早该管管了。
+        #       版本: ${{ steps.package-version.outputs.current-version }}
+        #   run: |
+        #     node ./scripts/tg-message.js

dashboard/.env.production

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ @@
     ENV = 'production'
     # base api
-    VUE_APP_BASE_API = 'https://pache.blog/torzo-gallery-server/api/'
+    VUE_APP_BASE_API = 'https://pache.blog/torzo-gallery-server/'

dashboard/.eslintrc.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -90,7 +90,7 @@ module.exports = { @@
         'no-extend-native': 2,
         'no-extra-bind': 2,
         'no-extra-boolean-cast': 2,
-        'no-extra-parens': [2, 'functions'],
+        'no-extra-parens': [0],
         'no-fallthrough': 2,
         'no-floating-decimal': 2,
         'no-func-assign': 2,
@@ Expand Down @@

dashboard/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

dashboard/package.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,12 +15,13 @@ @@
       },
       "dependencies": {
         "axios": "0.21.1",
-        "element-ui": "^2.15.4",
+        "element-ui": "^2.15.14",
         "js-cookie": "2.2.0",
         "normalize.css": "7.0.0",
         "nprogress": "0.2.0",
         "pad-left": "^2.1.0",
         "path-to-regexp": "2.4.0",
+        "uuid": "^9.0.1",
         "vue": "2.6.10",
         "vue-router": "3.0.6",
         "vuex": "3.1.0"
@@ Expand Down @@

dashboard/src/api/image.js

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,8 +1,24 @@
  
    import request from '@/utils/request'

    export const refreshThumbs = () =>

    export const __AVATAR_THUMB_SIZE__ = 128

    export const refreshThumb = async({ src, thumb_size }) =>

      request({

        url: `admin/image/refresh-thumb`,

        method: 'POST',

        timeout: 0,

        data: { src, thumb_size },

      })

    export const getAllAvailablePhoto = () =>

      request({

        url: 'admin/image/refresh-thumb',

        url: `admin/image/available-photo`,

        method: 'GET',

        timeout: 0,

      })

    export const requestCleanUnusedImage = () =>

      request({

        url: `admin/image/clean-unused`,

        method: 'POST',

      })

dashboard/src/api/statistic.js

-Original file line number
+Diff line change
@@ -0,0 +1,7 @@
+    import request from '@/utils/request'
+    export const getStatistic = () =>
+      request({
+        url: `admin/statistic`,
+        method: 'GET',
+      })

dashboard/src/components/UploadImageBox.vue

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,7 +4,7 @@
  
        drag

        :name="uploadName"

        :headers="headers"

        :action="uploadUrl"

        :action="upload_url"

        :show-file-list="false"

        :on-error="uploadError"

        :on-progress="uploadProgress"

    @@ -137,9 +137,9 @@
  
            default: ''

          },

          uploadUrl: {

            type: String,

            default: `${process.env.VUE_APP_BASE_API}admin/image/upload`

          thumbSize: {

            type: Number,

            default: 0

          },

          previewUrl: {

    @@ -161,6 +161,17 @@
  
          percent: 0

        }),

        computed: {

          upload_url() {

            const base_url = `${process.env.VUE_APP_BASE_API}admin/image/upload`

            if (this.thumbSize !== 0) {

              return `${base_url}?thumb_size=${this.thumbSize}`

            } else {

              return base_url

            }

          }

        },

        methods: {

          resetUploading() {

            this.uploading = false

dashboard/src/main.js

-Original file line number
+Diff line change
@@ Expand Up @@
     import ElementUI from 'element-ui'
     import 'element-ui/lib/theme-chalk/index.css'
-    import locale from 'element-ui/lib/locale/lang/en' // lang i18n
+    // import locale from 'element-ui/lib/locale/lang/en' // lang i18n
     import '@/styles/index.scss' // global css
@@ Expand All / @@ -29,9 +29,10 @@ if (process.env.NODE_ENV === 'production') { @@
     }
     // set ElementUI lang to EN
-    Vue.use(ElementUI, { locale })
+    // Vue.use(ElementUI, { locale })
     // 如果想要中文版 element-ui，按如下方式声明
-    // Vue.use(ElementUI)
+    Vue.use(ElementUI)
+    console.log('ElementUI', ElementUI)
     Vue.config.productionTip = false
@@ Expand Down @@

dashboard/src/mixins/operate.js

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    export default {
+      methods: {
+        async $operate(property, fn) {
+          if (this[property] !== true) {
+            this[property] = true
+            try {
+              await fn()
+            } finally {
+              this[property] = false
+            }
+          }
+        }
+      }
+    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

2024年的一些功能和更新 #88

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

2024年的一些功能和更新 #88

Are you sure you want to change the base?

Uh oh!

2024年的一些功能和更新 #88

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!