From 2fb283c3f3d9a2f6a48b5e707e2dd7a102bffa67 Mon Sep 17 00:00:00 2001 From: Leo Date: Thu, 15 Jan 2026 20:13:15 +0800 Subject: [PATCH] 1 --- doc/WPS365集成使用说明.md | 8 ++++---- ruoyi-admin/src/main/resources/application.yml | 13 +++++++------ .../java/com/ruoyi/jarvis/config/WPS365Config.java | 8 ++++---- .../jarvis/service/impl/WPS365ApiServiceImpl.java | 1 + .../jarvis/service/impl/WPS365OAuthServiceImpl.java | 3 ++- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/doc/WPS365集成使用说明.md b/doc/WPS365集成使用说明.md index 5d894b4..b78f3b8 100644 --- a/doc/WPS365集成使用说明.md +++ b/doc/WPS365集成使用说明.md @@ -67,13 +67,13 @@ wps365: # 注意：使用 /wps365-callback 路径，避免前端路由拦截 redirect-uri: https://your-domain.com/wps365-callback # API基础地址（一般不需要修改） - api-base-url: https://open.wps.cn/api/v1 + api-base-url: https://openapi.wps.cn/api/v1 # OAuth授权地址（一般不需要修改） - oauth-url: https://open.wps.cn/oauth2/v1/authorize + oauth-url: https://openapi.wps.cn/oauth2/auth # 获取Token地址（一般不需要修改） - token-url: https://open.wps.cn/oauth2/v1/token + token-url: https://openapi.wps.cn/oauth2/token # 刷新Token地址（一般不需要修改） - refresh-token-url: https://open.wps.cn/oauth2/v1/token + refresh-token-url: https://openapi.wps.cn/oauth2/token ``` **重要提示**： diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index b8929b1..d868130 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -17,12 +17,13 @@ wps365: # 应用密钥（AppKey）- 需要在WPS365开放平台申请，注意保密 app-key: 4c58bc1642e5e8fa731f75af9370496a # 授权回调地址（需要在WPS365开放平台配置授权域名） - redirect-uri: https://jarvis.van333.cn/jarvis/wps365/oauth/callback + # 注意：使用 /wps365-callback 路径，避免前端路由拦截 + redirect-uri: https://jarvis.van333.cn/wps365-callback # API基础地址 - api-base-url: https://open.wps.cn/api/v1 - # OAuth授权地址 - oauth-url: https://open.wps.cn/oauth2/v1/authorize + api-base-url: https://openapi.wps.cn/api/v1 + # OAuth授权地址（正确格式：https://openapi.wps.cn/oauth2/auth） + oauth-url: https://openapi.wps.cn/oauth2/auth # 获取Token地址 - token-url: https://open.wps.cn/oauth2/v1/token + token-url: https://openapi.wps.cn/oauth2/token # 刷新Token地址 - refresh-token-url: https://open.wps.cn/oauth2/v1/token + refresh-token-url: https://openapi.wps.cn/oauth2/token diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/config/WPS365Config.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/config/WPS365Config.java index aa551c8..cc5d7eb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/config/WPS365Config.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/config/WPS365Config.java @@ -30,16 +30,16 @@ public class WPS365Config { private String redirectUri; /** API基础地址 */ - private String apiBaseUrl = "https://open.wps.cn/api/v1"; + private String apiBaseUrl = "https://openapi.wps.cn/api/v1"; /** OAuth授权地址 */ - private String oauthUrl = "https://open.wps.cn/oauth2/v1/authorize"; + private String oauthUrl = "https://openapi.wps.cn/oauth2/auth"; /** 获取Token地址 */ - private String tokenUrl = "https://open.wps.cn/oauth2/v1/token"; + private String tokenUrl = "https://openapi.wps.cn/oauth2/token"; /** 刷新Token地址 */ - private String refreshTokenUrl = "https://open.wps.cn/oauth2/v1/token"; + private String refreshTokenUrl = "https://openapi.wps.cn/oauth2/token"; /** * 配置初始化后验证 diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/WPS365ApiServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/WPS365ApiServiceImpl.java index c28c526..eb4d7f3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/WPS365ApiServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/WPS365ApiServiceImpl.java @@ -29,6 +29,7 @@ public class WPS365ApiServiceImpl implements IWPS365ApiService { @Override public JSONObject getUserInfo(String accessToken) { try { + // WPS365用户信息API: GET /api/v1/user/info String url = wps365Config.getApiBaseUrl() + "/user/info"; return WPS365ApiUtil.httpRequest("GET", url, accessToken, null); } catch (Exception e) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/WPS365OAuthServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/WPS365OAuthServiceImpl.java index 6b5540f..0f4efa4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/WPS365OAuthServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/WPS365OAuthServiceImpl.java @@ -69,7 +69,8 @@ public class WPS365OAuthServiceImpl implements IWPS365OAuthService { } authUrl.append("&response_type=code"); // WPS365的scope，根据官方文档设置 - authUrl.append("&scope=file.readwrite,user.info"); + // 注意：scope参数可能需要根据实际申请的权限调整 + authUrl.append("&scope=file.read,ksheet.read,user.info"); // 添加state参数 if (state == null || state.trim().isEmpty()) {