From 0d3bae0001abf8b29ecf1c70f2fec481686bc5b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8B=A4=E5=BF=AB=E7=9A=84=E5=B0=8F=E6=99=B4=E5=90=8C?=
 =?UTF-8?q?=E5=AD=A6?= <941403820@qq.com>
Date: Mon, 11 Mar 2024 01:50:13 +0000
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=88=A4=E6=96=AD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 勤快的小晴同学 <941403820@qq.com>
---
 apps/develop/gen/gen.go    | 23 ++++++++++-------------
 apps/system/api/tenant.go  | 10 +---------
 apps/system/api/user.go    |  5 +----
 kit/flow/node.go           |  5 +----
 kit/utils/ddm.go           | 15 +++------------
 pkg/cache/device_etoken.go |  6 +-----
 6 files changed, 17 insertions(+), 47 deletions(-)

diff --git a/apps/develop/gen/gen.go b/apps/develop/gen/gen.go
index 7d7346d..849d627 100644
--- a/apps/develop/gen/gen.go
+++ b/apps/develop/gen/gen.go
@@ -85,36 +85,33 @@ func (s *toolsGenTableColumn) IsNotQuery(name string) bool {
 
 func (s *toolsGenTableColumn) CheckNameColumn(columnName string) bool {
 	if len(columnName) >= 4 {
-		if tmp := columnName[len(columnName)-4:]; tmp == "name" {
-			return true
-		}
+		tmp := columnName[len(columnName)-4:]
+		return tmp == "name"
 	}
 	return false
 }
 
 func (s *toolsGenTableColumn) CheckStatusColumn(columnName string) bool {
 	if len(columnName) >= 6 {
-		if tmp := columnName[len(columnName)-6:]; tmp == "status" {
-			return true
-		}
+		tmp := columnName[len(columnName)-6:]
+		return tmp == "status"
+
 	}
 	return false
 }
 
 func (s *toolsGenTableColumn) CheckTypeColumn(columnName string) bool {
 	if len(columnName) >= 4 {
-		if tmp := columnName[len(columnName)-4:]; tmp == "type" {
-			return true
-		}
+		tmp := columnName[len(columnName)-4:]
+		return tmp == "type"
 	}
 	return false
 }
 
 func (s *toolsGenTableColumn) CheckSexColumn(columnName string) bool {
 	if len(columnName) >= 3 {
-		if tmp := columnName[len(columnName)-3:]; tmp == "sex" {
-			return true
-		}
+		tmp := columnName[len(columnName)-4:]
+		return tmp == "sex"
 	}
 	return false
 }
@@ -149,7 +146,7 @@ func (g *Generator) Generate() (entity.DevGenTable, error) {
 
 	var wg sync.WaitGroup
 	columnChan := make(chan entity.DevGenTableColumn, len(dbColumn)) // 创建带缓冲的通道
-	
+
 	for x := 0; x < len(dbColumn); x++ {
 		index := x
 		wg.Add(1)
diff --git a/apps/system/api/tenant.go b/apps/system/api/tenant.go
index 5ddcd2c..f9380ea 100644
--- a/apps/system/api/tenant.go
+++ b/apps/system/api/tenant.go
@@ -1,10 +1,5 @@
 package api
 
-/**
- * @Description
- * @Author 熊猫
- * @Date 2022/7/14 17:55
- **/
 import (
 	"pandax/apps/system/entity"
 	"pandax/apps/system/services"
@@ -70,8 +65,5 @@ func (p *SysTenantsApi) DeleteSysTenants(rc *restfulx.ReqCtx) {
 
 // IsTenantAdmin 是否为主租户
 func IsTenantAdmin(tenantId int64) bool {
-	if tenantId == 1 {
-		return true
-	}
-	return false
+	return tenantId == 1
 }
diff --git a/apps/system/api/user.go b/apps/system/api/user.go
index 6488893..898d6aa 100644
--- a/apps/system/api/user.go
+++ b/apps/system/api/user.go
@@ -344,10 +344,7 @@ func (u *UserApi) ExportUser(rc *restfulx.ReqCtx) {
 // Build 构建前端路由
 func Build(menus []entity.SysMenu) []vo.RouterVo {
 	equals := func(a string, b string) bool {
-		if a == b {
-			return true
-		}
-		return false
+		return a == b
 	}
 	rvs := make([]vo.RouterVo, 0)
 	for _, ms := range menus {
diff --git a/kit/flow/node.go b/kit/flow/node.go
index b89cd55..650bd98 100644
--- a/kit/flow/node.go
+++ b/kit/flow/node.go
@@ -22,10 +22,7 @@ type Text struct {
 }
 
 func (node *Node) IsStartNode(ty string) bool {
-	if node.Type == ty {
-		return true
-	}
-	return false
+	return node.Type == ty
 }
 
 func (node *Node) GetProperties(data any) error {
diff --git a/kit/utils/ddm.go b/kit/utils/ddm.go
index 04af9bf..cd109c8 100644
--- a/kit/utils/ddm.go
+++ b/kit/utils/ddm.go
@@ -14,10 +14,7 @@ func DdmKey(data string) string {
 }
 
 func IsDdmKey(data string) bool {
-	if len(data) > 6 && data[3:len(data)-3] == "****" {
-		return true
-	}
-	return false
+	return len(data) > 6 && data[3:len(data)-3] == "****"
 }
 
 func DdmMail(data string) string {
@@ -25,10 +22,7 @@ func DdmMail(data string) string {
 }
 
 func ISDdmMail(data string) bool {
-	if len(data) > 11 && data[3:len(data)-8] == "****" {
-		return true
-	}
-	return false
+	return len(data) > 11 && data[3:len(data)-8] == "****"
 }
 
 func DdmPassword(data string) string {
@@ -36,8 +30,5 @@ func DdmPassword(data string) string {
 }
 
 func IsDdmPassword(data string) bool {
-	if data == "******" {
-		return true
-	}
-	return false
+	return data == "******"
 }
diff --git a/pkg/cache/device_etoken.go b/pkg/cache/device_etoken.go
index f99f81d..608789a 100644
--- a/pkg/cache/device_etoken.go
+++ b/pkg/cache/device_etoken.go
@@ -25,9 +25,5 @@ func DelDeviceEtoken(key string) error {
 
 func ExistsDeviceEtoken(key string) bool {
 	exists, _ := RedisDb.Exists(RedisDb.Context(), key).Result()
-	if exists == 1 {
-		return true
-	} else {
-		return false
-	}
+	return exists == 1
 }