update gtoken group middleware \ getMap \ lastInsertId

goflyfox · Dec 28, 2020 · e7ddc9b · e7ddc9b
1 parent 5d9ce31
commit e7ddc9b
Show file tree

Hide file tree

Showing 18 changed files with 156 additions and 118 deletions.
diff --git a/app/api/config/configAction.go b/app/api/config/configAction.go
@@ -51,7 +51,7 @@ func (action *Action) Delete(r *ghttp.Request) {
 // path: /save
 func (action *Action) Save(r *ghttp.Request) {
 	request := new(config.Request)
-	err := gconv.Struct(r.GetQueryMap(), request)
+	err := gconv.Struct(r.GetMap(), request)
 	if err != nil {
 		glog.Error("save struct error", err)
 		base.Error(r, "获取参数异常")
@@ -68,7 +68,7 @@ func (action *Action) Save(r *ghttp.Request) {
 
 // path: /list
 func (action *Action) List(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 
 	list, err := config.List(&form)
 	if err != nil {
@@ -81,7 +81,7 @@ func (action *Action) List(r *ghttp.Request) {
 
 // path: /page
 func (action *Action) Page(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 	page, err := config.Page(&form)
 	if err != nil {
 		glog.Error("page error", err)
@@ -99,7 +99,7 @@ func (action *Action) Page(r *ghttp.Request) {
 
 // path: /jqgrid
 func (action *Action) Jqgrid(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 	page, err := config.Page(&form)
 	if err != nil {
 		glog.Error("jqgrid error", err)
@@ -116,7 +116,7 @@ func (action *Action) Jqgrid(r *ghttp.Request) {
 
 // path: /type
 func (action *Action) Type(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 
 	//userId := base.GetUser(r).Id
 	//user := SysUser{Id: userId}.Get()

diff --git a/app/api/department/departmentAction.go b/app/api/department/departmentAction.go
@@ -60,7 +60,7 @@ func (action *Action) Delete(r *ghttp.Request) {
 // path: /save
 func (action *Action) Save(r *ghttp.Request) {
 	request := new(department.Request)
-	err := gconv.Struct(r.GetQueryMap(), request)
+	err := gconv.Struct(r.GetMap(), request)
 	if err != nil {
 		glog.Error("save struct error", err)
 		base.Error(r, "save error")
@@ -77,7 +77,7 @@ func (action *Action) Save(r *ghttp.Request) {
 
 // path: /list
 func (action *Action) List(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 
 	list, err := department.List(&form)
 	if err != nil {
@@ -90,7 +90,7 @@ func (action *Action) List(r *ghttp.Request) {
 
 // path: /page
 func (action *Action) Page(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 	page, err := department.Page(&form)
 	if err != nil {
 		glog.Error("page error", err)
@@ -108,7 +108,7 @@ func (action *Action) Page(r *ghttp.Request) {
 
 // path: /jqgrid
 func (action *Action) Jqgrid(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 	page, err := department.Page(&form)
 	if err != nil {
 		glog.Error("jqgrid error", err)

diff --git a/app/api/log/logAction.go b/app/api/log/logAction.go
@@ -51,7 +51,7 @@ func (action *Action) Delete(r *ghttp.Request) {
 // path: /save
 func (action *Action) Save(r *ghttp.Request) {
 	request := new(log.Request)
-	err := gconv.Struct(r.GetQueryMap(), request)
+	err := gconv.Struct(r.GetMap(), request)
 	if err != nil {
 		glog.Error("save struct error", err)
 		base.Error(r, "save error")
@@ -68,7 +68,7 @@ func (action *Action) Save(r *ghttp.Request) {
 
 // path: /list
 func (action *Action) List(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 
 	list, err := log.List(&form)
 	if err != nil {
@@ -81,7 +81,7 @@ func (action *Action) List(r *ghttp.Request) {
 
 // path: /page
 func (action *Action) Page(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 	page, err := log.Page(&form)
 	if err != nil {
 		glog.Error("page error", err)
@@ -99,7 +99,7 @@ func (action *Action) Page(r *ghttp.Request) {
 
 // path: /jqgrid
 func (action *Action) Jqgrid(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 	page, err := log.Page(&form)
 	if err != nil {
 		glog.Error("jqgrid error", err)

diff --git a/app/api/menu/menuAction.go b/app/api/menu/menuAction.go
@@ -60,7 +60,7 @@ func (action *Action) Delete(r *ghttp.Request) {
 // path: /save
 func (action *Action) Save(r *ghttp.Request) {
 	request := new(menu.Request)
-	err := gconv.Struct(r.GetQueryMap(), request)
+	err := gconv.Struct(r.GetMap(), request)
 	if err != nil {
 		glog.Error("save struct error", err)
 		base.Error(r, "save error")
@@ -82,7 +82,7 @@ func (action *Action) Tree(r *ghttp.Request) {
 
 // path: /list
 func (action *Action) List(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 
 	list, err := menu.List(&form)
 	if err != nil {
@@ -95,7 +95,7 @@ func (action *Action) List(r *ghttp.Request) {
 
 // path: /page
 func (action *Action) Page(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 	page, err := menu.Page(&form)
 	if err != nil {
 		glog.Error("page error", err)
@@ -113,7 +113,7 @@ func (action *Action) Page(r *ghttp.Request) {
 
 // path: /jqgrid
 func (action *Action) Jqgrid(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 	page, err := menu.Page(&form)
 	if err != nil {
 		glog.Error("jqgrid error", err)

diff --git a/app/api/role/roleAction.go b/app/api/role/roleAction.go
@@ -51,7 +51,7 @@ func (action *Action) Delete(r *ghttp.Request) {
 // path: /save
 func (action *Action) Save(r *ghttp.Request) {
 	request := new(role.Request)
-	err := gconv.Struct(r.GetQueryMap(), request)
+	err := gconv.Struct(r.GetMap(), request)
 	if err != nil {
 		glog.Error("save struct error", err)
 		base.Error(r, "save error")
@@ -73,7 +73,7 @@ func (action *Action) Save(r *ghttp.Request) {
 
 // path: /list
 func (action *Action) List(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 
 	list, err := role.List(&form)
 	if err != nil {
@@ -86,7 +86,7 @@ func (action *Action) List(r *ghttp.Request) {
 
 // path: /page
 func (action *Action) Page(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 	page, err := role.Page(&form)
 	if err != nil {
 		glog.Error("page error", err)
@@ -104,7 +104,7 @@ func (action *Action) Page(r *ghttp.Request) {
 
 // path: /jqgrid
 func (action *Action) Jqgrid(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 	page, err := role.Page(&form)
 	if err != nil {
 		glog.Error("jqgrid error", err)
@@ -125,7 +125,7 @@ func (action *Action) Info(r *ghttp.Request) {
 	if roleId == 0 {
 		base.Fail(r, "参数错误")
 	}
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 	form.SetParam("roleId", gconv.String(roleId))
 
 	// 选择的列表

diff --git a/app/api/user/userAction.go b/app/api/user/userAction.go
@@ -56,7 +56,7 @@ func (action *Action) Delete(r *ghttp.Request) {
 // path: /save
 func (action *Action) Save(r *ghttp.Request) {
 	request := new(user.Request)
-	err := gconv.Struct(r.GetQueryMap(), request)
+	err := gconv.Struct(r.GetMap(), request)
 	if err != nil {
 		glog.Error("save struct error", err)
 		base.Error(r, "save error")
@@ -73,7 +73,7 @@ func (action *Action) Save(r *ghttp.Request) {
 
 // path: /list
 func (action *Action) List(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 
 	list, err := user.List(&form)
 	if err != nil {
@@ -86,7 +86,7 @@ func (action *Action) List(r *ghttp.Request) {
 
 // path: /page
 func (action *Action) Page(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 	page, err := user.Page(&form)
 	if err != nil {
 		glog.Error("page error", err)
@@ -104,7 +104,7 @@ func (action *Action) Page(r *ghttp.Request) {
 
 // path: /jqgrid
 func (action *Action) Jqgrid(r *ghttp.Request) {
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 	page, err := user.Page(&form)
 	if err != nil {
 		glog.Error("jqgrid error", err)
@@ -125,7 +125,7 @@ func (action *Action) RoleInfo(r *ghttp.Request) {
 	if userId == 0 {
 		base.Fail(r, "参数错误")
 	}
-	form := base.NewForm(r.GetQueryMap())
+	form := base.NewForm(r.GetMap())
 	form.SetParam("userId", gconv.String(userId))
 
 	// 角色列表

diff --git a/app/component/middle/MiddlewareLog.go b/app/component/middle/MiddlewareLog.go
@@ -24,9 +24,9 @@ func MiddlewareLog(r *ghttp.Request) {
 		}
 
 		if r.Method == "GET" {
-			params = r.GetQueryMap()
+			params = r.GetMap()
 		} else if r.Method == "POST" {
-			params = r.GetQueryMap()
+			params = r.GetMap()
 		} else {
 			base.Error(r, "Request Method is ERROR! ")
 			return

diff --git a/app/service/config/configSvc.go b/app/service/config/configSvc.go
@@ -66,7 +66,7 @@ func Delete(id int64, userId int) (int64, error) {
 // 保存实体
 func Save(request *Request) (int64, error) {
 	entity := (*config.Entity)(nil)
-	err := gconv.StructDeep(request.Entity, &entity)
+	err := gconv.Struct(request.Entity, &entity)
 	if err != nil {
 		return 0, errors.New("数据错误")
 	}
@@ -83,6 +83,12 @@ func Save(request *Request) (int64, error) {
 		if err != nil {
 			return 0, err
 		}
+		// 回写主键
+		lastId, err := r.LastInsertId()
+		if err != nil {
+			return 0, err
+		}
+		entity.Id = gconv.Int(lastId)
 
 		log.SaveLog(entity, constants.INSERT)
 		return r.RowsAffected()

diff --git a/app/service/department/departmentSvc.go b/app/service/department/departmentSvc.go
@@ -70,7 +70,7 @@ func Delete(id int64, userId int) (int64, error) {
 // 保存实体
 func Save(request *Request) (int64, error) {
 	entity := (*department.Entity)(nil)
-	err := gconv.StructDeep(request.Entity, &entity)
+	err := gconv.Struct(request.Entity, &entity)
 	if err != nil {
 		return 0, errors.New("数据错误")
 	}
@@ -87,6 +87,12 @@ func Save(request *Request) (int64, error) {
 		if err != nil {
 			return 0, err
 		}
+		// 回写主键
+		lastId, err := r.LastInsertId()
+		if err != nil {
+			return 0, err
+		}
+		entity.Id = gconv.Int(lastId)
 
 		log.SaveLog(entity, constants.INSERT)
 		return r.RowsAffected()

diff --git a/app/service/log/logSvc.go b/app/service/log/logSvc.go
@@ -58,7 +58,7 @@ func Delete(id int64, userId int) (int64, error) {
 // 保存实体
 func Save(request *Request) (int64, error) {
 	entity := (*log.Entity)(nil)
-	err := gconv.StructDeep(request.Entity, &entity)
+	err := gconv.Struct(request.Entity, &entity)
 	if err != nil {
 		return 0, errors.New("数据错误")
 	}
@@ -75,6 +75,12 @@ func Save(request *Request) (int64, error) {
 		if err != nil {
 			return 0, err
 		}
+		// 回写主键
+		lastId, err := r.LastInsertId()
+		if err != nil {
+			return 0, err
+		}
+		entity.Id = gconv.Int(lastId)
 
 		return r.RowsAffected()
 	} else {

diff --git a/app/service/menu/menuSvc.go b/app/service/menu/menuSvc.go
@@ -72,7 +72,7 @@ func Delete(id int64, userId int) (int64, error) {
 // 保存实体
 func Save(request *Request) (int64, error) {
 	entity := (*menu.Entity)(nil)
-	err := gconv.StructDeep(request.Entity, &entity)
+	err := gconv.Struct(request.Entity, &entity)
 	if err != nil {
 		return 0, errors.New("数据错误")
 	}
@@ -102,6 +102,12 @@ func Save(request *Request) (int64, error) {
 		if err != nil {
 			return 0, err
 		}
+		// 回写主键
+		lastId, err := r.LastInsertId()
+		if err != nil {
+			return 0, err
+		}
+		entity.Id = gconv.Int(lastId)
 
 		log.SaveLog(entity, constants.INSERT)
 		return r.RowsAffected()

diff --git a/app/service/role/roleSvc.go b/app/service/role/roleSvc.go
@@ -68,7 +68,7 @@ func Delete(id int64, userId int) (int64, error) {
 // 保存实体
 func Save(request *Request) (int64, error) {
 	entity := (*role.Entity)(nil)
-	err := gconv.StructDeep(request.Entity, &entity)
+	err := gconv.Struct(request.Entity, &entity)
 	if err != nil {
 		return 0, errors.New("数据错误")
 	}
@@ -85,9 +85,14 @@ func Save(request *Request) (int64, error) {
 		if err != nil {
 			return 0, err
 		}
-
 		// 回写主键
-		request.Id = entity.Id
+		lastId, err := r.LastInsertId()
+		if err != nil {
+			return 0, err
+		}
+		entity.Id = gconv.Int(lastId)
+		request.Id = gconv.Int(lastId)
+
 		log.SaveLog(entity, constants.INSERT)
 		return r.RowsAffected()
 	} else {

diff --git a/app/service/user/userSvc.go b/app/service/user/userSvc.go
@@ -78,7 +78,7 @@ func Delete(id int64, userId int) (int64, error) {
 // 保存实体
 func Save(request *Request) (int64, error) {
 	entity := (*user.Entity)(nil)
-	err := gconv.StructDeep(request.Entity, &entity)
+	err := gconv.Struct(request.Entity, &entity)
 	if err != nil {
 		return 0, errors.New("数据错误")
 	}
@@ -95,6 +95,12 @@ func Save(request *Request) (int64, error) {
 		if err != nil {
 			return 0, err
 		}
+		// 回写主键
+		lastId, err := r.LastInsertId()
+		if err != nil {
+			return 0, err
+		}
+		entity.Id = gconv.Int(lastId)
 
 		log.SaveLog(entity, constants.INSERT)
 		return r.RowsAffected()

diff --git a/public/resources/js/home.js b/public/resources/js/home.js
@@ -165,7 +165,7 @@ var vm = new Vue({
             });
         }
         , logout: function () {
-            dudu.get(dudu.ctx + "/user/logout?_" + $.now(), function (r) {
+            dudu.get(dudu.ctx + "/system/user/logout?_" + $.now(), function (r) {
                 if (r.code == 0) {
                     window.top.location.href = "login";
                 } else {