diff --git a/README.md b/README.md index 5c352e6..f94ca30 100644 --- a/README.md +++ b/README.md @@ -85,12 +85,12 @@ chmod +x ~/zfile/bin/*.sh 国际/家庭/个人版: -https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=09939809-c617-43c8-a220-a93c1513c5d4&response_type=code&redirect_uri=https://zfile.jun6.net/onedirve/callback&scope=offline_access%20User.Read%20Files.ReadWrite.All +https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=09939809-c617-43c8-a220-a93c1513c5d4&response_type=code&redirect_uri=https://zfile.jun6.net/onedrive/callback&scope=offline_access%20User.Read%20Files.ReadWrite.All 世纪互联版: -https://login.chinacloudapi.cn/common/oauth2/v2.0/authorize?client_id=4a72d927-1907-488d-9eb2-1b465c53c1c5&response_type=code&redirect_uri=https://zfile.jun6.net/onedirve/china-callback&scope=offline_access%20User.Read%20Files.ReadWrite.All +https://login.chinacloudapi.cn/common/oauth2/v2.0/authorize?client_id=4a72d927-1907-488d-9eb2-1b465c53c1c5&response_type=code&redirect_uri=https://zfile.jun6.net/onedrive/china-callback&scope=offline_access%20User.Read%20Files.ReadWrite.All 然后分别填写至访问令牌和刷新令牌即可: diff --git a/src/main/java/im/zhaojun/onedrive/china/service/OneDriveChinaServiceImpl.java b/src/main/java/im/zhaojun/onedrive/china/service/OneDriveChinaServiceImpl.java index 97f9987..18a34f3 100644 --- a/src/main/java/im/zhaojun/onedrive/china/service/OneDriveChinaServiceImpl.java +++ b/src/main/java/im/zhaojun/onedrive/china/service/OneDriveChinaServiceImpl.java @@ -28,16 +28,16 @@ public class OneDriveChinaServiceImpl extends AbstractOneDriveService implements @Resource private StorageConfigService storageConfigService; - @Value("${zfile.onedirve-china.clientId}") + @Value("${zfile.onedrive-china.clientId}") private String clientId; - @Value("${zfile.onedirve-china.redirectUri}") + @Value("${zfile.onedrive-china.redirectUri}") private String redirectUri; - @Value("${zfile.onedirve-china.clientSecret}") + @Value("${zfile.onedrive-china.clientSecret}") private String clientSecret; - @Value("${zfile.onedirve-china.scope}") + @Value("${zfile.onedrive-china.scope}") private String scope; @Override diff --git a/src/main/java/im/zhaojun/onedrive/common/controller/OneDriveController.java b/src/main/java/im/zhaojun/onedrive/common/controller/OneDriveController.java index e113392..1c4aa88 100644 --- a/src/main/java/im/zhaojun/onedrive/common/controller/OneDriveController.java +++ b/src/main/java/im/zhaojun/onedrive/common/controller/OneDriveController.java @@ -14,7 +14,7 @@ import javax.annotation.Resource; * @author zhaojun */ @Controller -@RequestMapping("/onedirve") +@RequestMapping("/onedrive") public class OneDriveController { @Resource diff --git a/src/main/java/im/zhaojun/onedrive/international/service/OneDriveServiceImpl.java b/src/main/java/im/zhaojun/onedrive/international/service/OneDriveServiceImpl.java index a3a2756..9e56531 100644 --- a/src/main/java/im/zhaojun/onedrive/international/service/OneDriveServiceImpl.java +++ b/src/main/java/im/zhaojun/onedrive/international/service/OneDriveServiceImpl.java @@ -28,16 +28,16 @@ public class OneDriveServiceImpl extends AbstractOneDriveService implements File @Resource private StorageConfigService storageConfigService; - @Value("${zfile.onedirve.clientId}") + @Value("${zfile.onedrive.clientId}") protected String clientId; - @Value("${zfile.onedirve.redirectUri}") + @Value("${zfile.onedrive.redirectUri}") protected String redirectUri; - @Value("${zfile.onedirve.clientSecret}") + @Value("${zfile.onedrive.clientSecret}") protected String clientSecret; - @Value("${zfile.onedirve.scope}") + @Value("${zfile.onedrive.scope}") protected String scope; @Override diff --git a/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/src/main/resources/META-INF/additional-spring-configuration-metadata.json index c307a1a..13e0c47 100644 --- a/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -18,22 +18,22 @@ "description": "密码文件 文件名." }, { - "name": "zfile.onedirve.clientId", + "name": "zfile.onedrive.clientId", "type": "java.lang.String", "description": "OneDrive ClientId." }, { - "name": "zfile.onedirve.clientSecret", + "name": "zfile.onedrive.clientSecret", "type": "java.lang.String", "description": "OneDrive ClientSecret." }, { - "name": "zfile.onedirve.redirectUri", + "name": "zfile.onedrive.redirectUri", "type": "java.lang.String", "description": "OneDrive 认证重定向地址." }, { - "name": "zfile.onedirve.scope", + "name": "zfile.onedrive.scope", "type": "java.lang.String", "description": "OneDrive 认证权限." } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8575abc..52d1455 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -58,15 +58,15 @@ zfile: constant: readme: readme.md password: password.txt - onedirve: + onedrive: clientId: 09939809-c617-43c8-a220-a93c1513c5d4 clientSecret: _l:zI-_yrW75lV8M61K@z.I2K@B/On6Q - redirectUri: https://zfile.jun6.net/onedirve/callback + redirectUri: https://zfile.jun6.net/onedrive/callback scope: offline_access User.Read Files.ReadWrite.All - onedirve-china: + onedrive-china: clientId: 4a72d927-1907-488d-9eb2-1b465c53c1c5 clientSecret: Y9CEA=82da5n-y_]KAWAgLH3?R9xf7Uw - redirectUri: https://zfile.jun6.net/onedirve/china-callback + redirectUri: https://zfile.jun6.net/onedrive/china-callback scope: offline_access User.Read Files.ReadWrite.All jetcache: