From daa2ef52030dbbc01a7b8c6c0728dfba0dcb8148 Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Wed, 27 Jul 2022 15:36:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E5=BA=93=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E9=80=89=E4=B8=AD=E6=95=B0=E6=8D=AE=E7=94=9F=E6=88=90?=
 =?UTF-8?q?insert=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mayfly_go_web/package.json                    |  2 +-
 mayfly_go_web/src/views/ops/db/SqlExec.vue    | 45 +++++++++++++++++++
 .../src/views/ops/machine/FileManage.vue      |  2 +-
 mayfly_go_web/yarn.lock                       |  8 ++--
 server/config.yml                             |  3 +-
 .../machine/ws_shell_session.go               |  2 +-
 server/pkg/config/jwt.go                      |  1 -
 server/pkg/ctx/token.go                       |  8 +++-
 server/pkg/utils/rand.go                      | 25 +++++++++++
 9 files changed, 86 insertions(+), 10 deletions(-)
 create mode 100644 server/pkg/utils/rand.go

diff --git a/mayfly_go_web/package.json b/mayfly_go_web/package.json
index 52c95bf9..dce3bf01 100644
--- a/mayfly_go_web/package.json
+++ b/mayfly_go_web/package.json
@@ -13,7 +13,7 @@
     "countup.js": "^2.0.7",
     "cropperjs": "^1.5.11",
     "echarts": "^5.3.3",
-    "element-plus": "^2.2.10",
+    "element-plus": "2.2.9",
     "jsencrypt": "^3.2.1",
     "jsoneditor": "^9.9.0",
     "lodash": "^4.17.21",
diff --git a/mayfly_go_web/src/views/ops/db/SqlExec.vue b/mayfly_go_web/src/views/ops/db/SqlExec.vue
index aa96672a..93dd6dd7 100644
--- a/mayfly_go_web/src/views/ops/db/SqlExec.vue
+++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue
@@ -152,6 +152,10 @@
                         <el-tooltip class="box-item" effect="dark" content="commit" placement="top">
                             <el-link @click="onCommit" class="ml5" type="success" icon="check" :underline="false"></el-link>
                         </el-tooltip>
+
+                        <el-tooltip class="box-item" effect="dark" content="生成insert sql" placement="top">
+                            <el-link @click="onGenerateInsertSql" type="success" class="ml20" :underline="false">gi</el-link>
+                        </el-tooltip>
                     </el-row>
                     <el-row class="mt5">
                         <el-input
@@ -263,6 +267,10 @@
                 </span>
             </template>
         </el-dialog>
+
+        <el-dialog @close="genSqlDialog.visible = false" v-model="genSqlDialog.visible" title="SQL" width="1000px">
+            <el-input v-model="genSqlDialog.sql" type="textarea" rows="20" />
+        </el-dialog>
     </div>
 </template>
 
@@ -353,6 +361,10 @@ export default defineComponent({
                 condition: '=',
                 value: null,
             },
+            genSqlDialog: {
+                visible: false,
+                sql: '',
+            },
             cmOptions: {
                 tabSize: 4,
                 mode: 'text/x-sql',
@@ -1016,6 +1028,38 @@ export default defineComponent({
             });
         };
 
+        const onGenerateInsertSql = async () => {
+            const queryTab = isQueryTab();
+            const datas = queryTab ? state.queryTab.selectionDatas : state.dataTabs[state.activeName].selectionDatas;
+            isTrue(datas && datas.length > 0, '请先选择要生成insert语句的数据');
+            const tableName = state.nowTableName;
+            const columns: any = await getColumns(tableName);
+
+            const sqls = [];
+            for (let data of datas) {
+                let colNames = [];
+                let values = [];
+                for (let column of columns) {
+                    const colName = column.columnName;
+                    colNames.push(colName);
+                    values.push(wrapValueByType(data[colName]));
+                }
+                sqls.push(`INSERT INTO ${tableName} (${colNames.join(', ')}) VALUES(${values.join(', ')})`);
+            }
+            state.genSqlDialog.sql = sqls.join(';\n') + ';';
+            state.genSqlDialog.visible = true;
+        };
+
+        const wrapValueByType = (val: any) => {
+            if (val == null) {
+                return 'NULL';
+            }
+            if (typeof val == 'number') {
+                return val;
+            }
+            return `'${val}'`;
+        };
+
         /**
          * 是否为查询tab
          */
@@ -1192,6 +1236,7 @@ export default defineComponent({
             onDataSelectionChange,
             onDeleteData,
             onTableSortChange,
+            onGenerateInsertSql,
             showExecBtns,
             closeExecBtns,
         };
diff --git a/mayfly_go_web/src/views/ops/machine/FileManage.vue b/mayfly_go_web/src/views/ops/machine/FileManage.vue
index 00d6d30d..54188b40 100755
--- a/mayfly_go_web/src/views/ops/machine/FileManage.vue
+++ b/mayfly_go_web/src/views/ops/machine/FileManage.vue
@@ -57,7 +57,7 @@
             </el-row>
         </el-dialog>
 
-        <el-dialog :title="tree.title" v-model="tree.visible" :close-on-click-modal="false" width="680px">
+        <el-dialog :title="tree.title" v-model="tree.visible" :close-on-click-modal="false" width="50%">
             <el-progress
                 v-if="uploadProgressShow"
                 style="width: 90%; margin-left: 20px"
diff --git a/mayfly_go_web/yarn.lock b/mayfly_go_web/yarn.lock
index 83042611..3c8f128f 100644
--- a/mayfly_go_web/yarn.lock
+++ b/mayfly_go_web/yarn.lock
@@ -633,10 +633,10 @@ echarts@^5.3.3:
     tslib "2.3.0"
     zrender "5.3.2"
 
-element-plus@^2.2.10:
-  version "2.2.10"
-  resolved "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.10.tgz#0b06a006b67b7ad3d5f071545a910782f9ba471b"
-  integrity sha512-hJ+LlbRN3POu4Idl1LXB+SHSWdi+wwmdsoDXdQT2ynGuwzZsMYiusOooYXyEsPlrizeLibdnNGNDx4TIjXQvUg==
+element-plus@2.2.9:
+  version "2.2.9"
+  resolved "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.9.tgz#f0366dfb2048d614813926274cb443f17e5fdef2"
+  integrity sha512-jYbL0JkCdv95rkT6trZJjCAizLPySa0qcd2cgq+57SKQnCZAcNDDq4GbTuFRnNavdoeCJnuM3HIficTIUpsMOQ==
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
     "@element-plus/icons-vue" "^2.0.6"
diff --git a/server/config.yml b/server/config.yml
index 557f2931..a00669f7 100644
--- a/server/config.yml
+++ b/server/config.yml
@@ -25,7 +25,8 @@ server:
       filepath: ./static/config.js
 
 jwt:
-  key: mykey
+  # jwt key，不设置默认使用随机字符串
+  key: 
   # 过期时间单位分钟
   expire-time: 1440
 
diff --git a/server/internal/devops/infrastructure/machine/ws_shell_session.go b/server/internal/devops/infrastructure/machine/ws_shell_session.go
index bc847670..5d1a1044 100644
--- a/server/internal/devops/infrastructure/machine/ws_shell_session.go
+++ b/server/internal/devops/infrastructure/machine/ws_shell_session.go
@@ -76,7 +76,7 @@ func NewLogicSshWsSession(cols, rows int, cli *Cli, wsConn *websocket.Conn) (*Lo
 		ssh.TTY_OP_OSPEED: 14400, // output speed = 14.4kbaud
 	}
 	// Request pseudo terminal
-	if err := sshSession.RequestPty("xterm", rows, cols, modes); err != nil {
+	if err := sshSession.RequestPty("xterm-256color", rows, cols, modes); err != nil {
 		return nil, err
 	}
 	// Start remote shell
diff --git a/server/pkg/config/jwt.go b/server/pkg/config/jwt.go
index 9d047b9b..24c640e7 100644
--- a/server/pkg/config/jwt.go
+++ b/server/pkg/config/jwt.go
@@ -8,6 +8,5 @@ type Jwt struct {
 }
 
 func (j *Jwt) Valid() {
-	assert.IsTrue(j.Key != "", "config.yml之 [jwt.key] 不能为空")
 	assert.IsTrue(j.ExpireTime != 0, "config.yml之 [jwt.expire-time] 不能为空")
 }
diff --git a/server/pkg/ctx/token.go b/server/pkg/ctx/token.go
index bd87e1b5..25fce097 100644
--- a/server/pkg/ctx/token.go
+++ b/server/pkg/ctx/token.go
@@ -5,7 +5,9 @@ import (
 
 	"mayfly-go/pkg/biz"
 	"mayfly-go/pkg/config"
+	"mayfly-go/pkg/global"
 	"mayfly-go/pkg/model"
+	"mayfly-go/pkg/utils"
 	"time"
 
 	"github.com/dgrijalva/jwt-go"
@@ -25,7 +27,11 @@ func CreateToken(userId uint64, username string) string {
 		"username": username,
 		"exp":      time.Now().Add(time.Minute * time.Duration(ExpTime)).Unix(),
 	})
-
+	// 如果jwt key为空，则随机生成字符串
+	if JwtKey == "" {
+		JwtKey = utils.RandString(32)
+		global.Log.Infof("config.yml未配置jwt.key, 随机生成key为: %s", JwtKey)
+	}
 	// 使用自定义字符串加密 and get the complete encoded token as a string
 	tokenString, err := token.SignedString([]byte(JwtKey))
 	biz.ErrIsNil(err, "token创建失败")
diff --git a/server/pkg/utils/rand.go b/server/pkg/utils/rand.go
new file mode 100644
index 00000000..2b1f6eb5
--- /dev/null
+++ b/server/pkg/utils/rand.go
@@ -0,0 +1,25 @@
+package utils
+
+import (
+	"math/rand"
+	"time"
+)
+
+const randChar = "0123456789abcdefghigklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+
+// 生成随机字符串
+func RandString(l int) string {
+	strList := []byte(randChar)
+
+	result := []byte{}
+	i := 0
+
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
+	charLen := len(strList)
+	for i < l {
+		new := strList[r.Intn(charLen)]
+		result = append(result, new)
+		i = i + 1
+	}
+	return string(result)
+}