5.0

sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/IsvInfoService.java

@@ -122,17 +122,23 @@ public class IsvInfoService implements LambdaService<IsvInfo, IsvInfoMapper> {
 
     public IsvKeysDTO getKeys(Long isvId) {
         IsvKeys isvKeys = isvKeysService.get(IsvKeys::getIsvId, isvId);
+        IsvKeysDTO isvKeysDTO;
         if (isvKeys == null) {
-            IsvKeysDTO isvKeysDTO = new IsvKeysDTO();
+            isvKeysDTO = new IsvKeysDTO();
             isvKeysDTO.setIsvId(isvId);
             isvKeysDTO.setKeyFormat(RSATool.KeyFormat.PKCS8.getValue());
             isvKeysDTO.setPublicKeyIsv("");
             isvKeysDTO.setPrivateKeyIsv("");
             isvKeysDTO.setPublicKeyPlatform("");
             isvKeysDTO.setPrivateKeyPlatform("");
-            return isvKeysDTO;
+        } else {
+            isvKeysDTO = CopyUtil.copyBean(isvKeys, IsvKeysDTO::new);
         }
-        return CopyUtil.copyBean(isvKeys, IsvKeysDTO::new);
+
+        IsvInfo isvInfo = this.getById(isvId);
+        isvKeysDTO.setAppId(isvInfo.getAppId());
+
+        return isvKeysDTO;
     }
 
     /**

sop-admin/sop-admin-backend/backend-service/src/main/java/com/gitee/sop/adminbackend/service/isv/dto/IsvKeysDTO.java

@@ -8,6 +8,8 @@ import lombok.Data;
 @Data
 public class IsvKeysDTO {
 
+    private String appId;
+
     private Long isvId;
 
     /**

sop-admin/sop-admin-frontend/src/utils/file.ts

@@ -0,0 +1,21 @@
+/**
+ * 下载文件
+ *
+ * @param filename 文件名称,带后缀,如:aa.txt
+ * @param text 文件内容
+ */
+export function downloadText(filename, text) {
+  const element = document.createElement("a");
+  element.setAttribute(
+    "href",
+    "data:text/plain;charset=utf-8," + encodeURIComponent(text)
+  );
+  element.setAttribute("download", filename);
+
+  element.style.display = "none";
+  document.body.appendChild(element);
+
+  element.click();
+
+  document.body.removeChild(element);
+}

sop-admin/sop-admin-frontend/src/views/isv/list/index.vue

@@ -21,6 +21,7 @@ import {
   dlgKeysShow,
   showKeysFormColumns,
   showKeysFormData,
+  downloadIsvKey,
   viewKeys
 } from "./showKeys";
 import {
@@ -98,8 +99,12 @@ import {
       v-model="showKeysFormData"
       :dialog="{ title: '秘钥 - 标识☆分配给开发者' }"
       :form="{ group: showKeysFormColumns, labelPosition: 'right' }"
+      @confirm="downloadIsvKey"
     >
       <template #dialog-footer="{ handleCancel }">
+        <el-button type="success" @click="downloadIsvKey">
+          下载开发者秘钥
+        </el-button>
         <el-button type="primary" @click="handleCancel">关闭</el-button>
       </template>
     </PlusDialogForm>

sop-admin/sop-admin-frontend/src/views/isv/list/showKeys.ts

@@ -2,10 +2,12 @@ import { ref } from "vue";
 import type { PlusFormGroupRow } from "plus-pro-components";
 import { api } from "@/api/isvList";
 import { KeyFormatEnum } from "@/model/enums";
+import { downloadText } from "@/utils/file";
 
 // 弹窗显示
 export const dlgKeysShow = ref(false);
 export const showKeysFormData = ref<any>({
+  appId: "",
   keyFormat: KeyFormatEnum.PKCS8,
   publicKeyIsv: "",
   privateKeyIsv: "",
@@ -17,6 +19,15 @@ export const showKeysFormColumns: PlusFormGroupRow[] = [
   {
     title: "基本信息",
     columns: [
+      {
+        label: "AppId",
+        prop: "appId",
+        labelWidth: 100,
+        valueType: "text",
+        fieldProps: {
+          disabled: true
+        }
+      },
       {
         label: "秘钥格式",
         prop: "keyFormat",
@@ -107,3 +118,23 @@ export const viewKeys = (row: any) => {
     dlgKeysShow.value = true;
   });
 };
+
+const downloadTemplate = `AppID:
+{appId}
+
+开发者私钥:
+{privateKeyIsv}
+
+平台公钥:
+{publicKeyPlatform}
+
+`;
+
+export const downloadIsvKey = () => {
+  let text = downloadTemplate
+    .replace("{appId}", showKeysFormData.value.appId)
+    .replace("{privateKeyIsv}", showKeysFormData.value.privateKeyIsv)
+    .replace("{publicKeyPlatform}", showKeysFormData.value.publicKeyPlatform);
+
+  downloadText(`key_${new Date().getTime()}.txt`, text);
+};

sop-website/sop-website-frontend/src/views/doc/api/index.ts

@@ -11,6 +11,8 @@ export const apiModules = ref([]);
 export const dataNodeType = ref("Object");
 export const requestParamsExample = ref({});
 export const responseParamsExample = ref({});
+export const defaultExpandedKeys = ref([]);
+export const currentNodeKey = ref(0);
 
 export const docAppId = ref(0);
 export const docAppList = ref([]);
@@ -234,6 +236,16 @@ function loadDocTree(id) {
   };
   docApi.listDocTree(params).then(resp => {
     docTree.value = resp.data;
+    // 默认展开并选中第一个
+    if (docTree.value?.length > 0) {
+      defaultExpandedKeys.value.push(docTree.value[0].docId);
+      const children = docTree.value[0]?.children;
+      if (children && children.length > 0) {
+        const firstNode = children[0];
+        currentNodeKey.value = firstNode.docId;
+        handleNodeClick(firstNode);
+      }
+    }
   });
 }
 

sop-website/sop-website-frontend/src/views/doc/api/index.vue

@@ -15,7 +15,9 @@ import {
   showUrl,
   showProdUrl,
   showSandBoxUrl,
-  showDoc
+  showDoc,
+  defaultExpandedKeys,
+  currentNodeKey
 } from "./index";
 import { ApiParamTable } from "@/components/ApiParamTable";
 import { useRouter } from "vue-router";
@@ -45,6 +47,9 @@ const defaultProps = {
       <el-tree
         :data="docTree"
         :props="defaultProps"
+        node-key="docId"
+        :default-expanded-keys="defaultExpandedKeys"
+        :current-node-key="currentNodeKey"
         style="margin-top: 10px"
         highlight-current
         @node-click="handleNodeClick"