diff --git a/src/main/java/vin/vio/collaboraonline/service/FileService.java b/src/main/java/vin/vio/collaboraonline/service/FileService.java index 69ee541..6e21681 100644 --- a/src/main/java/vin/vio/collaboraonline/service/FileService.java +++ b/src/main/java/vin/vio/collaboraonline/service/FileService.java @@ -26,9 +26,6 @@ import java.nio.file.*; @Service public class FileService { - @Value("${collabora.file-storage-path}") - private String BASE_DIR; - @Autowired private KingdeeService kingdeeService; diff --git a/src/main/java/vin/vio/collaboraonline/service/KingdeeService.java b/src/main/java/vin/vio/collaboraonline/service/KingdeeService.java index ed761f4..327b44c 100644 --- a/src/main/java/vin/vio/collaboraonline/service/KingdeeService.java +++ b/src/main/java/vin/vio/collaboraonline/service/KingdeeService.java @@ -37,13 +37,16 @@ public class KingdeeService { @Value("${collabora.file-storage-path}") private String BASE_DIR; + @Value("${ensign.kingdee.attachment-query-uri}") + private String attachmentQueryURI; + @Autowired private AuthService authService; public String requestFile(String attPkId) { try { String accessToken = authService.initAccessToken(); - URI newUri = new URI(authService.initBasePath() + "/ierp/kapi/v2/yem/yem_receipt/AttachmentsQueryAPI/Query"); + URI newUri = new URI(authService.initBasePath() + attachmentQueryURI); ClientHttpRequest delegate = new SimpleClientHttpRequestFactory().createRequest(newUri, HttpMethod.POST); delegate.getHeaders().add("access_token", accessToken); diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index 417eea9..56adbfa 100644 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -1,7 +1,5 @@ collabora: # 本机局域网ip,注意 CollaboraOnline容器需要访问该地址,,最后不要加/ - host-server-addr: http://47.99.175.155:59981 - - # 文件保存路径 + host-server-addr: https://web-api.wmyun.com file-storage-path: /work/projects/collabora-api/file \ No newline at end of file diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 04da934..3434f15 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -4,10 +4,12 @@ spring: profiles: active: dev -# http://192.168.3.211:9980/browser/dist/cool.html?WOPISrc=http://192.168.3.104:8080/wopi/files/test.docx&lang=zh-cn +# http://192.168.3.211:9980/browser/dist/cool.html?WOPISrc=http://192.168.3.104:8080/wopi/files/2087131858671270912&lang=zh-cn # http://47.99.175.155:59980/browser/dist/cool.html?lang=zh-cn&WOPISrc=http://47.99.175.155:59981/wopi/files/test.docx +# https://web.wmyun.com/browser/dist/cool.html?lang=zh-cn&WOPISrc=https://web-api.wmyun.com/wopi/files/2127702662332843008 + # http://:<端口>/browser/dist/cool.html?WOPISrc=http://<本机IP>:<服务端口>/wopi/files/<文件名>&lang=zh-cn @@ -28,4 +30,6 @@ ensign: language: 'zh_CN' accessToken: user: 'COSMIC' - usertype: 'UserName' \ No newline at end of file + usertype: 'UserName' + + attachment-query-uri: /ierp/kapi/v2/yem/yem_receipt/AttachmentsQueryAPI/Query \ No newline at end of file