From 358b34c7f412a4dd77c1779fb81efaaed3cdcacc Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Sat, 11 Dec 2021 11:19:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E4=B8=8E=E9=A1=B9=E7=9B=AE=E5=85=B3=E8=81=94=E5=8F=8A=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BB=A5=E9=A1=B9=E7=9B=AE=E5=85=B3=E8=81=94=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E4=B8=BA=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/model/model.go                           |  7 ++---
 lastupdate.tmp                                |  1 -
 .../src/views/ops/machine/MachineEdit.vue     | 26 +++++++++++++------
 .../src/views/ops/machine/MachineList.vue     | 25 +++++++++++++++---
 .../src/views/ops/redis/ValueDialog.vue       | 19 ++++++--------
 server/devops/api/db.go                       |  2 +-
 server/devops/api/form/form.go                |  6 +++--
 server/devops/api/machine.go                  | 13 +++++++++-
 server/devops/api/redis.go                    |  2 +-
 server/devops/api/vo/vo.go                    | 26 ++++++++++---------
 server/devops/domain/entity/machine.go        |  4 ++-
 .../infrastructure/persistence/db_repo.go     | 15 ++++++++++-
 .../persistence/machine_repo.go               | 15 ++++++++++-
 .../infrastructure/persistence/redis_repo.go  | 15 ++++++++++-
 14 files changed, 128 insertions(+), 48 deletions(-)
 delete mode 100755 lastupdate.tmp

diff --git a/base/model/model.go b/base/model/model.go
index d601dedf..42376ba0 100644
--- a/base/model/model.go
+++ b/base/model/model.go
@@ -173,14 +173,15 @@ func GetPageBySql(sql string, param *PageParam, toModel interface{}, args ...int
 	countSql := strings.Replace(sql, selectCol, "COUNT(*) AS total ", 1)
 	// 查询count
 	var count int
-	db.Raw(countSql, args...).Scan(&count)
+	err := db.Raw(countSql, args...).Scan(&count).Error
+	biz.ErrIsNilAppendErr(err, "查询失败: %s")
 	if count == 0 {
 		return &PageResult{Total: 0, List: []string{}}
 	}
 	// 分页查询
 	limitSql := sql + " LIMIT " + strconv.Itoa(param.PageNum-1) + ", " + strconv.Itoa(param.PageSize)
-	err := db.Raw(limitSql).Scan(toModel).Error
-	biz.ErrIsNil(err, "查询失败")
+	err = db.Raw(limitSql).Scan(toModel).Error
+	biz.ErrIsNil(err, "查询失败: %s")
 	return &PageResult{Total: int64(count), List: toModel}
 }
 
diff --git a/lastupdate.tmp b/lastupdate.tmp
deleted file mode 100755
index 0e345af9..00000000
--- a/lastupdate.tmp
+++ /dev/null
@@ -1 +0,0 @@
-{"/Users/hml/Desktop/project/go/mayfly-go/controllers":1610075329396211594}
\ No newline at end of file
diff --git a/mayfly_go_web/src/views/ops/machine/MachineEdit.vue b/mayfly_go_web/src/views/ops/machine/MachineEdit.vue
index d2255096..0aebd4d7 100644
--- a/mayfly_go_web/src/views/ops/machine/MachineEdit.vue
+++ b/mayfly_go_web/src/views/ops/machine/MachineEdit.vue
@@ -2,17 +2,11 @@
     <div>
         <el-dialog :title="title" v-model="dialogVisible" :show-close="false" :before-close="cancel" width="35%">
             <el-form :model="form" ref="machineForm" :rules="rules" label-width="85px" size="small">
-                <!-- <el-form-item prop="projectId" label="项目:" required>
+                <el-form-item prop="projectId" label="项目:" required>
                     <el-select style="width: 100%" v-model="form.projectId" placeholder="请选择项目" @change="changeProject" filterable>
                         <el-option v-for="item in projects" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
                     </el-select>
                 </el-form-item>
-
-                <el-form-item prop="envId" label="环境:" required>
-                    <el-select @change="changeEnv" style="width: 100%" v-model="form.envId" placeholder="请选择环境">
-                        <el-option v-for="item in envs" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
-                    </el-select>
-                </el-form-item> -->
                 <el-form-item prop="name" label="名称:" required>
                     <el-input v-model.trim="form.name" placeholder="请输入机器别名" auto-complete="off"></el-input>
                 </el-form-item>
@@ -57,6 +51,9 @@ export default defineComponent({
         visible: {
             type: Boolean,
         },
+        projects: {
+            type: Array,
+        },
         machine: {
             type: [Boolean, Object],
         },
@@ -68,8 +65,11 @@ export default defineComponent({
         const machineForm: any = ref(null);
         const state = reactive({
             dialogVisible: false,
+            projects: [],
             form: {
                 id: null,
+                projectId: null,
+                projectName: null,
                 name: null,
                 port: 22,
                 username: null,
@@ -131,6 +131,7 @@ export default defineComponent({
 
         watch(props, async (newValue) => {
             state.dialogVisible = newValue.visible;
+            state.projects = newValue.projects;
             if (newValue.machine) {
                 state.form = { ...newValue.machine };
             } else {
@@ -138,6 +139,14 @@ export default defineComponent({
             }
         });
 
+        const changeProject = (projectId: number) => {
+            for (let p of state.projects as any) {
+                if (p.id == projectId) {
+                    state.form.projectName = p.name;
+                }
+            }
+        };
+
         const btnOk = async () => {
             machineForm.value.validate((valid: boolean) => {
                 if (valid) {
@@ -148,7 +157,7 @@ export default defineComponent({
                         setTimeout(() => {
                             state.btnLoading = false;
                         }, 1000);
-                            
+
                         cancel();
                     });
                 } else {
@@ -171,6 +180,7 @@ export default defineComponent({
         return {
             ...toRefs(state),
             machineForm,
+            changeProject,
             btnOk,
             cancel,
         };
diff --git a/mayfly_go_web/src/views/ops/machine/MachineList.vue b/mayfly_go_web/src/views/ops/machine/MachineList.vue
index a06ddc16..f5c73446 100644
--- a/mayfly_go_web/src/views/ops/machine/MachineList.vue
+++ b/mayfly_go_web/src/views/ops/machine/MachineList.vue
@@ -35,8 +35,20 @@
             </div>
 
             <div style="float: right">
-                <el-input placeholder="host" size="mini" style="width: 140px" v-model="params.host" @clear="search" plain clearable></el-input>
-                <el-button @click="search" type="success" icon="el-icon-search" size="mini"></el-button>
+                <el-select size="mini" v-model="params.projectId" placeholder="请选择项目" @clear="search" filterable clearable>
+                    <el-option v-for="item in projects" :key="item.id" :label="`${item.name} [${item.remark}]`" :value="item.id"> </el-option>
+                </el-select>
+                <el-input
+                    class="ml5"
+                    placeholder="ip"
+                    size="mini"
+                    style="width: 140px"
+                    v-model="params.ip"
+                    @clear="search"
+                    plain
+                    clearable
+                ></el-input>
+                <el-button class="ml5" @click="search" type="success" icon="el-icon-search" size="mini"></el-button>
             </div>
         </div>
 
@@ -54,12 +66,13 @@
                     {{ `${scope.row.ip}:${scope.row.port}` }}
                 </template>
             </el-table-column>
+            <el-table-column prop="username" label="用户名" min-width="75"></el-table-column>
+            <el-table-column prop="projectName" label="项目" min-width="120"></el-table-column>
             <el-table-column prop="ip" label="hasCli" width="70">
                 <template #default="scope">
                     {{ `${scope.row.hasCli ? '是' : '否'}` }}
                 </template>
             </el-table-column>
-            <el-table-column prop="username" label="用户名" min-width="75"></el-table-column>
             <el-table-column prop="createTime" label="创建时间" width="160">
                 <template #default="scope">
                     {{ $filters.dateFormat(scope.row.createTime) }}
@@ -92,6 +105,7 @@
 
         <machine-edit
             :title="machineEditDialog.title"
+            :projects="projects"
             v-model:visible="machineEditDialog.visible"
             v-model:machine="machineEditDialog.data"
             @valChange="submitSuccess"
@@ -113,6 +127,7 @@ import { useRouter } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
 // import Monitor from './Monitor.vue';
 import { machineApi } from './api';
+import { projectApi } from '../project/api.ts';
 import ServiceManage from './ServiceManage.vue';
 import FileManage from './FileManage.vue';
 import MachineEdit from './MachineEdit.vue';
@@ -127,6 +142,7 @@ export default defineComponent({
     setup() {
         const router = useRouter();
         const state = reactive({
+            projects: [],
             params: {
                 pageNum: 1,
                 pageSize: 10,
@@ -166,8 +182,9 @@ export default defineComponent({
             },
         });
 
-        onMounted(() => {
+        onMounted(async () => {
             search();
+            state.projects = (await projectApi.projects.request({ pageNum: 1, pageSize: 100 })).list;
         });
 
         const choose = (item: any) => {
diff --git a/mayfly_go_web/src/views/ops/redis/ValueDialog.vue b/mayfly_go_web/src/views/ops/redis/ValueDialog.vue
index 720e1716..21ed8ef0 100644
--- a/mayfly_go_web/src/views/ops/redis/ValueDialog.vue
+++ b/mayfly_go_web/src/views/ops/redis/ValueDialog.vue
@@ -1,12 +1,10 @@
 <template>
-    <el-dialog :title="keyValue.key" v-model="dialogVisible" :before-close="cancel" :show-close="false" width="800px">
+    <el-dialog :title="keyValue.key" v-model="dialogVisible" :before-close="cancel" :show-close="false" width="900px">
         <el-form>
             <el-form-item>
-                <!-- <el-input v-model="keyValue.value" type="textarea" :autosize="{ minRows: 10, maxRows: 20 }" autocomplete="off"></el-input> -->
-
-                
+                <el-input  class="json-text" v-model="keyValue2.jsonValue" type="textarea" :autosize="{ minRows: 10, maxRows: 20 }"></el-input>
             </el-form-item>
-            <vue3-json-editor v-model="keyValue2.jsonValue" @json-change="valueChange" :show-btns="false" :expandedOnStart="true" />
+            <!-- <vue3-json-editor v-model="keyValue2.jsonValue" @json-change="valueChange" :show-btns="false" :expandedOnStart="true" /> -->
         </el-form>
         <template #footer>
             <div class="dialog-footer">
@@ -21,13 +19,11 @@ import { defineComponent, reactive, watch, toRefs } from 'vue';
 import { redisApi } from './api';
 import { ElMessage } from 'element-plus';
 import { isTrue } from '@/common/assert';
-import { Vue3JsonEditor } from 'vue3-json-editor';
+
 
 export default defineComponent({
     name: 'ValueDialog',
-    components: {
-        Vue3JsonEditor,
-    },
+    components: {},
     props: {
         visible: {
             type: Boolean,
@@ -61,9 +57,9 @@ export default defineComponent({
             (val) => {
                 state.keyValue2 = val;
                 if (typeof val.value == 'string') {
-                    state.keyValue2.jsonValue = JSON.parse(val.value)
+                    state.keyValue2.jsonValue = JSON.stringify(JSON.parse(val.value), null, 2);
                 } else {
-                    state.keyValue2.jsonValue = val.value;
+                    state.keyValue2.jsonValue = JSON.stringify(val.value, null, 2);
                 }
             }
         );
@@ -71,6 +67,7 @@ export default defineComponent({
         const saveValue = async () => {
             isTrue(state.keyValue2.type == 'string', '暂不支持除string外其他类型修改');
 
+            state.keyValue2.value = state.keyValue2.jsonValue;
             await redisApi.saveStringValue.request(state.keyValue2);
             ElMessage.success('保存成功');
             cancel();
diff --git a/server/devops/api/db.go b/server/devops/api/db.go
index 32f4f00e..e93946db 100644
--- a/server/devops/api/db.go
+++ b/server/devops/api/db.go
@@ -32,7 +32,7 @@ func (d *Db) Dbs(rc *ctx.ReqCtx) {
 		ProjectId: uint64(ginx.QueryInt(g, "projectId", 0)),
 		Database:  g.Query("database"),
 	}
-	ginx.BindQuery(g, m)
+	m.CreatorId = rc.LoginAccount.Id
 	rc.ResData = d.DbApp.GetPageList(m, ginx.GetPageParam(rc.GinCtx), new([]vo.SelectDataDbVO))
 }
 
diff --git a/server/devops/api/form/form.go b/server/devops/api/form/form.go
index 1e3e74f6..2f8ad371 100644
--- a/server/devops/api/form/form.go
+++ b/server/devops/api/form/form.go
@@ -1,8 +1,10 @@
 package form
 
 type MachineForm struct {
-	Id   uint64 `json:"id"`
-	Name string `json:"name" binding:"required"`
+	Id          uint64 `json:"id"`
+	ProjectId   uint64 `json:"projectId"`
+	ProjectName string `json:"projectName"`
+	Name        string `json:"name" binding:"required"`
 	// IP地址
 	Ip string `json:"ip" binding:"required"`
 	// 用户名
diff --git a/server/devops/api/machine.go b/server/devops/api/machine.go
index 97a7e60f..bcb35c6a 100644
--- a/server/devops/api/machine.go
+++ b/server/devops/api/machine.go
@@ -23,7 +23,18 @@ type Machine struct {
 }
 
 func (m *Machine) Machines(rc *ctx.ReqCtx) {
-	res := m.MachineApp.GetMachineList(new(entity.Machine), ginx.GetPageParam(rc.GinCtx), new([]*vo.MachineVO))
+	condition := new(entity.Machine)
+	// 使用创建者id模拟账号成员id
+	condition.CreatorId = rc.LoginAccount.Id
+	condition.Ip = rc.GinCtx.Query("ip")
+	condition.ProjectId = uint64(ginx.QueryInt(rc.GinCtx, "projectId", 0))
+
+	res := m.MachineApp.GetMachineList(condition, ginx.GetPageParam(rc.GinCtx), new([]*vo.MachineVO))
+	if res.Total == 0 {
+		rc.ResData = res
+		return
+	}
+
 	list := res.List.(*[]*vo.MachineVO)
 	for _, mv := range *list {
 		mv.HasCli = machine.HasCli(*mv.Id)
diff --git a/server/devops/api/redis.go b/server/devops/api/redis.go
index a1aaaef3..a1420e9e 100644
--- a/server/devops/api/redis.go
+++ b/server/devops/api/redis.go
@@ -23,7 +23,7 @@ func (r *Redis) RedisList(rc *ctx.ReqCtx) {
 	m := &entity.Redis{EnvId: uint64(ginx.QueryInt(g, "envId", 0)),
 		ProjectId: uint64(ginx.QueryInt(g, "projectId", 0)),
 	}
-	ginx.BindQuery(g, m)
+	m.CreatorId = rc.LoginAccount.Id
 	rc.ResData = r.RedisApp.GetPageList(m, ginx.GetPageParam(rc.GinCtx), new([]vo.Redis))
 }
 
diff --git a/server/devops/api/vo/vo.go b/server/devops/api/vo/vo.go
index 15b4522f..17feb8d8 100644
--- a/server/devops/api/vo/vo.go
+++ b/server/devops/api/vo/vo.go
@@ -15,18 +15,20 @@ type AccountVO struct {
 
 type MachineVO struct {
 	//models.BaseModel
-	Id         *uint64    `json:"id"`
-	Name       *string    `json:"name"`
-	Username   *string    `json:"username"`
-	Ip         *string    `json:"ip"`
-	Port       *int       `json:"port"`
-	CreateTime *time.Time `json:"createTime"`
-	Creator    *string    `json:"creator"`
-	CreatorId  *int64     `json:"creatorId"`
-	UpdateTime *time.Time `json:"updateTime"`
-	Modifier   *string    `json:"modifier"`
-	ModifierId *int64     `json:"modifierId"`
-	HasCli     bool       `json:"hasCli" gorm:"-"`
+	Id          *uint64    `json:"id"`
+	ProjectId   uint64     `json:"projectId"`
+	ProjectName string     `json:"projectName"`
+	Name        *string    `json:"name"`
+	Username    *string    `json:"username"`
+	Ip          *string    `json:"ip"`
+	Port        *int       `json:"port"`
+	CreateTime  *time.Time `json:"createTime"`
+	Creator     *string    `json:"creator"`
+	CreatorId   *int64     `json:"creatorId"`
+	UpdateTime  *time.Time `json:"updateTime"`
+	Modifier    *string    `json:"modifier"`
+	ModifierId  *int64     `json:"modifierId"`
+	HasCli      bool       `json:"hasCli" gorm:"-"`
 }
 
 type MachineScriptVO struct {
diff --git a/server/devops/domain/entity/machine.go b/server/devops/domain/entity/machine.go
index d7fa6f5e..029fa1c3 100644
--- a/server/devops/domain/entity/machine.go
+++ b/server/devops/domain/entity/machine.go
@@ -6,7 +6,9 @@ import (
 
 type Machine struct {
 	model.Model
-	Name string `json:"name"`
+	ProjectId   uint64 `json:"projectId"`
+	ProjectName string `json:"projectName"`
+	Name        string `json:"name"`
 	// IP地址
 	Ip string `json:"ip"`
 	// 用户名
diff --git a/server/devops/infrastructure/persistence/db_repo.go b/server/devops/infrastructure/persistence/db_repo.go
index bc3a2620..9fef18b2 100644
--- a/server/devops/infrastructure/persistence/db_repo.go
+++ b/server/devops/infrastructure/persistence/db_repo.go
@@ -1,6 +1,7 @@
 package persistence
 
 import (
+	"fmt"
 	"mayfly-go/base/biz"
 	"mayfly-go/base/model"
 	"mayfly-go/server/devops/domain/entity"
@@ -13,7 +14,19 @@ var DbDao repository.Db = &dbRepo{}
 
 // 分页获取数据库信息列表
 func (d *dbRepo) GetDbList(condition *entity.Db, pageParam *model.PageParam, toEntity interface{}, orderBy ...string) *model.PageResult {
-	return model.GetPage(pageParam, condition, toEntity, orderBy...)
+	sql := "SELECT d.* FROM t_db d JOIN t_project_member pm ON d.project_id = pm.project_id WHERE 1 = 1 "
+	if condition.CreatorId != 0 {
+		// 使用创建者id模拟项目成员id
+		sql = fmt.Sprintf("%s AND pm.account_id = %d", sql, condition.CreatorId)
+	}
+	if condition.ProjectId != 0 {
+		sql = fmt.Sprintf("%s AND d.project_id = %d", sql, condition.ProjectId)
+	}
+	if condition.Host != "" {
+		sql = sql + " AND d.host LIKE '%" + condition.Host + "%'"
+	}
+	sql = sql + " ORDER BY d.create_time DESC"
+	return model.GetPageBySql(sql, pageParam, toEntity)
 }
 
 func (d *dbRepo) Count(condition *entity.Db) int64 {
diff --git a/server/devops/infrastructure/persistence/machine_repo.go b/server/devops/infrastructure/persistence/machine_repo.go
index fe00d37e..8b85d7f2 100644
--- a/server/devops/infrastructure/persistence/machine_repo.go
+++ b/server/devops/infrastructure/persistence/machine_repo.go
@@ -1,6 +1,7 @@
 package persistence
 
 import (
+	"fmt"
 	"mayfly-go/base/model"
 	"mayfly-go/server/devops/domain/entity"
 	"mayfly-go/server/devops/domain/repository"
@@ -12,7 +13,19 @@ var MachineDao repository.Machine = &machineRepo{}
 
 // 分页获取机器信息列表
 func (m *machineRepo) GetMachineList(condition *entity.Machine, pageParam *model.PageParam, toEntity interface{}, orderBy ...string) *model.PageResult {
-	return model.GetPage(pageParam, condition, toEntity, orderBy...)
+	sql := "SELECT m.* FROM t_machine m JOIN t_project_member pm ON m.project_id = pm.project_id WHERE 1 = 1 "
+	if condition.CreatorId != 0 {
+		// 使用创建者id模拟项目成员id
+		sql = fmt.Sprintf("%s AND pm.account_id = %d", sql, condition.CreatorId)
+	}
+	if condition.ProjectId != 0 {
+		sql = fmt.Sprintf("%s AND m.project_id = %d", sql, condition.ProjectId)
+	}
+	if condition.Ip != "" {
+		sql = sql + " AND m.ip LIKE '%" + condition.Ip + "%'"
+	}
+	sql = sql + " ORDER BY m.create_time DESC"
+	return model.GetPageBySql(sql, pageParam, toEntity)
 }
 
 func (m *machineRepo) Count(condition *entity.Machine) int64 {
diff --git a/server/devops/infrastructure/persistence/redis_repo.go b/server/devops/infrastructure/persistence/redis_repo.go
index baefc231..f8e7842b 100644
--- a/server/devops/infrastructure/persistence/redis_repo.go
+++ b/server/devops/infrastructure/persistence/redis_repo.go
@@ -1,6 +1,7 @@
 package persistence
 
 import (
+	"fmt"
 	"mayfly-go/base/biz"
 	"mayfly-go/base/model"
 	"mayfly-go/server/devops/domain/entity"
@@ -13,7 +14,19 @@ var RedisDao repository.Redis = &redisRepo{}
 
 // 分页获取机器信息列表
 func (r *redisRepo) GetRedisList(condition *entity.Redis, pageParam *model.PageParam, toEntity interface{}, orderBy ...string) *model.PageResult {
-	return model.GetPage(pageParam, condition, toEntity, orderBy...)
+	sql := "SELECT d.* FROM t_redis d JOIN t_project_member pm ON d.project_id = pm.project_id WHERE 1 = 1 "
+	if condition.CreatorId != 0 {
+		// 使用创建者id模拟项目成员id
+		sql = fmt.Sprintf("%s AND pm.account_id = %d", sql, condition.CreatorId)
+	}
+	if condition.ProjectId != 0 {
+		sql = fmt.Sprintf("%s AND d.project_id = %d", sql, condition.ProjectId)
+	}
+	if condition.Host != "" {
+		sql = sql + " AND d.host LIKE '%" + condition.Host + "%'"
+	}
+	sql = sql + " ORDER BY d.create_time DESC"
+	return model.GetPageBySql(sql, pageParam, toEntity)
 }
 
 func (r *redisRepo) Count(condition *entity.Redis) int64 {