From 68b3a4aba6894c936b532df83f9e421312fe1a49 Mon Sep 17 00:00:00 2001
From: tickstep <tickstep@outlook.com>
Date: Sun, 17 Mar 2024 15:53:28 +0800
Subject: [PATCH] update sync docker file

---
 docker/sync/Dockerfile         |  5 +----
 docker/sync/app.sh             | 26 ++++++++++++--------------
 docker/sync/docker-compose.yml | 22 +++++++++-------------
 3 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/docker/sync/Dockerfile b/docker/sync/Dockerfile
index 1716f27..69018d7 100644
--- a/docker/sync/Dockerfile
+++ b/docker/sync/Dockerfile
@@ -48,9 +48,6 @@ HEALTHCHECK --start-period=5s --interval=10s --timeout=5s --retries=3 CMD /bin/s
 ENV ALIYUNPAN_DOCKER=1
 ENV ALIYUNPAN_CONFIG_DIR=/home/app/config
 
-ENV ALIYUNPAN_REFRESH_TOKEN=""
-ENV ALIYUNPAN_TRANSFER_URL_TYPE=0
-
 ENV ALIYUNPAN_DOWNLOAD_PARALLEL=2
 ENV ALIYUNPAN_UPLOAD_PARALLEL=2
 ENV ALIYUNPAN_DOWNLOAD_BLOCK_SIZE=1024
@@ -58,10 +55,10 @@ ENV ALIYUNPAN_UPLOAD_BLOCK_SIZE=10240
 ENV ALIYUNPAN_LOCAL_DIR=/home/app/data
 ENV ALIYUNPAN_PAN_DIR=/sync_drive
 ENV ALIYUNPAN_SYNC_MODE=upload
+ENV ALIYUNPAN_SYNC_DRIVE=backup
 ENV ALIYUNPAN_SYNC_PRIORITY=time
 ENV ALIYUNPAN_SYNC_LOG=false
 ENV ALIYUNPAN_LOCAL_DELAY_TIME=3
-ENV ALIYUNPAN_TASK_STEP=sync
 ENV ALIYUNPAN_DEVICE_ID=""
 
 # 运行
diff --git a/docker/sync/app.sh b/docker/sync/app.sh
index c4ff6b5..4b40672 100755
--- a/docker/sync/app.sh
+++ b/docker/sync/app.sh
@@ -15,11 +15,11 @@ else
     "syncTaskList": [
      {
       "name": "阿里云盘备份",
-      "id": "5b2d7c10-e927-4e72-8f9d-5abb3bb04814",
+      "id": "5b2d7c10-e927-4e72-8f9d-5abb3bb04815",
       "localFolderPath": "$ALIYUNPAN_LOCAL_DIR",
       "panFolderPath": "$ALIYUNPAN_PAN_DIR",
       "mode": "$ALIYUNPAN_SYNC_MODE",
-      "priority": "$ALIYUNPAN_SYNC_PRIORITY",
+      "driveName": "$ALIYUNPAN_SYNC_DRIVE",
       "lastSyncTime": "2022-06-12 19:28:20"
      }
     ]
@@ -30,13 +30,13 @@ fi
 sleep 2s
 
 # device-id
-if [[ -z $ALIYUNPAN_DEVICE_ID ]];
-then
-  echo "the program use random device id"
-else
-  echo "set device id"
-  ./aliyunpan config set -device_id ${ALIYUNPAN_DEVICE_ID}
-fi
+#if [[ -z $ALIYUNPAN_DEVICE_ID ]];
+#then
+#  echo "the program use random device id"
+#else
+#  echo "set device id"
+#  ./aliyunpan config set -device_id ${ALIYUNPAN_DEVICE_ID}
+#fi
 
 # check login already or not
 ./aliyunpan who
@@ -44,12 +44,10 @@ if [ $? -eq 0 ]
 then
   echo "cache token is valid, not need to re-login"
 else
-  echo "login use refresh token: ${ALIYUNPAN_REFRESH_TOKEN}"
-  ./aliyunpan login -RefreshToken=${ALIYUNPAN_REFRESH_TOKEN}
+  echo "token is invalid, please use the valid aliyunpan_config.json file and retry"
+#  ./aliyunpan login -RefreshToken=${ALIYUNPAN_REFRESH_TOKEN}
 fi
 
-./aliyunpan config set -transfer_url_type ${ALIYUNPAN_TRANSFER_URL_TYPE}
-
 if [ "$ALIYUNPAN_SYNC_LOG" = "true" ]
 then
   ./aliyunpan config set -file_record_config 1
@@ -57,4 +55,4 @@ else
   ./aliyunpan config set -file_record_config 2
 fi
 
-./aliyunpan sync start -dp ${ALIYUNPAN_DOWNLOAD_PARALLEL} -up ${ALIYUNPAN_UPLOAD_PARALLEL} -dbs ${ALIYUNPAN_DOWNLOAD_BLOCK_SIZE} -ubs ${ALIYUNPAN_UPLOAD_BLOCK_SIZE} -log ${ALIYUNPAN_SYNC_LOG} -ldt ${ALIYUNPAN_LOCAL_DELAY_TIME} -step ${ALIYUNPAN_TASK_STEP}
+./aliyunpan sync start -dp ${ALIYUNPAN_DOWNLOAD_PARALLEL} -up ${ALIYUNPAN_UPLOAD_PARALLEL} -dbs ${ALIYUNPAN_DOWNLOAD_BLOCK_SIZE} -ubs ${ALIYUNPAN_UPLOAD_BLOCK_SIZE} -log ${ALIYUNPAN_SYNC_LOG} -ldt ${ALIYUNPAN_LOCAL_DELAY_TIME}
diff --git a/docker/sync/docker-compose.yml b/docker/sync/docker-compose.yml
index de9b5d0..c47e101 100644
--- a/docker/sync/docker-compose.yml
+++ b/docker/sync/docker-compose.yml
@@ -6,17 +6,17 @@ services:
     container_name: aliyunpan-sync
     restart: always
     volumes:
+      # （必须）映射的本地目录
       - ./data:/home/app/data:rw
       # （可选）可以指定JS插件sync_handler.js用于过滤文件，详见插件说明
       #- ./plugin/js/sync_handler.js:/home/app/config/plugin/js/sync_handler.js
       # （推荐）挂载sync_drive同步数据库到本地，这样即使容器销毁，同步数据库还可以用于以后使用
       #- ./sync_drive:/home/app/config/sync_drive
+      # （必须）映射token凭据文件
+      - /your/file/path/for/aliyunpan_config.json:/home/app/config/aliyunpan_config.json
     environment:
+      # 时区，东8区
       - TZ=Asia/Shanghai
-      # refresh token
-      - ALIYUNPAN_REFRESH_TOKEN=8bf31a...7628a8ad5a0975bf2d9
-      # 上传下载链接类型：1-默认 2-阿里ECS环境
-      - ALIYUNPAN_TRANSFER_URL_TYPE=1
       # 下载文件并发数
       - ALIYUNPAN_DOWNLOAD_PARALLEL=2
       # 上传文件并发数
@@ -25,17 +25,13 @@ services:
       - ALIYUNPAN_DOWNLOAD_BLOCK_SIZE=1024
       # 上传数据块大小，单位为KB，默认为10240KB，建议范围1024KB~10240KB
       - ALIYUNPAN_UPLOAD_BLOCK_SIZE=10240
-      # 指定网盘文件夹作为备份目录，不要指定根目录
+      # 指定网盘文件夹作为备份目标目录，不要指定根目录
       - ALIYUNPAN_PAN_DIR=/my_sync_dir
-      # 备份模式：upload(备份本地文件到云盘), download(备份云盘文件到本地), sync(双向同步备份，慎用！！！)
+      # 备份模式：upload(备份本地文件到云盘), download(备份云盘文件到本地)
       - ALIYUNPAN_SYNC_MODE=upload
-      # 优先级，只对双向同步备份模式有效。选项支持三种: time-时间优先，local-本地优先，pan-网盘优先
-      - ALIYUNPAN_SYNC_PRIORITY=time
+      # 网盘：backup(备份盘), resource(资源盘)
+      - ALIYUNPAN_SYNC_DRIVE=backup
       # 是否显示文件备份过程日志，true-显示，false-不显示
       - ALIYUNPAN_SYNC_LOG=true
       # 本地文件修改检测延迟间隔，单位秒。如果本地文件会被频繁修改，例如录制视频文件，配置好该时间可以避免上传未录制好的文件
-      - ALIYUNPAN_LOCAL_DELAY_TIME=3
-      # 任务步骤, 支持两种: scan(只扫描并建立同步数据库),sync(正常启动同步任务)
-      - ALIYUNPAN_TASK_STEP=sync
-      # 登录设备的ID，默认为空，程序会自动生成一个ID
-      - ALIYUNPAN_DEVICE_ID=
\ No newline at end of file
+      - ALIYUNPAN_LOCAL_DELAY_TIME=3
\ No newline at end of file