Skip to content
This repository was archived by the owner on Jul 21, 2024. It is now read-only.

Commit 4503d7b

Browse files
committed
* 配置文件改到conf目录
1 parent db97b2c commit 4503d7b

File tree

5 files changed

+20
-12
lines changed

5 files changed

+20
-12
lines changed

README.md

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,19 @@ java -jar webdav.jar --aliyundrive.refresh-token="your refreshToken"
3737
```
3838
## 容器运行
3939
```bash
40-
docker run -d --name=webdav-aliyundriver --restart=always -p 8080:8080 -v /etc/localtime:/etc/localtime -v /etc/aliyun-driver/:/workspace/etc/aliyun-driver/ -e TZ="Asia/Shanghai" -e ALIYUNDRIVE_REFRESH_TOKEN="your refreshToken" -e ALIYUNDRIVE_AUTH_PASSWORD="admin" -e JAVA_OPTS="-Xmx1g" eritpchy/webdav-aliyundriver
41-
42-
# /workspace/etc/aliyun-driver/ 挂载卷自动维护了最新的refreshToken,建议挂载
40+
mkdir $(pwd)/conf
41+
docker run -d \
42+
--name=webdav-aliyundriver \
43+
--restart=always -p 8080:8080 \
44+
-v /etc/localtime:/etc/localtime \
45+
-v $(pwd)/conf:/conf \
46+
-e TZ="Asia/Shanghai" \
47+
-e ALIYUNDRIVE_REFRESH_TOKEN="your refreshToken" \
48+
-e ALIYUNDRIVE_AUTH_PASSWORD="admin" \
49+
eritpchy/webdav-aliyundriver
50+
51+
# /conf 挂载卷自动维护了最新的refreshToken,建议挂载
4352
# ALIYUNDRIVE_AUTH_PASSWORD 是admin账户的密码,建议修改
44-
# JAVA_OPTS 可修改最大内存占用,比如 -e JAVA_OPTS="-Xmx512m" 表示最大内存限制为512m
4553
```
4654

4755
## Docker-Compose
@@ -56,16 +64,15 @@ services:
5664
- ALIYUNDRIVE_REFRESH_TOKEN=refreshToken
5765
- ALIYUNDRIVE_AUTH_USER_NAME=admin
5866
- ALIYUNDRIVE_AUTH_PASSWORD=admin
59-
- JAVA_OPTS=-Xmx1g
6067
volumes:
61-
- /etc/aliyun-driver/:/workspace/etc/aliyun-driver/
68+
- ./docker/conf:/conf
6269
ports:
6370
- 6666:8080
6471
restart: always
6572

6673
# “refreshToken”请根据下文说明自行获取。
6774
# “ALIYUNDRIVE_AUTH_USER-NAME”和“ALIYUNDRIVE_AUTH_PASSWORD”为连接用户名和密码,建议更改。
68-
#/etc/aliyun-driver/:/workspace/etc/aliyun-driver/”,可以把冒号前改为指定目录,比如“/homes/USER/docker/alidriver/:/workspace/etc/aliyun-driver/”。
75+
#./docker/conf/:/conf”,可以把冒号前改为指定目录,比如“/homes/USER/docker/alidriver/:/conf”。
6976
# 删除了“/etc/localtime:/etc/localtime”,如有需要同步时间请自行添加在environment下。
7077
# 端口6666可自行按需更改,此端口为WebDAV连接端口,8080为容器内配置端口,修改请量力而为。
7178
# 建议不要保留这些中文注释,以防报错,比如QNAP。
@@ -92,7 +99,7 @@ sudo kubectl apply -f k8s_app.yaml
9299
WebDav账户,默认admin
93100
--aliyundrive.auth.password=admin
94101
WebDav密码,默认admin
95-
--aliyundrive.work-dir=/workspace/etc/aliyun-driver/
102+
--aliyundrive.work-dir=./conf
96103
token挂载路径(如果多开的话,需修改此配置)
97104

98105
```

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services:
88
restart: always
99
volumes:
1010
- /etc/localtime:/etc/localtime
11-
- ./docker/etc/aliyun-driver/:/workspace/etc/aliyun-driver/
11+
- ./docker/conf:/conf
1212
ports:
1313
- "8080:8080"
1414
tty: true

docker/conf/.gitkeep

Whitespace-only changes.

k8s_app.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ spec:
7979
- name: localtime
8080
mountPath: /etc/localtime
8181
- name: aliyun-driver
82-
mountPath: /workspace/etc/aliyun-driver/
82+
mountPath: /conf
8383
volumes:
8484
- name: localtime
8585
hostPath:
8686
path: /etc/localtime
8787
- name: aliyun-driver
8888
hostPath:
89-
path: /etc/aliyun-driver/
89+
path: ./docker/conf

src/main/java/com/github/zxbu/webdavteambition/config/AliYunDriveProperties.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class AliYunDriveProperties implements InitializingBean {
2424
public transient String authorization = "";
2525
public String refreshToken;
2626
public String refreshTokenNext;
27-
public String workDir = "/workspace/etc/aliyun-driver/";
27+
public transient String workDir = "./conf/";
2828
public String agent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_0_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36";
2929
public String driveId;
3030
public String userId;
@@ -66,6 +66,7 @@ public void afterPropertiesSet() throws Exception {
6666
String refreshToken = this.refreshToken;
6767
Auth auth = this.auth;
6868
AliYunDriveProperties other = load(workDir);
69+
other.workDir = workDir;
6970
BeanUtils.copyProperties(other, this);
7071
this.auth = auth;
7172
this.authorization = null;

0 commit comments

Comments
 (0)