Merge pull request #33 from liuzan-info/p2a

config aliyunpan

Author: liuzan-info

.github/workflows/aliyunpan_config.json

@@ -0,0 +1,121 @@
+{
+    "configVer": "1.0",
+    "activeUID": "4746035f70bf415aa9e9b0777e93671d",
+    "userList": [
+     {
+      "userId": "4746035f70bf415aa9e9b0777e93671d",
+      "nickname": "177***418",
+      "accountName": "177***418",
+      "workdir": "/",
+      "workdirFileEntity": {
+       "driveId": "",
+       "domainId": "",
+       "fileId": "root",
+       "fileName": "/",
+       "fileSize": 0,
+       "fileType": "folder",
+       "createdAt": "",
+       "updatedAt": "",
+       "fileExtension": "",
+       "uploadId": "",
+       "parentFileId": "",
+       "crc64Hash": "",
+       "contentHash": "",
+       "contentHashName": "",
+       "path": "/",
+       "category": "",
+       "syncFlag": false,
+       "syncMeta": ""
+      },
+      "resourceWorkdir": "",
+      "resourceWorkdirFileEntity": {
+       "driveId": "",
+       "domainId": "",
+       "fileId": "",
+       "fileName": "",
+       "fileSize": 0,
+       "fileType": "",
+       "createdAt": "",
+       "updatedAt": "",
+       "fileExtension": "",
+       "uploadId": "",
+       "parentFileId": "",
+       "crc64Hash": "",
+       "contentHash": "",
+       "contentHashName": "",
+       "path": "",
+       "category": "",
+       "syncFlag": false,
+       "syncMeta": ""
+      },
+      "albumWorkdir": "",
+      "albumWorkdirFileEntity": {
+       "driveId": "",
+       "domainId": "",
+       "fileId": "",
+       "fileName": "",
+       "fileSize": 0,
+       "fileType": "",
+       "createdAt": "",
+       "updatedAt": "",
+       "fileExtension": "",
+       "uploadId": "",
+       "parentFileId": "",
+       "crc64Hash": "",
+       "contentHash": "",
+       "contentHashName": "",
+       "path": "",
+       "category": "",
+       "syncFlag": false,
+       "syncMeta": ""
+      },
+      "activeDriveId": "1601734720",
+      "driveList": [
+       {
+        "driveId": "1601734720",
+        "driveName": "备份盘",
+        "driveTag": "File"
+       },
+       {
+        "driveId": "",
+        "driveName": "资源库",
+        "driveTag": "Resource"
+       },
+       {
+        "driveId": "576163472",
+        "driveName": "相册",
+        "driveTag": "Album"
+       }
+      ],
+      "ticketId": "88c7d842e5ae4c038132fdc98dde0bce",
+      "webapiToken": {
+       "accessToken": "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiI0NzQ2MDM1ZjcwYmY0MTVhYTllOWIwNzc3ZTkzNjcxZCIsImN1c3RvbUpzb24iOiJ7XCJjbGllbnRJZFwiOlwicEpaSW5OSE4yZFpXazhxZ1wiLFwiZG9tYWluSWRcIjpcImJqMjlcIixcInNjb3BlXCI6W1wiRFJJVkUuQUxMXCIsXCJGSUxFLkFMTFwiLFwiVklFVy5BTExcIixcIlNIQVJFLkFMTFwiLFwiU1RPUkFHRS5BTExcIixcIlNUT1JBR0VGSUxFLkxJU1RcIixcIlVTRVIuQUxMXCIsXCJCQVRDSFwiLFwiQUNDT1VOVC5BTExcIixcIklNQUdFLkFMTFwiLFwiSU5WSVRFLkFMTFwiLFwiU1lOQ01BUFBJTkcuTElTVFwiXSxcInJvbGVcIjpcInVzZXJcIixcInJlZlwiOlwiXCIsXCJkZXZpY2VfaWRcIjpcIjdkNDZmZWM4MTJjNTQ5MTVhYTllMzFkZTg0Mzg5MzIwXCJ9IiwiZXhwIjoxNzEwODIzNDgyLCJpYXQiOjE3MTA4MTYyMjJ9.Qho_As5hx4cGQDaNT58rzXhbVIOdVydR8j5UR2JmkGi5uQOnA9Yp6OGpM3_9TNPwoeXzKQDJvp8MUVutLR-IBop69r4Akp7R9grprvZicknBtj8l2gBXRNQ8D0gHIX-_mHNurS5L9xzbG0xhF81YtZXoZeCgCsUQI8rN4iJ4SYo",
+       "expired": 1710823482
+      },
+      "openapiToken": {
+       "accessToken": "eyJraWQiOiJLcU8iLCJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI0NzQ2MDM1ZjcwYmY0MTVhYTllOWIwNzc3ZTkzNjcxZCIsImF1ZCI6ImNmOWY3MGU4ZmM2MTQzMGY4ZWM1YWI1Y2FkZjMxMzc1IiwicyI6ImNkYSIsImQiOiIxNjAxNzM0NzIwIiwiaXNzIjoiYWxpcGFuIiwiZXhwIjoxNzEwODIzNDY5LCJpYXQiOjE3MTA4MTYyNjYsImp0aSI6IjM3ZjMwODg4NGIyYjRhN2Q4NjE2NmU0OGJiZGYxYzQyIn0.twISqYzM1rhjgZwTaqfxz74dV1IO1ycAkZy2xkwwGoQ",
+       "expired": 1710823466
+      }
+     }
+    ],
+    "cacheSize": 0,
+    "maxDownloadParallel": 0,
+    "maxUploadParallel": 0,
+    "maxDownloadRate": 0,
+    "maxUploadRate": 0,
+    "saveDir": "/data/home/lz/Downloads",
+    "proxy": "",
+    "localAddrs": "",
+    "preferIPType": "ipv4",
+    "updateCheckInfo": {
+     "preferUpdateSrv": "",
+     "latestVer": "v0.3.0",
+     "checkTime": 1710814819
+    },
+    "videoFileExtensions": "mp4,flv,mkv,mov,rm,rmvb,wmv,wma,mv,asf,asx,mpg,mpeg,mpe,3gp,m4v,avi,vob",
+    "fileRecordConfig": "2",
+    "deviceId": "ZkxkSZxRmHyYwAvrjtX3kD9m",
+    "deviceName": "Chrome浏览器",
+    "clientId": "cf9f70e8fc61430f8ec5ab5cadf31375",
+    "clientSecret": ""
+   }

.github/workflows/docker-image.yml

@@ -35,4 +35,3 @@ jobs:
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/phosmap:1.0.0
           build-args: |
             GITHUB_TOKEN=${{ secrets.BYPY_PAT_GITHUB }}
-            ALI_TOKEN=${{ secrets.ALIYUN_TOKEN }}

Dockerfile

@@ -5,14 +5,12 @@ WORKDIR /srv/shiny-server
 
 # Config aliyunpan for download PhosMap datasets
 ARG GITHUB_TOKEN
-ARG ALI_TOKEN
 ENV GITHUB_TOKEN=${GITHUB_TOKEN}
-ENV ALI_TOKEN=${ALI_TOKEN}
 RUN echo '#!/bin/bash\npython3 "$@"' > /usr/bin/python && chmod +x /usr/bin/python
 RUN sudo apt-get update && sudo apt-get install -y python3-pip libgtk-3-dev cmake build-essential libcurl4-gnutls-dev libxml2 libxml2-dev libodbc1 libssl-dev libv8-dev libsodium-dev curl && apt-get clean
 RUN sudo curl -fsSL http://file.tickstep.com/apt/pgp | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/tickstep-packages-archive-keyring.gpg > /dev/null && echo "deb [signed-by=/etc/apt/trusted.gpg.d/tickstep-packages-archive-keyring.gpg arch=amd64,arm64] http://file.tickstep.com/apt aliyunpan main" | sudo tee /etc/apt/sources.list.d/tickstep-aliyunpan.list > /dev/null && sudo apt-get update && sudo apt-get install -y aliyunpan
-RUN aliyunpan login -RefreshToken=$ALI_TOKEN && aliyunpan download PhosMap_datasets.zip --save && unzip PhosMap_datasets.zip && rm PhosMap_datasets.zip
-RUN unset ALI_TOKEN
+RUN export ALIYUNPAN_CONFIG_DIR=/srv/shiny-server/.github/workflows/
+RUN aliyunpan download PhosMap_datasets.zip --save && unzip PhosMap_datasets.zip && rm PhosMap_datasets.zip
 
 # Install dependencies
 RUN R -e "devtools::install_github(c('evocellnet/ksea', 'omarwagih/rmotifx', 'ecnuzdd/PhosMap'))"