From ba384660f1ac22d7044126b751054a036875a75e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=AD=E5=A6=82?= <8775@163.com> Date: Wed, 20 Nov 2024 10:37:42 +0800 Subject: [PATCH] 5.0 --- .../common/enums/ConfigKeyEnum.java | 2 +- .../controller/doc/DocController.java | 42 ++++++++++++++ .../controller/doc/DocSettingController.java | 2 +- .../controller/doc/param/DocAppAddParam.java | 18 ++++++ .../{website/resp => doc/vo}/DocAppVO.java | 2 +- .../doc/{resp => vo}/DocSettingVO.java | 2 +- .../controller/isv/IsvInfoController.java | 8 +-- .../controller/isv/PermGroupController.java | 4 +- .../isv/PermGroupPermissionController.java | 4 +- .../isv/PermIsvGroupController.java | 2 +- .../{req => param}/IsvGroupSettingParam.java | 2 +- .../isv/{req => param}/IsvInfoAddParam.java | 2 +- .../IsvInfoUpdateKeysParam.java | 2 +- .../{req => param}/IsvInfoUpdateParam.java | 2 +- .../isv/{req => param}/IsvKeysGenParam.java | 2 +- .../{req => param}/PermGroupApiInfoParam.java | 2 +- .../{req => param}/PermGroupPageParam.java | 2 +- .../isv/{req => param}/PermGroupParam.java | 2 +- .../PermGroupPermissionParam.java | 2 +- .../controller/serve/ApiInfoController.java | 2 +- .../{req => param}/ApiInfoPageParam.java | 2 +- .../serve/{req => param}/ApiInfoParam.java | 2 +- .../controller/sys/LoginController.java | 4 +- .../controller/sys/SysConfigController.java | 2 +- .../{req => param}/ConfigSettingParam.java | 2 +- .../sys/{req => param}/LoginParam.java | 2 +- .../sys/{resp => vo}/LoginResultVO.java | 2 +- .../controller/website/WebsiteController.java | 4 +- .../website/{resp => vo}/DocInfoTreeVO.java | 2 +- .../adminbackend/service/doc/DocService.java | 49 ++++++++++++++-- .../adminbackend/service/doc/TornaClient.java | 51 +++++++++++++++++ .../service/doc/dto/TornaModuleDTO.java | 15 +++++ .../public/platform-config.json | 2 +- sop-admin/sop-admin-frontend/src/api/doc.ts | 32 +++++++++++ .../sop-admin-frontend/src/style/sidebar.scss | 2 +- .../src/views/doc/list/index.ts | 56 +++++++++++++++++++ .../src/views/doc/list/index.vue | 21 ++++++- 37 files changed, 313 insertions(+), 43 deletions(-) create mode 100644 sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/DocController.java create mode 100644 sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/param/DocAppAddParam.java rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/{website/resp => doc/vo}/DocAppVO.java (78%) rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/{resp => vo}/DocSettingVO.java (77%) rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/{req => param}/IsvGroupSettingParam.java (80%) rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/{req => param}/IsvInfoAddParam.java (85%) rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/{req => param}/IsvInfoUpdateKeysParam.java (94%) rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/{req => param}/IsvInfoUpdateParam.java (82%) rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/{req => param}/IsvKeysGenParam.java (87%) rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/{req => param}/PermGroupApiInfoParam.java (88%) rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/{req => param}/PermGroupPageParam.java (89%) rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/{req => param}/PermGroupParam.java (86%) rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/{req => param}/PermGroupPermissionParam.java (80%) rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/{req => param}/ApiInfoPageParam.java (89%) rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/{req => param}/ApiInfoParam.java (84%) rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/{req => param}/ConfigSettingParam.java (83%) rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/{req => param}/LoginParam.java (81%) rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/{resp => vo}/LoginResultVO.java (92%) rename sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/website/{resp => vo}/DocInfoTreeVO.java (96%) create mode 100644 sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/doc/TornaClient.java create mode 100644 sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/TornaModuleDTO.java create mode 100644 sop-admin/sop-admin-frontend/src/api/doc.ts create mode 100644 sop-admin/sop-admin-frontend/src/views/doc/list/index.ts diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/common/enums/ConfigKeyEnum.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/common/enums/ConfigKeyEnum.java index 9d7d9042..763b6dbf 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/common/enums/ConfigKeyEnum.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/common/enums/ConfigKeyEnum.java @@ -13,7 +13,7 @@ public enum ConfigKeyEnum { PASSWORD_SALT("admin.password-salt", ""), JWT_TIMEOUT_DAYS("admin.jwt-timeout-days", "365"), JWT_SECRET("admin.jwt.secret", ""), - TORNA_URL("admin.torna-url", ""), + TORNA_SERVER_ADDR("admin.torna-server-addr", ""), OPEN_PROD_URL("admin.open-prod-url", ""), OPEN_SANDBOX_URL("admin.open-sandbox-url", ""); diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/DocController.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/DocController.java new file mode 100644 index 00000000..2788f24f --- /dev/null +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/DocController.java @@ -0,0 +1,42 @@ +package com.gitee.sop.adminbackend.controller.doc; + +import com.gitee.sop.adminbackend.common.resp.Result; +import com.gitee.sop.adminbackend.common.util.CopyUtil; +import com.gitee.sop.adminbackend.controller.doc.param.DocAppAddParam; +import com.gitee.sop.adminbackend.controller.doc.vo.DocAppVO; +import com.gitee.sop.adminbackend.service.doc.DocService; +import com.gitee.sop.adminbackend.service.website.dto.DocAppDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author 六如 + */ +@RestController +@RequestMapping("doc") +public class DocController { + + @Autowired + private DocService docService; + + @GetMapping("app/list") + public Result> listApp() { + List docAppDTOS = docService.listDocApp(); + List docAppVOS = CopyUtil.copyList(docAppDTOS, DocAppVO::new); + return Result.ok(docAppVOS); + } + + @PostMapping("app/add") + public Result addApp(@Validated @RequestBody DocAppAddParam param) { + docService.addDocApp(param.getTornaToken()); + return Result.ok(1); + } + +} diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/DocSettingController.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/DocSettingController.java index 94aed4a7..a50cadff 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/DocSettingController.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/DocSettingController.java @@ -2,7 +2,7 @@ package com.gitee.sop.adminbackend.controller.doc; import com.gitee.sop.adminbackend.common.resp.Result; import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.controller.doc.resp.DocSettingVO; +import com.gitee.sop.adminbackend.controller.doc.vo.DocSettingVO; import com.gitee.sop.adminbackend.service.doc.DocService; import com.gitee.sop.adminbackend.service.doc.dto.DocSettingDTO; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/param/DocAppAddParam.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/param/DocAppAddParam.java new file mode 100644 index 00000000..93072690 --- /dev/null +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/param/DocAppAddParam.java @@ -0,0 +1,18 @@ +package com.gitee.sop.adminbackend.controller.doc.param; + +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; + +/** + * @author 六如 + */ +@Data +public class DocAppAddParam { + + @NotBlank + @Length(max = 128) + private String tornaToken; + +} diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/website/resp/DocAppVO.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/vo/DocAppVO.java similarity index 78% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/website/resp/DocAppVO.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/vo/DocAppVO.java index bd6d0f1d..489293d9 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/website/resp/DocAppVO.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/vo/DocAppVO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.website.resp; +package com.gitee.sop.adminbackend.controller.doc.vo; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/resp/DocSettingVO.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/vo/DocSettingVO.java similarity index 77% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/resp/DocSettingVO.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/vo/DocSettingVO.java index c210126d..057189c6 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/resp/DocSettingVO.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/doc/vo/DocSettingVO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.doc.resp; +package com.gitee.sop.adminbackend.controller.doc.vo; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/IsvInfoController.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/IsvInfoController.java index dfbd4d78..6f3391b5 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/IsvInfoController.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/IsvInfoController.java @@ -7,10 +7,10 @@ import com.gitee.sop.adminbackend.common.util.RSATool; import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO; import com.gitee.sop.adminbackend.common.req.StatusUpdateParam; import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.controller.isv.req.IsvInfoAddParam; -import com.gitee.sop.adminbackend.controller.isv.req.IsvInfoUpdateKeysParam; -import com.gitee.sop.adminbackend.controller.isv.req.IsvInfoUpdateParam; -import com.gitee.sop.adminbackend.controller.isv.req.IsvKeysGenParam; +import com.gitee.sop.adminbackend.controller.isv.param.IsvInfoAddParam; +import com.gitee.sop.adminbackend.controller.isv.param.IsvInfoUpdateKeysParam; +import com.gitee.sop.adminbackend.controller.isv.param.IsvInfoUpdateParam; +import com.gitee.sop.adminbackend.controller.isv.param.IsvKeysGenParam; import com.gitee.sop.adminbackend.dao.entity.IsvInfo; import com.gitee.sop.adminbackend.service.isv.IsvInfoService; import com.gitee.sop.adminbackend.service.isv.PermIsvGroupService; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermGroupController.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermGroupController.java index d203eede..0016fb69 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermGroupController.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermGroupController.java @@ -4,8 +4,8 @@ import com.gitee.fastmybatis.core.PageInfo; import com.gitee.fastmybatis.core.query.LambdaQuery; import com.gitee.sop.adminbackend.common.req.IdParam; import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.controller.isv.req.PermGroupPageParam; -import com.gitee.sop.adminbackend.controller.isv.req.PermGroupParam; +import com.gitee.sop.adminbackend.controller.isv.param.PermGroupPageParam; +import com.gitee.sop.adminbackend.controller.isv.param.PermGroupParam; import com.gitee.sop.adminbackend.dao.entity.PermGroup; import com.gitee.sop.adminbackend.service.isv.PermGroupService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermGroupPermissionController.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermGroupPermissionController.java index 1b4c9d62..2f489823 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermGroupPermissionController.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermGroupPermissionController.java @@ -3,8 +3,8 @@ package com.gitee.sop.adminbackend.controller.isv; import com.gitee.fastmybatis.core.PageInfo; import com.gitee.fastmybatis.core.query.LambdaQuery; import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.controller.isv.req.PermGroupApiInfoParam; -import com.gitee.sop.adminbackend.controller.isv.req.PermGroupPermissionParam; +import com.gitee.sop.adminbackend.controller.isv.param.PermGroupApiInfoParam; +import com.gitee.sop.adminbackend.controller.isv.param.PermGroupPermissionParam; import com.gitee.sop.adminbackend.dao.entity.ApiInfo; import com.gitee.sop.adminbackend.service.isv.PermGroupPermissionService; import com.gitee.sop.adminbackend.service.isv.dto.PermGroupPermissionDTO; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermIsvGroupController.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermIsvGroupController.java index 6a85486e..ba6db7ee 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermIsvGroupController.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/PermIsvGroupController.java @@ -2,7 +2,7 @@ package com.gitee.sop.adminbackend.controller.isv; import com.gitee.sop.adminbackend.common.context.SpringContext; import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.controller.isv.req.IsvGroupSettingParam; +import com.gitee.sop.adminbackend.controller.isv.param.IsvGroupSettingParam; import com.gitee.sop.adminbackend.service.isv.PermIsvGroupService; import com.gitee.sop.adminbackend.service.isv.dto.IsvGroupSettingDTO; import com.gitee.sop.adminbackend.service.isv.event.ChangeIsvPermEvent; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/IsvGroupSettingParam.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvGroupSettingParam.java similarity index 80% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/IsvGroupSettingParam.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvGroupSettingParam.java index 12703366..fec29489 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/IsvGroupSettingParam.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvGroupSettingParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.req; +package com.gitee.sop.adminbackend.controller.isv.param; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/IsvInfoAddParam.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoAddParam.java similarity index 85% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/IsvInfoAddParam.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoAddParam.java index 0349afbb..9e4b50ad 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/IsvInfoAddParam.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoAddParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.req; +package com.gitee.sop.adminbackend.controller.isv.param; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/IsvInfoUpdateKeysParam.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoUpdateKeysParam.java similarity index 94% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/IsvInfoUpdateKeysParam.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoUpdateKeysParam.java index e131c0e0..4fdbde89 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/IsvInfoUpdateKeysParam.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoUpdateKeysParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.req; +package com.gitee.sop.adminbackend.controller.isv.param; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/IsvInfoUpdateParam.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoUpdateParam.java similarity index 82% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/IsvInfoUpdateParam.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoUpdateParam.java index 1fabee8b..8b88039f 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/IsvInfoUpdateParam.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvInfoUpdateParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.req; +package com.gitee.sop.adminbackend.controller.isv.param; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/IsvKeysGenParam.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvKeysGenParam.java similarity index 87% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/IsvKeysGenParam.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvKeysGenParam.java index f7bfa25a..4f54e347 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/IsvKeysGenParam.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/IsvKeysGenParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.req; +package com.gitee.sop.adminbackend.controller.isv.param; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/PermGroupApiInfoParam.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupApiInfoParam.java similarity index 88% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/PermGroupApiInfoParam.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupApiInfoParam.java index 7ecb9e4a..4b196184 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/PermGroupApiInfoParam.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupApiInfoParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.req; +package com.gitee.sop.adminbackend.controller.isv.param; import com.gitee.fastmybatis.core.query.Operator; import com.gitee.fastmybatis.core.query.annotation.Condition; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/PermGroupPageParam.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupPageParam.java similarity index 89% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/PermGroupPageParam.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupPageParam.java index 5a86e931..e04b7f45 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/PermGroupPageParam.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupPageParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.req; +package com.gitee.sop.adminbackend.controller.isv.param; import com.gitee.fastmybatis.core.query.Operator; import com.gitee.fastmybatis.core.query.annotation.Condition; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/PermGroupParam.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupParam.java similarity index 86% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/PermGroupParam.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupParam.java index 6633a8ef..a7d7b39b 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/PermGroupParam.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.req; +package com.gitee.sop.adminbackend.controller.isv.param; import com.gitee.fastmybatis.core.query.Operator; import com.gitee.fastmybatis.core.query.annotation.Condition; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/PermGroupPermissionParam.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupPermissionParam.java similarity index 80% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/PermGroupPermissionParam.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupPermissionParam.java index 2dc661ab..3d608c03 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/req/PermGroupPermissionParam.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/isv/param/PermGroupPermissionParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.isv.req; +package com.gitee.sop.adminbackend.controller.isv.param; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/ApiInfoController.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/ApiInfoController.java index 1c455436..2634cc7a 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/ApiInfoController.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/ApiInfoController.java @@ -5,7 +5,7 @@ import com.gitee.fastmybatis.core.query.Query; import com.gitee.sop.adminbackend.common.dto.StatusUpdateDTO; import com.gitee.sop.adminbackend.common.req.StatusUpdateParam; import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.controller.serve.req.ApiInfoPageParam; +import com.gitee.sop.adminbackend.controller.serve.param.ApiInfoPageParam; import com.gitee.sop.adminbackend.dao.entity.ApiInfo; import com.gitee.sop.adminbackend.service.serve.ApiInfoService; import com.gitee.sop.adminbackend.common.util.CopyUtil; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/req/ApiInfoPageParam.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/param/ApiInfoPageParam.java similarity index 89% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/req/ApiInfoPageParam.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/param/ApiInfoPageParam.java index 2cb9b1dc..cf2dc359 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/req/ApiInfoPageParam.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/param/ApiInfoPageParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.serve.req; +package com.gitee.sop.adminbackend.controller.serve.param; import com.gitee.fastmybatis.core.query.Operator; import com.gitee.fastmybatis.core.query.annotation.Condition; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/req/ApiInfoParam.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/param/ApiInfoParam.java similarity index 84% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/req/ApiInfoParam.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/param/ApiInfoParam.java index 1f2d1da9..5bab3382 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/req/ApiInfoParam.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/serve/param/ApiInfoParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.serve.req; +package com.gitee.sop.adminbackend.controller.serve.param; import com.gitee.fastmybatis.core.query.Operator; import com.gitee.fastmybatis.core.query.annotation.Condition; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/LoginController.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/LoginController.java index 587d36b6..cdc14370 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/LoginController.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/LoginController.java @@ -2,8 +2,8 @@ package com.gitee.sop.adminbackend.controller.sys; import com.gitee.sop.adminbackend.common.annotation.NoToken; import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.controller.sys.req.LoginParam; -import com.gitee.sop.adminbackend.controller.sys.resp.LoginResultVO; +import com.gitee.sop.adminbackend.controller.sys.param.LoginParam; +import com.gitee.sop.adminbackend.controller.sys.vo.LoginResultVO; import com.gitee.sop.adminbackend.service.sys.login.LoginService; import com.gitee.sop.adminbackend.service.sys.login.dto.LoginDTO; import com.gitee.sop.adminbackend.service.sys.login.dto.LoginUser; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysConfigController.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysConfigController.java index 9a248672..94892081 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysConfigController.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/SysConfigController.java @@ -1,7 +1,7 @@ package com.gitee.sop.adminbackend.controller.sys; import com.gitee.sop.adminbackend.common.resp.Result; -import com.gitee.sop.adminbackend.controller.sys.req.ConfigSettingParam; +import com.gitee.sop.adminbackend.controller.sys.param.ConfigSettingParam; import com.gitee.sop.adminbackend.service.sys.SysConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/req/ConfigSettingParam.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/ConfigSettingParam.java similarity index 83% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/req/ConfigSettingParam.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/ConfigSettingParam.java index 010cd8d8..544e4fa1 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/req/ConfigSettingParam.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/ConfigSettingParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.sys.req; +package com.gitee.sop.adminbackend.controller.sys.param; import com.gitee.sop.adminbackend.service.sys.dto.SystemConfigDTO; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/req/LoginParam.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/LoginParam.java similarity index 81% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/req/LoginParam.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/LoginParam.java index cdfcd4d2..b4d3a593 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/req/LoginParam.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/param/LoginParam.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.sys.req; +package com.gitee.sop.adminbackend.controller.sys.param; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/resp/LoginResultVO.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/vo/LoginResultVO.java similarity index 92% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/resp/LoginResultVO.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/vo/LoginResultVO.java index 4d16c93d..cfd2ebc3 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/resp/LoginResultVO.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/sys/vo/LoginResultVO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.sys.resp; +package com.gitee.sop.adminbackend.controller.sys.vo; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/website/WebsiteController.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/website/WebsiteController.java index 7abe1436..29ce9c7f 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/website/WebsiteController.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/website/WebsiteController.java @@ -3,8 +3,8 @@ package com.gitee.sop.adminbackend.controller.website; import com.gitee.sop.adminbackend.common.annotation.NoToken; import com.gitee.sop.adminbackend.common.resp.Result; import com.gitee.sop.adminbackend.common.util.CopyUtil; -import com.gitee.sop.adminbackend.controller.website.resp.DocAppVO; -import com.gitee.sop.adminbackend.controller.website.resp.DocInfoTreeVO; +import com.gitee.sop.adminbackend.controller.doc.vo.DocAppVO; +import com.gitee.sop.adminbackend.controller.website.vo.DocInfoTreeVO; import com.gitee.sop.adminbackend.service.website.WebsiteService; import com.gitee.sop.adminbackend.service.website.dto.DocAppDTO; import com.gitee.sop.adminbackend.service.website.dto.DocInfoTreeDTO; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/website/resp/DocInfoTreeVO.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocInfoTreeVO.java similarity index 96% rename from sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/website/resp/DocInfoTreeVO.java rename to sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocInfoTreeVO.java index 2a975e30..0f56dd8c 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/website/resp/DocInfoTreeVO.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/controller/website/vo/DocInfoTreeVO.java @@ -1,4 +1,4 @@ -package com.gitee.sop.adminbackend.controller.website.resp; +package com.gitee.sop.adminbackend.controller.website.vo; import com.gitee.fastmybatis.core.support.TreeNode; import lombok.Data; diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/doc/DocService.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/doc/DocService.java index b9679fec..4311435e 100644 --- a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/doc/DocService.java +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/doc/DocService.java @@ -1,14 +1,30 @@ package com.gitee.sop.adminbackend.service.doc; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.gitee.httphelper.HttpHelper; import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum; +import com.gitee.sop.adminbackend.common.exception.BizException; +import com.gitee.sop.adminbackend.common.util.CopyUtil; +import com.gitee.sop.adminbackend.dao.entity.DocApp; +import com.gitee.sop.adminbackend.dao.mapper.DocAppMapper; import com.gitee.sop.adminbackend.service.doc.dto.DocSettingDTO; +import com.gitee.sop.adminbackend.service.doc.dto.TornaModuleDTO; import com.gitee.sop.adminbackend.service.sys.SysConfigService; import com.gitee.sop.adminbackend.service.sys.dto.SystemConfigDTO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - +import java.io.IOException; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collection; +import java.util.List; +import java.util.Objects; + +import com.gitee.sop.adminbackend.service.website.dto.DocAppDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; +import org.springframework.util.StringUtils; + /** @@ -20,9 +36,15 @@ public class DocService { @Autowired private SysConfigService sysConfigService; + @Autowired + private DocAppMapper docAppMapper; + + @Autowired + private TornaClient tornaClient; + public DocSettingDTO getDocSetting() { DocSettingDTO docSettingDTO = new DocSettingDTO(); - docSettingDTO.setTornaServerAddr(ConfigKeyEnum.TORNA_URL.getValue()); + docSettingDTO.setTornaServerAddr(ConfigKeyEnum.TORNA_SERVER_ADDR.getValue()); docSettingDTO.setOpenProdUrl(ConfigKeyEnum.OPEN_PROD_URL.getValue()); docSettingDTO.setOpenSandboxUrl(ConfigKeyEnum.OPEN_SANDBOX_URL.getValue()); return docSettingDTO; @@ -30,10 +52,27 @@ public class DocService { public void save(DocSettingDTO docSettingDTO) { Collection systemConfigDTOS = new ArrayList<>(); - systemConfigDTOS.add(new SystemConfigDTO(ConfigKeyEnum.TORNA_URL.getKey(), docSettingDTO.getTornaServerAddr(), "Torna服务器地址")); + systemConfigDTOS.add(new SystemConfigDTO(ConfigKeyEnum.TORNA_SERVER_ADDR.getKey(), docSettingDTO.getTornaServerAddr(), "Torna服务器地址")); systemConfigDTOS.add(new SystemConfigDTO(ConfigKeyEnum.OPEN_PROD_URL.getKey(), docSettingDTO.getOpenProdUrl(), "开放平台线上地址")); systemConfigDTOS.add(new SystemConfigDTO(ConfigKeyEnum.OPEN_SANDBOX_URL.getKey(), docSettingDTO.getOpenSandboxUrl(), "开放平台沙箱地址")); sysConfigService.save(systemConfigDTOS); } + public void addDocApp(String token) { + if (docAppMapper.checkExist(DocApp::getToken, token)) { + throw new BizException("该应用已添加"); + } + TornaModuleDTO tornaModuleDTO = tornaClient.execute("module.get", null, token, TornaModuleDTO.class); + DocApp docApp = new DocApp(); + docApp.setAppName(tornaModuleDTO.getName()); + docApp.setToken(token); + docAppMapper.saveIgnoreNull(docApp); + } + + public List listDocApp() { + List docApps = docAppMapper.listAll(); + return CopyUtil.copyList(docApps, DocAppDTO::new); + } + + } diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/doc/TornaClient.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/doc/TornaClient.java new file mode 100644 index 00000000..6e1bb938 --- /dev/null +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/doc/TornaClient.java @@ -0,0 +1,51 @@ +package com.gitee.sop.adminbackend.service.doc; + +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.gitee.httphelper.HttpHelper; +import com.gitee.sop.adminbackend.common.enums.ConfigKeyEnum; +import com.gitee.sop.adminbackend.common.exception.BizException; +import org.springframework.stereotype.Component; +import org.springframework.util.ObjectUtils; +import org.springframework.util.StringUtils; + +import java.io.IOException; +import java.util.Objects; + +/** + * @author 六如 + */ +@Component +public class TornaClient { + + public T execute(String name, Object param, String token, Class respClass) { + try { + HttpHelper httpHelper = HttpHelper.get(getTornaApiUrl()) + .parameter("name", name) + .parameter("access_token", token); + if (param != null) { + httpHelper.parameter("data", JSON.toJSONString(param)); + } + String body = httpHelper + .execute() + .asString(); + JSONObject jsonObject = JSON.parseObject(body); + if (!Objects.equals("0", jsonObject.getString("code"))) { + throw new BizException(jsonObject.getString("msg")); + } + JSONObject data = jsonObject.getJSONObject("data"); + return data.toJavaObject(respClass); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public String getTornaApiUrl() { + String value = ConfigKeyEnum.TORNA_SERVER_ADDR.getValue(); + if (ObjectUtils.isEmpty(value)) { + throw new BizException("Torna服务器地址未配置"); + } + return StringUtils.trimTrailingCharacter(value, '/') + "/api"; + } + +} diff --git a/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/TornaModuleDTO.java b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/TornaModuleDTO.java new file mode 100644 index 00000000..ccc57609 --- /dev/null +++ b/sop-admin/sop-admin-backend/src/main/java/com/gitee/sop/adminbackend/service/doc/dto/TornaModuleDTO.java @@ -0,0 +1,15 @@ +package com.gitee.sop.adminbackend.service.doc.dto; + +import lombok.Data; + +/** + * @author 六如 + */ +@Data +public class TornaModuleDTO { + + private Long id; + + private String name; + +} diff --git a/sop-admin/sop-admin-frontend/public/platform-config.json b/sop-admin/sop-admin-frontend/public/platform-config.json index fe9bca48..1ed42be9 100644 --- a/sop-admin/sop-admin-frontend/public/platform-config.json +++ b/sop-admin/sop-admin-frontend/public/platform-config.json @@ -4,7 +4,7 @@ "FixedHeader": true, "HiddenSideBar": false, "MultiTagsCache": false, - "KeepAlive": true, + "KeepAlive": false, "Locale": "zh", "Layout": "vertical", "Theme": "light", diff --git a/sop-admin/sop-admin-frontend/src/api/doc.ts b/sop-admin/sop-admin-frontend/src/api/doc.ts new file mode 100644 index 00000000..0bdbb7d2 --- /dev/null +++ b/sop-admin/sop-admin-frontend/src/api/doc.ts @@ -0,0 +1,32 @@ +import { createUrl, http } from "@/utils/http"; +import type { Result } from "@/model"; + +// 后端请求接口 +const apiUrl: any = createUrl({ + addApp: "/doc/app/add", + listApp: "/doc/app/list" +}); + +interface DocApp { + id: number; + appName: string; +} + +/** + * 接口管理 + */ +export const api: any = { + /** + * 分页查询 + */ + listApp(): Promise>> { + return http.get>, any>(apiUrl.listApp, {}); + }, + /** + * 新增 + * @param data 表单内容 + */ + addApp(data: object) { + return http.post, any>(apiUrl.addApp, { data }); + } +}; diff --git a/sop-admin/sop-admin-frontend/src/style/sidebar.scss b/sop-admin/sop-admin-frontend/src/style/sidebar.scss index 34d05b0e..344eeed2 100644 --- a/sop-admin/sop-admin-frontend/src/style/sidebar.scss +++ b/sop-admin/sop-admin-frontend/src/style/sidebar.scss @@ -50,7 +50,7 @@ height: 100vh; min-height: 100%; margin-left: $sideBarWidth; - background: #f0f2f5; + //background: #f0f2f5; /* main-content 属性动画 */ transition: margin-left var(--pure-transition-duration); diff --git a/sop-admin/sop-admin-frontend/src/views/doc/list/index.ts b/sop-admin/sop-admin-frontend/src/views/doc/list/index.ts new file mode 100644 index 00000000..160da113 --- /dev/null +++ b/sop-admin/sop-admin-frontend/src/views/doc/list/index.ts @@ -0,0 +1,56 @@ +import { ref } from "vue"; +import { ElMessage, ElMessageBox } from "element-plus"; +import { api } from "@/api/doc"; + +export const tabsData = ref>([ + { + id: "", + appName: "" + } +]); + +export const activeName = ref(0); + +export const handleClick = data => { + const id = data.props.name; + loadContent(id); +}; + +export const handleAddApp = () => { + ElMessageBox.prompt("请输入Torna应用token", "添加应用", { + confirmButtonText: "确定", + cancelButtonText: "取消", + inputPattern: /\w+/, + inputErrorMessage: "请输入Torna应用token" + }) + .then(({ value }) => { + const data = { + tornaToken: value + }; + api.addApp(data).then(() => { + ElMessage.success("添加成功"); + loadTabs(true); + }); + }) + .catch(() => {}); +}; + +const loadTabs = showLast => { + api.listApp().then(resp => { + tabsData.value = resp.data; + const length = tabsData.value.length; + if (length > 0) { + const showData = showLast + ? tabsData.value[length - 1] + : tabsData.value[0]; + activeName.value = showData.id; + loadContent(showData.id); + } + }); +}; + +const loadContent = id => { + console.log(id); +}; + +loadTabs(false); diff --git a/sop-admin/sop-admin-frontend/src/views/doc/list/index.vue b/sop-admin/sop-admin-frontend/src/views/doc/list/index.vue index 884c31c2..63c99e17 100644 --- a/sop-admin/sop-admin-frontend/src/views/doc/list/index.vue +++ b/sop-admin/sop-admin-frontend/src/views/doc/list/index.vue @@ -1,6 +1,23 @@