From 32439fb635f57ec327a5ae9538cfb6823e6bf29c Mon Sep 17 00:00:00 2001
From: "huoyong.msb" <huoyong.msb@alibaba-inc.com>
Date: Sun, 7 Feb 2021 10:50:42 +0800
Subject: [PATCH] feat: fix a bunch of bugs

---
 package.json                   | 3 +--
 src/config/config.prod.ts      | 1 +
 src/routes/utils/tree.ts       | 3 ++-
 src/scripts/app.ts             | 2 +-
 src/service/export/markdown.ts | 2 +-
 src/service/migrate.ts         | 4 ++--
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index d3afbe5..9479b36 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,6 @@
     "typescript": "^3.8.3"
   },
   "pre-commit": [
-    "check",
-    "test"
+    "check"
   ]
 }
diff --git a/src/config/config.prod.ts b/src/config/config.prod.ts
index bb5d577..a0f7035 100644
--- a/src/config/config.prod.ts
+++ b/src/config/config.prod.ts
@@ -29,6 +29,7 @@ let config: IConfigOptions = {
   redis: {
     host: process.env.REDIS_URL || 'localhost',
     port: (process.env.REDIS_PORT && parseInt(process.env.REDIS_PORT)) || 6379,
+    password: process.env.REDIS_PWD || undefined,
   },
   mail: {
     host: process.env.MAIL_HOST ?? 'smtp.aliyun.com',
diff --git a/src/routes/utils/tree.ts b/src/routes/utils/tree.ts
index 331ce13..24ff6fe 100644
--- a/src/routes/utils/tree.ts
+++ b/src/routes/utils/tree.ts
@@ -54,7 +54,8 @@ export default class Tree {
       if (
         item.value &&
         item.value.indexOf('[') === 0 &&
-        item.value.substring(item.value.length - 1) === ']'
+        item.value.substring(item.value.length - 1) === ']' &&
+        !!rule
       ) {
         try {
           result[item.name + rule] = vm.run(`(${item.value})`)
diff --git a/src/scripts/app.ts b/src/scripts/app.ts
index cd9b72a..386690d 100644
--- a/src/scripts/app.ts
+++ b/src/scripts/app.ts
@@ -38,7 +38,7 @@ app.use(cors({
 }))
 app.use(async (ctx, next) => {
   await next()
-  if (typeof ctx.body === 'object' && ctx.body.data !== undefined) {
+  if (typeof ctx.body === 'object' && ctx.body?.data !== undefined) {
     ctx.type = 'json'
     ctx.body = JSON.stringify(ctx.body, undefined, 2)
   }
diff --git a/src/service/export/markdown.ts b/src/service/export/markdown.ts
index 4373e99..0e4c57e 100644
--- a/src/service/export/markdown.ts
+++ b/src/service/export/markdown.ts
@@ -7,7 +7,7 @@ const arrayToTree = (list: any[]): any => {
   const getValue = (parent: any) => {
     const children = list.filter((item: any) => item.parentId === parent.id)
     if (!children.length) {
-      return `${parent.type} ${parent.description ? `(${parent.description})` : ''}`
+      return `${parent.type} ${parent.required ? '(必选)' : ''} ${parent.description ? `(${parent.description})` : ''}`
     }
     const obj: { [k: string]: any } = {}
     children.forEach((e: any) => {
diff --git a/src/service/migrate.ts b/src/service/migrate.ts
index a18ff85..07ff749 100644
--- a/src/service/migrate.ts
+++ b/src/service/migrate.ts
@@ -1178,8 +1178,8 @@ export default class MigrateService {
 
   public static async importInterfaceFromJSON(data: any, curUserId: number, repositoryId: number, modId: number) {
 
-    let itfData = data.itf
-    let properties = data.properties
+    let itfData = data.itf ? data.itf : data
+    let properties = data.itf ? data.properties : itfData?.properties
 
     const itf = await Interface.create({
       moduleId: modId,