diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/H5OpenController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/H5OpenController.java index bc53266..2b53a67 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/H5OpenController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/H5OpenController.java @@ -131,16 +131,16 @@ public class H5OpenController { @ApiOperation("打开页:当前用户有文档返回最近一份,没有则创建空白docx") @GetMapping(value = "/doc/my-or-create", produces = MediaType.APPLICATION_JSON_VALUE) - public SingleResponse myOrCreate() { + public SingleResponse myOrCreate(@RequestParam("docxUrl") String docxUrl) { log.info("wps my-or-create"); - return SingleResponse.of(wpsApi.myOrCreate()); + return SingleResponse.of(wpsApi.myOrCreate(docxUrl)); } @ApiOperation("始终新建一份空白docx") @PostMapping(value = "/doc/create", produces = MediaType.APPLICATION_JSON_VALUE) - public SingleResponse createBlank() { + public SingleResponse createBlank(@RequestParam("docxUrl") String docxUrl) { log.info("wps create blank"); - return SingleResponse.of(wpsApi.createBlank()); + return SingleResponse.of(wpsApi.createBlank(docxUrl)); } private String toJson(Map result) { diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/WpsExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/WpsExecutor.java index 656c579..7edd25d 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/WpsExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/WpsExecutor.java @@ -315,7 +315,7 @@ public class WpsExecutor implements WpsApi { } @Override - public WpsDocOpenCO myOrCreate() { + public WpsDocOpenCO myOrCreate(String docxUrl) { try { Long userId = requireUserId(); String creatorId = String.valueOf(userId); @@ -323,7 +323,7 @@ public class WpsExecutor implements WpsApi { if (existing != null) { return toOpenCO(existing, false); } - WpsDocEntity created = doCreateBlankDoc(userId); + WpsDocEntity created = doCreateBlankDoc(userId, docxUrl); return toOpenCO(created, true); } catch (Exception e) { log.error("wps myOrCreate failed", e); @@ -332,10 +332,10 @@ public class WpsExecutor implements WpsApi { } @Override - public WpsDocOpenCO createBlank() { + public WpsDocOpenCO createBlank(String docxUrl) { try { Long userId = requireUserId(); - WpsDocEntity created = doCreateBlankDoc(userId); + WpsDocEntity created = doCreateBlankDoc(userId, docxUrl); return toOpenCO(created, true); } catch (Exception e) { log.error("wps createBlank failed", e); @@ -343,8 +343,9 @@ public class WpsExecutor implements WpsApi { } } - protected WpsDocEntity doCreateBlankDoc(Long userId) { - if (!StringUtils.hasText(defDocxUrl)) { + protected WpsDocEntity doCreateBlankDoc(Long userId, String docxUrl) { + String resDocxUrl = !StringUtils.hasText(docxUrl) ? defDocxUrl : docxUrl; + if (!StringUtils.hasText(resDocxUrl)) { throw new BizException(ErrorCode.WPS_BLANK_DOCX_URL_EMPTY); } Long orgId = requireOrgId(); @@ -354,14 +355,14 @@ public class WpsExecutor implements WpsApi { long nowEpoch = System.currentTimeMillis() / 1000; FileStorage saved; - try (InputStream inputStream = new URL(defDocxUrl).openStream()) { + try (InputStream inputStream = new URL(resDocxUrl).openStream()) { FileInfo ossFileInfo = fileStorageService.of(inputStream, docName).upload(); FileStorage fileStorage = FileStorageHelper.buildResource(ossFileInfo, docName, true); saved = fileStorageDomainService.saveResource(fileStorage); } catch (BizException e) { throw e; } catch (Exception e) { - log.error("download blank docx failed, url={}", defDocxUrl, e); + log.error("download blank docx failed, url={}", resDocxUrl, e); throw new BizException(ErrorCode.WPS_BLANK_DOCX_DOWNLOAD_FAILED, e); } @@ -417,11 +418,7 @@ public class WpsExecutor implements WpsApi { } private Long requireOrgId() { - Long orgId = AuthUserContextAdapter.getCurrentOrgId(); - if (orgId != null) { - return orgId; - } - orgId = ThreadLocalUserInfoAdapter.get(); + Long orgId = ThreadLocalUserInfoAdapter.get(); if (orgId != null) { return orgId; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/WpsApi.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/WpsApi.java index 947b575..6f32c49 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/WpsApi.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/WpsApi.java @@ -40,10 +40,10 @@ public interface WpsApi { /** * 打开页:当前用户有文档则返回最近一份,没有则创建空白 docx */ - WpsDocOpenCO myOrCreate(); + WpsDocOpenCO myOrCreate(String docxUrl); /** * 始终新建一份空白 docx(即使用户已有文档) */ - WpsDocOpenCO createBlank(); + WpsDocOpenCO createBlank(String docxUrl); } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/AccountMapper.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/AccountMapper.java index 86d2363..127d15d 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/AccountMapper.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/AccountMapper.java @@ -6,5 +6,4 @@ import org.qinan.safetyeval.infrastructure.dataobject.AccountDO; @Mapper public interface AccountMapper extends BaseMapper { - String getWps(int i); } diff --git a/safety-eval-infrastructure/src/main/resources/mapper/AccountMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/AccountMapper.xml index 5c2dab3..3a68f2c 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/AccountMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/AccountMapper.xml @@ -28,8 +28,5 @@ `id`, `user_name`, `account`, `phone`, `password`, `profile_url`, `type`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env` - diff --git a/safety-eval-start/src/main/resources/nacos/config-spring.yml b/safety-eval-start/src/main/resources/nacos/config-spring.yml index 587fc96..2f5ff8f 100644 --- a/safety-eval-start/src/main/resources/nacos/config-spring.yml +++ b/safety-eval-start/src/main/resources/nacos/config-spring.yml @@ -175,3 +175,4 @@ def: wps: upload-base-url: ${WPS_UPLOAD_BASE_URL:https://gbs-gateway.qhdsafety.com/safetyEval-h5/wsp} def-docx-url: https://test-dragon-yf-pub.oss-cn-hangzhou.aliyuncs.com/jjb/6a59d83ee4b0b4541389511f.docx +