fixed: mysql trans bug

Author: cg33

connections/mysql/mysql.go

@@ -7,14 +7,13 @@ import (
 	"goAdmin/config"
 )
 
-type sqlTx struct {
+type SqlTxStruct struct {
 	Tx *sql.Tx
 }
 
 var (
 	sqlDBmap map[string]*sql.DB
-	SqlDB    *sql.DB
-	SqlTx    sqlTx
+	SqlDB *sql.DB
 )
 
 // 只会执行一次在执行程序启动的时候
@@ -40,6 +39,62 @@ func InitDB(username string, password string, port string, ip string, databaseNa
 	}
 }
 
+func QueryWithConnection(con string, query string, args ...interface{}) ([]map[string]interface{}, *sql.Rows) {
+
+	rs, err := sqlDBmap[con].Query(query, args...)
+
+	if err != nil {
+		if rs != nil {
+			rs.Close()
+		}
+		panic(err)
+	}
+
+	col, colErr := rs.Columns()
+
+	if colErr != nil {
+		if rs != nil {
+			rs.Close()
+		}
+		panic(colErr)
+	}
+
+	typeVal, err := rs.ColumnTypes()
+	if err != nil {
+		if rs != nil {
+			rs.Close()
+		}
+		panic(err)
+	}
+
+	results := make([]map[string]interface{}, 0)
+
+	for rs.Next() {
+		var colVar = make([]interface{}, len(col))
+		for i := 0; i < len(col); i++ {
+			SetColVarType(&colVar, i, typeVal[i].DatabaseTypeName())
+		}
+		result := make(map[string]interface{})
+		if scanErr := rs.Scan(colVar...); scanErr != nil {
+			rs.Close()
+			panic(scanErr)
+		}
+		for j := 0; j < len(col); j++ {
+			SetResultValue(&result, col[j], colVar[j], typeVal[j].DatabaseTypeName())
+		}
+		results = append(results, result)
+	}
+	if err := rs.Err(); err != nil {
+		if rs != nil {
+			rs.Close()
+		}
+		panic(err)
+	}
+	rs.Close()
+	return results, rs
+}
+
+
 func Query(query string, args ...interface{}) ([]map[string]interface{}, *sql.Rows) {
 
 	rs, err := sqlDBmap["default"].Query(query, args...)
@@ -104,25 +159,50 @@ func Exec(query string, args ...interface{}) sql.Result {
 	return rs
 }
 
-func BeginTransactions() *sqlTx {
+func BeginTransactionsByLevel() *SqlTxStruct {
+
+	//LevelDefault IsolationLevel = iota
+	//LevelReadUncommitted
+	//LevelReadCommitted
+	//LevelWriteCommitted
+	//LevelRepeatableRead
+	//LevelSnapshot
+	//LevelSerializable
+	//LevelLinearizable
+
+	SqlTx := new(SqlTxStruct)
+
+	tx, err := SqlDB.BeginTx(context.Background(),
+		&sql.TxOptions{Isolation: sql.LevelReadUncommitted})
+	if err != nil {
+		panic(err)
+	}
+	(*SqlTx).Tx = tx
+	return SqlTx
+}
+
+func BeginTransactions() *SqlTxStruct {
 	tx, err := SqlDB.BeginTx(context.Background(),
 		&sql.TxOptions{Isolation: sql.LevelDefault})
 	if err != nil {
 		panic(err)
 	}
-	SqlTx.Tx = tx
-	return &SqlTx
+
+	SqlTx := new(SqlTxStruct)
+
+	(*SqlTx).Tx = tx
+	return SqlTx
 }
 
-func (SqlTx *sqlTx) Exec(query string, args ...interface{}) (sql.Result, error) {
+func (SqlTx *SqlTxStruct) Exec(query string, args ...interface{}) (sql.Result, error) {
 	rs, err := SqlTx.Tx.Exec(query, args...)
 	if err != nil {
 		return nil, err
 	}
 	return rs, nil
 }
 
-func (SqlTx *sqlTx) Query(query string, args ...interface{}) ([]map[string]interface{}, error) {
+func (SqlTx *SqlTxStruct) Query(query string, args ...interface{}) ([]map[string]interface{}, error) {
 	rs, err := SqlTx.Tx.Query(query, args...)
 
 	if err != nil {
@@ -145,7 +225,7 @@ func (SqlTx *sqlTx) Query(query string, args ...interface{}) ([]map[string]inter
 	results := make([]map[string]interface{}, 0)
 
 	for rs.Next() {
-		var colVar = make([]interface{}, len(col))
+		var colVar= make([]interface{}, len(col))
 		for i := 0; i < len(col); i++ {
 			SetColVarType(&colVar, i, typeVal[i].DatabaseTypeName())
 		}
@@ -166,7 +246,31 @@ func (SqlTx *sqlTx) Query(query string, args ...interface{}) ([]map[string]inter
 	return results, nil
 }
 
-func SetColVarType(colVar *[]interface{}, i int, typeName string) {
+type TxFn func(*SqlTxStruct) (error, map[string]interface{})
+
+func WithTransaction(fn TxFn) (err error, res map[string]interface{}) {
+
+	SqlTx := BeginTransactions()
+
+	defer func() {
+		if p := recover(); p != nil {
+			// a panic occurred, rollback and repanic
+			SqlTx.Tx.Rollback()
+			panic(p)
+		} else if err != nil {
+			// something went wrong, rollback
+			SqlTx.Tx.Rollback()
+		} else {
+			// all good, commit
+			err = SqlTx.Tx.Commit()
+		}
+	}()
+
+	err, res = fn(SqlTx)
+	return
+}
+
+func SetColVarType(colVar *[]interface{}, i int, typeName string)  {
 	switch typeName {
 	case "INT":
 		var s sql.NullInt64
@@ -228,7 +332,7 @@ func SetColVarType(colVar *[]interface{}, i int, typeName string) {
 	}
 }
 
-func SetResultValue(result *map[string]interface{}, index string, colVar interface{}, typeName string) {
+func SetResultValue(result *map[string]interface{}, index string, colVar interface{}, typeName string)  {
 	switch typeName {
 	case "INT":
 		temp := *(colVar.(*sql.NullInt64))
@@ -360,4 +464,4 @@ func SetResultValue(result *map[string]interface{}, index string, colVar interfa
 	default:
 		(*result)[index] = colVar
 	}
-}
+}

controllers/manager.go

@@ -0,0 +1,51 @@
+package controller
+
+import "github.com/valyala/fasthttp"
+
+func NewManager(ctx *fasthttp.RequestCtx)  {
+	
+}
+
+func DeleteManager(ctx *fasthttp.RequestCtx)  {
+
+}
+
+func EditManager(ctx *fasthttp.RequestCtx)  {
+
+}
+
+func ShowManager(ctx *fasthttp.RequestCtx)  {
+
+}
+
+func NewManagerRules(ctx *fasthttp.RequestCtx)  {
+
+}
+
+func DeleteManagerRules(ctx *fasthttp.RequestCtx)  {
+
+}
+
+func EditManagerRules(ctx *fasthttp.RequestCtx)  {
+
+}
+
+func ShowManagerRules(ctx *fasthttp.RequestCtx)  {
+
+}
+
+func NewManagerRoles(ctx *fasthttp.RequestCtx)  {
+
+}
+
+func DeleteManagerRoles(ctx *fasthttp.RequestCtx)  {
+
+}
+
+func EditManagerRoles(ctx *fasthttp.RequestCtx)  {
+
+}
+
+func ShowManagerRoles(ctx *fasthttp.RequestCtx)  {
+
+}

controllers/operation.go

@@ -0,0 +1,19 @@
+package controller
+
+import "github.com/valyala/fasthttp"
+
+func NewOperationLog(ctx *fasthttp.RequestCtx)  {
+
+}
+
+func DeleteOperationLog(ctx *fasthttp.RequestCtx)  {
+
+}
+
+func EditOperationLog(ctx *fasthttp.RequestCtx)  {
+
+}
+
+func ShowOperationLog(ctx *fasthttp.RequestCtx)  {
+
+}

router.go

@@ -10,27 +10,56 @@ import (
 func InitRouter() *fasthttprouter.Router {
 
 	router := fasthttprouter.New()
+
+	// 授权认证
 	router.GET("/login", controller.ShowLogin)
 	router.POST("/signin", controller.Auth)
-	router.GET("/install", controller.ShowInstall)
-
 	router.POST("/logout", AuthMiddleware(controller.Logout))
+
+	// 菜单管理
 	router.GET("/menu", AuthMiddleware(controller.ShowMenu))
 	router.POST("/menu/delete", AuthMiddleware(controller.DeleteMenu))
 	router.POST("/menu/new", AuthMiddleware(controller.NewMenu))
 	router.GET("/menu/new", AuthMiddleware(controller.ShowMenu))
 	router.POST("/menu/edit", AuthMiddleware(controller.EditMenu))
 	router.GET("/menu/edit/show", AuthMiddleware(controller.ShowEditMenu))
 
+	// 增删改查管理
 	router.GET("/info/:prefix", AuthMiddleware(controller.ShowInfo))
 	router.GET("/info/:prefix/edit", AuthMiddleware(controller.ShowForm))
 	router.GET("/info/:prefix/new", AuthMiddleware(controller.ShowNewForm))
 	router.POST("/edit/:prefix", AuthMiddleware(controller.EditForm))
 	router.POST("/delete/:prefix", AuthMiddleware(controller.DeleteData))
 	router.POST("/new/:prefix", AuthMiddleware(controller.NewForm))
 
+	// 自动化安装
+	router.GET("/install", controller.ShowInstall)
 	router.POST("/install/database/check", controller.CheckDatabase)
 
+	// 管理员管理
+	router.GET("/manager/list", controller.ShowManager)
+	router.POST("/manager/new", controller.NewManager)
+	router.POST("/manager/delete", controller.DeleteManager)
+	router.POST("/manager/edit", controller.EditManager)
+
+	// 管理权限管理
+	router.GET("/manager/rules/list", controller.ShowManagerRules)
+	router.POST("/manager/rules/new", controller.NewManagerRules)
+	router.POST("/manager/rules/delete", controller.DeleteManagerRules)
+	router.POST("/manager/rules/edit", controller.EditManagerRules)
+
+	// 管理角色管理
+	router.GET("/manager/roles/list", controller.ShowManagerRoles)
+	router.POST("/manager/roles/new", controller.NewManagerRoles)
+	router.POST("/manager/roles/delete", controller.DeleteManagerRoles)
+	router.POST("/manager/roles/edit", controller.EditManagerRoles)
+
+	// 操作日志管理
+	router.GET("/operation/log/list", controller.ShowOperationLog)
+	router.POST("/operation/log/new", controller.NewOperationLog)
+	router.POST("/operation/log/delete", controller.DeleteOperationLog)
+	router.POST("/operation/log/edit", controller.EditOperationLog)
+
 	return router
 }