From 77e8d58298b4285c271e69ec791464315e8b8c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B0=E4=BA=AE?= <xinliangnote@163.com>
Date: Sat, 11 Sep 2021 16:10:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(mysqlmd):=20=E4=BF=AE=E5=A4=8D=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=95=B0=E6=8D=AE=E8=A1=A8=20CURD=20BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复当数据表前缀相同时，重复生成的问题，例如 表名：admin、admin_menu
- 修复当字段后缀为数字时，生成错误的问题，例如 字段：test_1、test_2
---
 cmd/mysqlmd/main.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cmd/mysqlmd/main.go b/cmd/mysqlmd/main.go
index d300bf7..bf3ae68 100644
--- a/cmd/mysqlmd/main.go
+++ b/cmd/mysqlmd/main.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"regexp"
 	"strings"
 
 	"github.com/xinliangnote/go-gin-api/cmd/mysqlmd/mysql"
@@ -237,7 +236,7 @@ func queryTableColumn(db *gorm.DB, dbName string, tableName string) ([]tableColu
 func getTargetIndexMap(tableNameArr []string, item string) map[int]int {
 	indexMap := make(map[int]int)
 	for i := 0; i < len(tableNameArr); i++ {
-		if match, _ := regexp.MatchString(item, tableNameArr[i]); match {
+		if tableNameArr[i] == item {
 			if _, ok := indexMap[i]; ok {
 				continue
 			}
@@ -256,8 +255,8 @@ func capitalize(s string) string {
 			if i == 0 {
 				if vv[i] >= 97 && vv[i] <= 122 {
 					vv[i] -= 32
-					upperStr += string(vv[i])
 				}
+				upperStr += string(vv[i])
 			} else {
 				upperStr += string(vv[i])
 			}