gujiheimao преди 2 години
родител
ревизия
e1cad66d2d

+ 8 - 2
.test/req.http

@@ -1,4 +1,10 @@
-GET http://localhost:8182/api/test/get
-Accept: application/json
+POST http://localhost:8182/api/test/test?user=123&id=445
+Content-Type: application/json
+Auth-Sign:eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MTYxMzg2NTQsImlzcyI6IjEifQ.oL8_imZ44sQukLUEgL2hpQvsWVRHIDI5xA6W72cGrAk
+
+{
+  "name": "test",
+  "age": 18
+}
 
 ###

+ 0 - 1
data/dao/OrderDao.go

@@ -98,7 +98,6 @@ func GetListGoodsOrder(state string, userId int64, pageNum, pageSize int) (vo.Ba
 		rows.Scan(&u)
 		vo.List = append(vo.List, u)
 	}
-	fmt.Println("996-------", vo.List)
 	CountSess := configs.Engine.Table("goods_order")
 	if state != "" {
 		CountSess.Where("state = ?", state)

+ 5 - 5
data/dao/manage/ArticleDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetArticleById(id int64) (domain.Article, error) {
 	var article domain.Article
-	_, err := configs.Engine.Where("id = ?", id).Get(&article)
+	_, err := configs.Engine.Table("article").Where("id = ?", id).Get(&article)
 	if err != nil {
 		return article, err
 	}
@@ -16,7 +16,7 @@ func GetArticleById(id int64) (domain.Article, error) {
 }
 
 func GetArticleListInId(ids []int64) ([]domain.Article, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.Article{})
+	rows, err := configs.Engine.Table("article").In("id", ids).Rows(&domain.Article{})
 	if err != nil {
 		return make([]domain.Article, 0), err
 	}
@@ -31,7 +31,7 @@ func GetArticleListInId(ids []int64) ([]domain.Article, error) {
 
 func GetArticleList(article domain.Article, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.Article
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &article)
+	Count, err := configs.Engine.Table("article").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &article)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetArticleList(article domain.Article, pageNum, pageSize int) (vo.BaseListV
 }
 
 func SaveArticle(article *domain.Article) (domain.Article, error) {
-	_, err := configs.Engine.Insert(&article)
+	_, err := configs.Engine.Table("article").Insert(&article)
 	if err != nil {
 		return *article, err
 	}
@@ -68,7 +68,7 @@ func SetArticle(articleMap map[string]interface{}, id int64) (domain.Article, bo
 
 func DeleteArticle(id int64) bool {
 	var article domain.Article
-	i, err := configs.Engine.Where("id = ?", id).Delete(&article)
+	i, err := configs.Engine.Table("article").Where("id = ?", id).Delete(&article)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/ArticleTagDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetArticleTagById(id int64) (domain.ArticleTag, error) {
 	var articleTag domain.ArticleTag
-	_, err := configs.Engine.Where("id = ?", id).Get(&articleTag)
+	_, err := configs.Engine.Table("article_tag").Where("id = ?", id).Get(&articleTag)
 	if err != nil {
 		return articleTag, err
 	}
@@ -16,7 +16,7 @@ func GetArticleTagById(id int64) (domain.ArticleTag, error) {
 }
 
 func GetArticleTagListInId(ids []int64) ([]domain.ArticleTag, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.ArticleTag{})
+	rows, err := configs.Engine.Table("article_tag").In("id", ids).Rows(&domain.ArticleTag{})
 	if err != nil {
 		return make([]domain.ArticleTag, 0), err
 	}
@@ -31,7 +31,7 @@ func GetArticleTagListInId(ids []int64) ([]domain.ArticleTag, error) {
 
 func GetArticleTagList(articleTag domain.ArticleTag, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.ArticleTag
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &articleTag)
+	Count, err := configs.Engine.Table("article_tag").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &articleTag)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetArticleTagList(articleTag domain.ArticleTag, pageNum, pageSize int) (vo.
 }
 
 func SaveArticleTag(articleTag *domain.ArticleTag) (domain.ArticleTag, error) {
-	_, err := configs.Engine.Insert(&articleTag)
+	_, err := configs.Engine.Table("article_tag").Insert(&articleTag)
 	if err != nil {
 		return *articleTag, err
 	}
@@ -68,7 +68,7 @@ func SetArticleTag(articleTagMap map[string]interface{}, id int64) (domain.Artic
 
 func DeleteArticleTag(id int64) bool {
 	var articleTag domain.ArticleTag
-	i, err := configs.Engine.Where("id = ?", id).Delete(&articleTag)
+	i, err := configs.Engine.Table("article_tag").Where("id = ?", id).Delete(&articleTag)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/ArticleTopicDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetArticleTopicById(id int64) (domain.ArticleTopic, error) {
 	var articleTopic domain.ArticleTopic
-	_, err := configs.Engine.Where("id = ?", id).Get(&articleTopic)
+	_, err := configs.Engine.Table("article_topic").Where("id = ?", id).Get(&articleTopic)
 	if err != nil {
 		return articleTopic, err
 	}
@@ -16,7 +16,7 @@ func GetArticleTopicById(id int64) (domain.ArticleTopic, error) {
 }
 
 func GetArticleTopicListInId(ids []int64) ([]domain.ArticleTopic, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.ArticleTopic{})
+	rows, err := configs.Engine.Table("article_topic").In("id", ids).Rows(&domain.ArticleTopic{})
 	if err != nil {
 		return make([]domain.ArticleTopic, 0), err
 	}
@@ -31,7 +31,7 @@ func GetArticleTopicListInId(ids []int64) ([]domain.ArticleTopic, error) {
 
 func GetArticleTopicList(articleTopic domain.ArticleTopic, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.ArticleTopic
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &articleTopic)
+	Count, err := configs.Engine.Table("article_topic").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &articleTopic)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetArticleTopicList(articleTopic domain.ArticleTopic, pageNum, pageSize int
 }
 
 func SaveArticleTopic(articleTopic *domain.ArticleTopic) (domain.ArticleTopic, error) {
-	_, err := configs.Engine.Insert(&articleTopic)
+	_, err := configs.Engine.Table("article_topic").Insert(&articleTopic)
 	if err != nil {
 		return *articleTopic, err
 	}
@@ -68,7 +68,7 @@ func SetArticleTopic(articleTopicMap map[string]interface{}, id int64) (domain.A
 
 func DeleteArticleTopic(id int64) bool {
 	var articleTopic domain.ArticleTopic
-	i, err := configs.Engine.Where("id = ?", id).Delete(&articleTopic)
+	i, err := configs.Engine.Table("article_topic").Where("id = ?", id).Delete(&articleTopic)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/BackAuthorityDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetBackAuthorityById(id int64) (domain.BackAuthority, error) {
 	var backAuthority domain.BackAuthority
-	_, err := configs.Engine.Where("id = ?", id).Get(&backAuthority)
+	_, err := configs.Engine.Table("back_authority").Where("id = ?", id).Get(&backAuthority)
 	if err != nil {
 		return backAuthority, err
 	}
@@ -16,7 +16,7 @@ func GetBackAuthorityById(id int64) (domain.BackAuthority, error) {
 }
 
 func GetBackAuthorityListInId(ids []int64) ([]domain.BackAuthority, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.BackAuthority{})
+	rows, err := configs.Engine.Table("back_authority").In("id", ids).Rows(&domain.BackAuthority{})
 	if err != nil {
 		return make([]domain.BackAuthority, 0), err
 	}
@@ -31,7 +31,7 @@ func GetBackAuthorityListInId(ids []int64) ([]domain.BackAuthority, error) {
 
 func GetBackAuthorityList(backAuthority domain.BackAuthority, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.BackAuthority
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &backAuthority)
+	Count, err := configs.Engine.Table("back_authority").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &backAuthority)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetBackAuthorityList(backAuthority domain.BackAuthority, pageNum, pageSize
 }
 
 func SaveBackAuthority(backAuthority *domain.BackAuthority) (domain.BackAuthority, error) {
-	_, err := configs.Engine.Insert(&backAuthority)
+	_, err := configs.Engine.Table("back_authority").Insert(&backAuthority)
 	if err != nil {
 		return *backAuthority, err
 	}
@@ -68,7 +68,7 @@ func SetBackAuthority(backAuthorityMap map[string]interface{}, id int64) (domain
 
 func DeleteBackAuthority(id int64) bool {
 	var backAuthority domain.BackAuthority
-	i, err := configs.Engine.Where("id = ?", id).Delete(&backAuthority)
+	i, err := configs.Engine.Table("back_authority").Where("id = ?", id).Delete(&backAuthority)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/BackMenuDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetBackMenuById(id int64) (domain.BackMenu, error) {
 	var backMenu domain.BackMenu
-	_, err := configs.Engine.Where("id = ?", id).Get(&backMenu)
+	_, err := configs.Engine.Table("back_menu").Where("id = ?", id).Get(&backMenu)
 	if err != nil {
 		return backMenu, err
 	}
@@ -16,7 +16,7 @@ func GetBackMenuById(id int64) (domain.BackMenu, error) {
 }
 
 func GetBackMenuListInId(ids []int64) ([]domain.BackMenu, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.BackMenu{})
+	rows, err := configs.Engine.Table("back_menu").In("id", ids).Rows(&domain.BackMenu{})
 	if err != nil {
 		return make([]domain.BackMenu, 0), err
 	}
@@ -31,7 +31,7 @@ func GetBackMenuListInId(ids []int64) ([]domain.BackMenu, error) {
 
 func GetBackMenuList(backMenu domain.BackMenu, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.BackMenu
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &backMenu)
+	Count, err := configs.Engine.Table("back_menu").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &backMenu)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetBackMenuList(backMenu domain.BackMenu, pageNum, pageSize int) (vo.BaseLi
 }
 
 func SaveBackMenu(backMenu *domain.BackMenu) (domain.BackMenu, error) {
-	_, err := configs.Engine.Insert(&backMenu)
+	_, err := configs.Engine.Table("back_menu").Insert(&backMenu)
 	if err != nil {
 		return *backMenu, err
 	}
@@ -68,7 +68,7 @@ func SetBackMenu(backMenuMap map[string]interface{}, id int64) (domain.BackMenu,
 
 func DeleteBackMenu(id int64) bool {
 	var backMenu domain.BackMenu
-	i, err := configs.Engine.Where("id = ?", id).Delete(&backMenu)
+	i, err := configs.Engine.Table("back_menu").Where("id = ?", id).Delete(&backMenu)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/BackRoleAuthorityDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetBackRoleAuthorityById(id int64) (domain.BackRoleAuthority, error) {
 	var backRoleAuthority domain.BackRoleAuthority
-	_, err := configs.Engine.Where("id = ?", id).Get(&backRoleAuthority)
+	_, err := configs.Engine.Table("back_role_authority").Where("id = ?", id).Get(&backRoleAuthority)
 	if err != nil {
 		return backRoleAuthority, err
 	}
@@ -16,7 +16,7 @@ func GetBackRoleAuthorityById(id int64) (domain.BackRoleAuthority, error) {
 }
 
 func GetBackRoleAuthorityListInId(ids []int64) ([]domain.BackRoleAuthority, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.BackRoleAuthority{})
+	rows, err := configs.Engine.Table("back_role_authority").In("id", ids).Rows(&domain.BackRoleAuthority{})
 	if err != nil {
 		return make([]domain.BackRoleAuthority, 0), err
 	}
@@ -31,7 +31,7 @@ func GetBackRoleAuthorityListInId(ids []int64) ([]domain.BackRoleAuthority, erro
 
 func GetBackRoleAuthorityList(backRoleAuthority domain.BackRoleAuthority, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.BackRoleAuthority
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &backRoleAuthority)
+	Count, err := configs.Engine.Table("back_role_authority").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &backRoleAuthority)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetBackRoleAuthorityList(backRoleAuthority domain.BackRoleAuthority, pageNu
 }
 
 func SaveBackRoleAuthority(backRoleAuthority *domain.BackRoleAuthority) (domain.BackRoleAuthority, error) {
-	_, err := configs.Engine.Insert(&backRoleAuthority)
+	_, err := configs.Engine.Table("back_role_authority").Insert(&backRoleAuthority)
 	if err != nil {
 		return *backRoleAuthority, err
 	}
@@ -68,7 +68,7 @@ func SetBackRoleAuthority(backRoleAuthorityMap map[string]interface{}, id int64)
 
 func DeleteBackRoleAuthority(id int64) bool {
 	var backRoleAuthority domain.BackRoleAuthority
-	i, err := configs.Engine.Where("id = ?", id).Delete(&backRoleAuthority)
+	i, err := configs.Engine.Table("back_role_authority").Where("id = ?", id).Delete(&backRoleAuthority)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/BackRoleDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetBackRoleById(id int64) (domain.BackRole, error) {
 	var backRole domain.BackRole
-	_, err := configs.Engine.Where("id = ?", id).Get(&backRole)
+	_, err := configs.Engine.Table("back_role").Where("id = ?", id).Get(&backRole)
 	if err != nil {
 		return backRole, err
 	}
@@ -16,7 +16,7 @@ func GetBackRoleById(id int64) (domain.BackRole, error) {
 }
 
 func GetBackRoleListInId(ids []int64) ([]domain.BackRole, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.BackRole{})
+	rows, err := configs.Engine.Table("back_role").In("id", ids).Rows(&domain.BackRole{})
 	if err != nil {
 		return make([]domain.BackRole, 0), err
 	}
@@ -31,7 +31,7 @@ func GetBackRoleListInId(ids []int64) ([]domain.BackRole, error) {
 
 func GetBackRoleList(backRole domain.BackRole, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.BackRole
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &backRole)
+	Count, err := configs.Engine.Table("back_role").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &backRole)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetBackRoleList(backRole domain.BackRole, pageNum, pageSize int) (vo.BaseLi
 }
 
 func SaveBackRole(backRole *domain.BackRole) (domain.BackRole, error) {
-	_, err := configs.Engine.Insert(&backRole)
+	_, err := configs.Engine.Table("back_role").Insert(&backRole)
 	if err != nil {
 		return *backRole, err
 	}
@@ -68,7 +68,7 @@ func SetBackRole(backRoleMap map[string]interface{}, id int64) (domain.BackRole,
 
 func DeleteBackRole(id int64) bool {
 	var backRole domain.BackRole
-	i, err := configs.Engine.Where("id = ?", id).Delete(&backRole)
+	i, err := configs.Engine.Table("back_role").Where("id = ?", id).Delete(&backRole)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/BackRoleMenuDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetBackRoleMenuById(id int64) (domain.BackRoleMenu, error) {
 	var backRoleMenu domain.BackRoleMenu
-	_, err := configs.Engine.Where("id = ?", id).Get(&backRoleMenu)
+	_, err := configs.Engine.Table("back_role_menu").Where("id = ?", id).Get(&backRoleMenu)
 	if err != nil {
 		return backRoleMenu, err
 	}
@@ -16,7 +16,7 @@ func GetBackRoleMenuById(id int64) (domain.BackRoleMenu, error) {
 }
 
 func GetBackRoleMenuListInId(ids []int64) ([]domain.BackRoleMenu, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.BackRoleMenu{})
+	rows, err := configs.Engine.Table("back_role_menu").In("id", ids).Rows(&domain.BackRoleMenu{})
 	if err != nil {
 		return make([]domain.BackRoleMenu, 0), err
 	}
@@ -31,7 +31,7 @@ func GetBackRoleMenuListInId(ids []int64) ([]domain.BackRoleMenu, error) {
 
 func GetBackRoleMenuList(backRoleMenu domain.BackRoleMenu, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.BackRoleMenu
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &backRoleMenu)
+	Count, err := configs.Engine.Table("back_role_menu").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &backRoleMenu)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetBackRoleMenuList(backRoleMenu domain.BackRoleMenu, pageNum, pageSize int
 }
 
 func SaveBackRoleMenu(backRoleMenu *domain.BackRoleMenu) (domain.BackRoleMenu, error) {
-	_, err := configs.Engine.Insert(&backRoleMenu)
+	_, err := configs.Engine.Table("back_role_menu").Insert(&backRoleMenu)
 	if err != nil {
 		return *backRoleMenu, err
 	}
@@ -68,7 +68,7 @@ func SetBackRoleMenu(backRoleMenuMap map[string]interface{}, id int64) (domain.B
 
 func DeleteBackRoleMenu(id int64) bool {
 	var backRoleMenu domain.BackRoleMenu
-	i, err := configs.Engine.Where("id = ?", id).Delete(&backRoleMenu)
+	i, err := configs.Engine.Table("back_role_menu").Where("id = ?", id).Delete(&backRoleMenu)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/GenTableColumnDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetGenTableColumnById(id int64) (domain.GenTableColumn, error) {
 	var genTableColumn domain.GenTableColumn
-	_, err := configs.Engine.Where("id = ?", id).Get(&genTableColumn)
+	_, err := configs.Engine.Table("gen_table_column").Where("id = ?", id).Get(&genTableColumn)
 	if err != nil {
 		return genTableColumn, err
 	}
@@ -16,7 +16,7 @@ func GetGenTableColumnById(id int64) (domain.GenTableColumn, error) {
 }
 
 func GetGenTableColumnListInId(ids []int64) ([]domain.GenTableColumn, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.GenTableColumn{})
+	rows, err := configs.Engine.Table("gen_table_column").In("id", ids).Rows(&domain.GenTableColumn{})
 	if err != nil {
 		return make([]domain.GenTableColumn, 0), err
 	}
@@ -31,7 +31,7 @@ func GetGenTableColumnListInId(ids []int64) ([]domain.GenTableColumn, error) {
 
 func GetGenTableColumnList(genTableColumn domain.GenTableColumn, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.GenTableColumn
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &genTableColumn)
+	Count, err := configs.Engine.Table("gen_table_column").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &genTableColumn)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetGenTableColumnList(genTableColumn domain.GenTableColumn, pageNum, pageSi
 }
 
 func SaveGenTableColumn(genTableColumn *domain.GenTableColumn) (domain.GenTableColumn, error) {
-	_, err := configs.Engine.Insert(&genTableColumn)
+	_, err := configs.Engine.Table("gen_table_column").Insert(&genTableColumn)
 	if err != nil {
 		return *genTableColumn, err
 	}
@@ -68,7 +68,7 @@ func SetGenTableColumn(genTableColumnMap map[string]interface{}, id int64) (doma
 
 func DeleteGenTableColumn(id int64) bool {
 	var genTableColumn domain.GenTableColumn
-	i, err := configs.Engine.Where("id = ?", id).Delete(&genTableColumn)
+	i, err := configs.Engine.Table("gen_table_column").Where("id = ?", id).Delete(&genTableColumn)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/GenTableDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetGenTableById(id int64) (domain.GenTable, error) {
 	var genTable domain.GenTable
-	_, err := configs.Engine.Where("id = ?", id).Get(&genTable)
+	_, err := configs.Engine.Table("gen_table").Where("id = ?", id).Get(&genTable)
 	if err != nil {
 		return genTable, err
 	}
@@ -16,7 +16,7 @@ func GetGenTableById(id int64) (domain.GenTable, error) {
 }
 
 func GetGenTableListInId(ids []int64) ([]domain.GenTable, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.GenTable{})
+	rows, err := configs.Engine.Table("gen_table").In("id", ids).Rows(&domain.GenTable{})
 	if err != nil {
 		return make([]domain.GenTable, 0), err
 	}
@@ -31,7 +31,7 @@ func GetGenTableListInId(ids []int64) ([]domain.GenTable, error) {
 
 func GetGenTableList(genTable domain.GenTable, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.GenTable
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &genTable)
+	Count, err := configs.Engine.Table("gen_table").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &genTable)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetGenTableList(genTable domain.GenTable, pageNum, pageSize int) (vo.BaseLi
 }
 
 func SaveGenTable(genTable *domain.GenTable) (domain.GenTable, error) {
-	_, err := configs.Engine.Insert(&genTable)
+	_, err := configs.Engine.Table("gen_table").Insert(&genTable)
 	if err != nil {
 		return *genTable, err
 	}
@@ -68,7 +68,7 @@ func SetGenTable(genTableMap map[string]interface{}, id int64) (domain.GenTable,
 
 func DeleteGenTable(id int64) bool {
 	var genTable domain.GenTable
-	i, err := configs.Engine.Where("id = ?", id).Delete(&genTable)
+	i, err := configs.Engine.Table("gen_table").Where("id = ?", id).Delete(&genTable)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/GoodsCommodityAreaDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetGoodsCommodityAreaById(id int64) (domain.GoodsCommodityArea, error) {
 	var goodsCommodityArea domain.GoodsCommodityArea
-	_, err := configs.Engine.Where("id = ?", id).Get(&goodsCommodityArea)
+	_, err := configs.Engine.Table("goods_commodity_area").Where("id = ?", id).Get(&goodsCommodityArea)
 	if err != nil {
 		return goodsCommodityArea, err
 	}
@@ -16,7 +16,7 @@ func GetGoodsCommodityAreaById(id int64) (domain.GoodsCommodityArea, error) {
 }
 
 func GetGoodsCommodityAreaListInId(ids []int64) ([]domain.GoodsCommodityArea, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.GoodsCommodityArea{})
+	rows, err := configs.Engine.Table("goods_commodity_area").In("id", ids).Rows(&domain.GoodsCommodityArea{})
 	if err != nil {
 		return make([]domain.GoodsCommodityArea, 0), err
 	}
@@ -31,7 +31,7 @@ func GetGoodsCommodityAreaListInId(ids []int64) ([]domain.GoodsCommodityArea, er
 
 func GetGoodsCommodityAreaList(goodsCommodityArea domain.GoodsCommodityArea, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.GoodsCommodityArea
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsCommodityArea)
+	Count, err := configs.Engine.Table("goods_commodity_area").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &goodsCommodityArea)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetGoodsCommodityAreaList(goodsCommodityArea domain.GoodsCommodityArea, pag
 }
 
 func SaveGoodsCommodityArea(goodsCommodityArea *domain.GoodsCommodityArea) (domain.GoodsCommodityArea, error) {
-	_, err := configs.Engine.Insert(&goodsCommodityArea)
+	_, err := configs.Engine.Table("goods_commodity_area").Insert(&goodsCommodityArea)
 	if err != nil {
 		return *goodsCommodityArea, err
 	}
@@ -68,7 +68,7 @@ func SetGoodsCommodityArea(goodsCommodityAreaMap map[string]interface{}, id int6
 
 func DeleteGoodsCommodityArea(id int64) bool {
 	var goodsCommodityArea domain.GoodsCommodityArea
-	i, err := configs.Engine.Where("id = ?", id).Delete(&goodsCommodityArea)
+	i, err := configs.Engine.Table("goods_commodity_area").Where("id = ?", id).Delete(&goodsCommodityArea)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/GoodsCouponDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetGoodsCouponById(id int64) (domain.GoodsCoupon, error) {
 	var goodsCoupon domain.GoodsCoupon
-	_, err := configs.Engine.Where("id = ?", id).Get(&goodsCoupon)
+	_, err := configs.Engine.Table("goods_coupon").Where("id = ?", id).Get(&goodsCoupon)
 	if err != nil {
 		return goodsCoupon, err
 	}
@@ -16,7 +16,7 @@ func GetGoodsCouponById(id int64) (domain.GoodsCoupon, error) {
 }
 
 func GetGoodsCouponListInId(ids []int64) ([]domain.GoodsCoupon, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.GoodsCoupon{})
+	rows, err := configs.Engine.Table("goods_coupon").In("id", ids).Rows(&domain.GoodsCoupon{})
 	if err != nil {
 		return make([]domain.GoodsCoupon, 0), err
 	}
@@ -31,7 +31,7 @@ func GetGoodsCouponListInId(ids []int64) ([]domain.GoodsCoupon, error) {
 
 func GetGoodsCouponList(goodsCoupon domain.GoodsCoupon, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.GoodsCoupon
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsCoupon)
+	Count, err := configs.Engine.Table("goods_coupon").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &goodsCoupon)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetGoodsCouponList(goodsCoupon domain.GoodsCoupon, pageNum, pageSize int) (
 }
 
 func SaveGoodsCoupon(goodsCoupon *domain.GoodsCoupon) (domain.GoodsCoupon, error) {
-	_, err := configs.Engine.Insert(&goodsCoupon)
+	_, err := configs.Engine.Table("goods_coupon").Insert(&goodsCoupon)
 	if err != nil {
 		return *goodsCoupon, err
 	}
@@ -68,7 +68,7 @@ func SetGoodsCoupon(goodsCouponMap map[string]interface{}, id int64) (domain.Goo
 
 func DeleteGoodsCoupon(id int64) bool {
 	var goodsCoupon domain.GoodsCoupon
-	i, err := configs.Engine.Where("id = ?", id).Delete(&goodsCoupon)
+	i, err := configs.Engine.Table("goods_coupon").Where("id = ?", id).Delete(&goodsCoupon)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/GoodsCouponUserDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetGoodsCouponUserById(id int64) (domain.GoodsCouponUser, error) {
 	var goodsCouponUser domain.GoodsCouponUser
-	_, err := configs.Engine.Where("id = ?", id).Get(&goodsCouponUser)
+	_, err := configs.Engine.Table("goods_coupon_user").Where("id = ?", id).Get(&goodsCouponUser)
 	if err != nil {
 		return goodsCouponUser, err
 	}
@@ -16,7 +16,7 @@ func GetGoodsCouponUserById(id int64) (domain.GoodsCouponUser, error) {
 }
 
 func GetGoodsCouponUserListInId(ids []int64) ([]domain.GoodsCouponUser, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.GoodsCouponUser{})
+	rows, err := configs.Engine.Table("goods_coupon_user").In("id", ids).Rows(&domain.GoodsCouponUser{})
 	if err != nil {
 		return make([]domain.GoodsCouponUser, 0), err
 	}
@@ -31,7 +31,7 @@ func GetGoodsCouponUserListInId(ids []int64) ([]domain.GoodsCouponUser, error) {
 
 func GetGoodsCouponUserList(goodsCouponUser domain.GoodsCouponUser, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.GoodsCouponUser
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsCouponUser)
+	Count, err := configs.Engine.Table("goods_coupon_user").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &goodsCouponUser)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetGoodsCouponUserList(goodsCouponUser domain.GoodsCouponUser, pageNum, pag
 }
 
 func SaveGoodsCouponUser(goodsCouponUser *domain.GoodsCouponUser) (domain.GoodsCouponUser, error) {
-	_, err := configs.Engine.Insert(&goodsCouponUser)
+	_, err := configs.Engine.Table("goods_coupon_user").Insert(&goodsCouponUser)
 	if err != nil {
 		return *goodsCouponUser, err
 	}
@@ -68,7 +68,7 @@ func SetGoodsCouponUser(goodsCouponUserMap map[string]interface{}, id int64) (do
 
 func DeleteGoodsCouponUser(id int64) bool {
 	var goodsCouponUser domain.GoodsCouponUser
-	i, err := configs.Engine.Where("id = ?", id).Delete(&goodsCouponUser)
+	i, err := configs.Engine.Table("goods_coupon_user").Where("id = ?", id).Delete(&goodsCouponUser)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/GoodsDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetGoodsById(id int64) (domain.Goods, error) {
 	var goods domain.Goods
-	_, err := configs.Engine.Where("id = ?", id).Get(&goods)
+	_, err := configs.Engine.Table("goods").Where("id = ?", id).Get(&goods)
 	if err != nil {
 		return goods, err
 	}
@@ -16,7 +16,7 @@ func GetGoodsById(id int64) (domain.Goods, error) {
 }
 
 func GetGoodsListInId(ids []int64) ([]domain.Goods, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.Goods{})
+	rows, err := configs.Engine.Table("goods").In("id", ids).Rows(&domain.Goods{})
 	if err != nil {
 		return make([]domain.Goods, 0), err
 	}
@@ -31,7 +31,7 @@ func GetGoodsListInId(ids []int64) ([]domain.Goods, error) {
 
 func GetGoodsList(goods domain.Goods, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.Goods
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goods)
+	Count, err := configs.Engine.Table("goods").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &goods)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetGoodsList(goods domain.Goods, pageNum, pageSize int) (vo.BaseListVo, err
 }
 
 func SaveGoods(goods *domain.Goods) (domain.Goods, error) {
-	_, err := configs.Engine.Insert(&goods)
+	_, err := configs.Engine.Table("goods").Insert(&goods)
 	if err != nil {
 		return *goods, err
 	}
@@ -68,7 +68,7 @@ func SetGoods(goodsMap map[string]interface{}, id int64) (domain.Goods, bool, er
 
 func DeleteGoods(id int64) bool {
 	var goods domain.Goods
-	i, err := configs.Engine.Where("id = ?", id).Delete(&goods)
+	i, err := configs.Engine.Table("goods").Where("id = ?", id).Delete(&goods)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/GoodsIntroductionDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetGoodsIntroductionById(id int64) (domain.GoodsIntroduction, error) {
 	var goodsIntroduction domain.GoodsIntroduction
-	_, err := configs.Engine.Where("id = ?", id).Get(&goodsIntroduction)
+	_, err := configs.Engine.Table("goods_introduction").Where("id = ?", id).Get(&goodsIntroduction)
 	if err != nil {
 		return goodsIntroduction, err
 	}
@@ -16,7 +16,7 @@ func GetGoodsIntroductionById(id int64) (domain.GoodsIntroduction, error) {
 }
 
 func GetGoodsIntroductionListInId(ids []int64) ([]domain.GoodsIntroduction, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.GoodsIntroduction{})
+	rows, err := configs.Engine.Table("goods_introduction").In("id", ids).Rows(&domain.GoodsIntroduction{})
 	if err != nil {
 		return make([]domain.GoodsIntroduction, 0), err
 	}
@@ -31,7 +31,7 @@ func GetGoodsIntroductionListInId(ids []int64) ([]domain.GoodsIntroduction, erro
 
 func GetGoodsIntroductionList(goodsIntroduction domain.GoodsIntroduction, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.GoodsIntroduction
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsIntroduction)
+	Count, err := configs.Engine.Table("goods_introduction").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &goodsIntroduction)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetGoodsIntroductionList(goodsIntroduction domain.GoodsIntroduction, pageNu
 }
 
 func SaveGoodsIntroduction(goodsIntroduction *domain.GoodsIntroduction) (domain.GoodsIntroduction, error) {
-	_, err := configs.Engine.Insert(&goodsIntroduction)
+	_, err := configs.Engine.Table("goods_introduction").Insert(&goodsIntroduction)
 	if err != nil {
 		return *goodsIntroduction, err
 	}
@@ -68,7 +68,7 @@ func SetGoodsIntroduction(goodsIntroductionMap map[string]interface{}, id int64)
 
 func DeleteGoodsIntroduction(id int64) bool {
 	var goodsIntroduction domain.GoodsIntroduction
-	i, err := configs.Engine.Where("id = ?", id).Delete(&goodsIntroduction)
+	i, err := configs.Engine.Table("goods_introduction").Where("id = ?", id).Delete(&goodsIntroduction)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/GoodsOrderDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetGoodsOrderById(id int64) (domain.GoodsOrder, error) {
 	var goodsOrder domain.GoodsOrder
-	_, err := configs.Engine.Where("id = ?", id).Get(&goodsOrder)
+	_, err := configs.Engine.Table("goods_order").Where("id = ?", id).Get(&goodsOrder)
 	if err != nil {
 		return goodsOrder, err
 	}
@@ -16,7 +16,7 @@ func GetGoodsOrderById(id int64) (domain.GoodsOrder, error) {
 }
 
 func GetGoodsOrderListInId(ids []int64) ([]domain.GoodsOrder, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.GoodsOrder{})
+	rows, err := configs.Engine.Table("goods_order").In("id", ids).Rows(&domain.GoodsOrder{})
 	if err != nil {
 		return make([]domain.GoodsOrder, 0), err
 	}
@@ -31,7 +31,7 @@ func GetGoodsOrderListInId(ids []int64) ([]domain.GoodsOrder, error) {
 
 func GetGoodsOrderList(goodsOrder domain.GoodsOrder, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.GoodsOrder
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsOrder)
+	Count, err := configs.Engine.Table("goods_order").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &goodsOrder)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetGoodsOrderList(goodsOrder domain.GoodsOrder, pageNum, pageSize int) (vo.
 }
 
 func SaveGoodsOrder(goodsOrder *domain.GoodsOrder) (domain.GoodsOrder, error) {
-	_, err := configs.Engine.Insert(&goodsOrder)
+	_, err := configs.Engine.Table("goods_order").Insert(&goodsOrder)
 	if err != nil {
 		return *goodsOrder, err
 	}
@@ -68,7 +68,7 @@ func SetGoodsOrder(goodsOrderMap map[string]interface{}, id int64) (domain.Goods
 
 func DeleteGoodsOrder(id int64) bool {
 	var goodsOrder domain.GoodsOrder
-	i, err := configs.Engine.Where("id = ?", id).Delete(&goodsOrder)
+	i, err := configs.Engine.Table("goods_order").Where("id = ?", id).Delete(&goodsOrder)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/GoodsSkuCardDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetGoodsSkuCardById(id int64) (domain.GoodsSkuCard, error) {
 	var goodsSkuCard domain.GoodsSkuCard
-	_, err := configs.Engine.Where("id = ?", id).Get(&goodsSkuCard)
+	_, err := configs.Engine.Table("goods_sku_card").Where("id = ?", id).Get(&goodsSkuCard)
 	if err != nil {
 		return goodsSkuCard, err
 	}
@@ -16,7 +16,7 @@ func GetGoodsSkuCardById(id int64) (domain.GoodsSkuCard, error) {
 }
 
 func GetGoodsSkuCardListInId(ids []int64) ([]domain.GoodsSkuCard, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.GoodsSkuCard{})
+	rows, err := configs.Engine.Table("goods_sku_card").In("id", ids).Rows(&domain.GoodsSkuCard{})
 	if err != nil {
 		return make([]domain.GoodsSkuCard, 0), err
 	}
@@ -31,7 +31,7 @@ func GetGoodsSkuCardListInId(ids []int64) ([]domain.GoodsSkuCard, error) {
 
 func GetGoodsSkuCardList(goodsSkuCard domain.GoodsSkuCard, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.GoodsSkuCard
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsSkuCard)
+	Count, err := configs.Engine.Table("goods_sku_card").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &goodsSkuCard)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetGoodsSkuCardList(goodsSkuCard domain.GoodsSkuCard, pageNum, pageSize int
 }
 
 func SaveGoodsSkuCard(goodsSkuCard *domain.GoodsSkuCard) (domain.GoodsSkuCard, error) {
-	_, err := configs.Engine.Insert(&goodsSkuCard)
+	_, err := configs.Engine.Table("goods_sku_card").Insert(&goodsSkuCard)
 	if err != nil {
 		return *goodsSkuCard, err
 	}
@@ -68,7 +68,7 @@ func SetGoodsSkuCard(goodsSkuCardMap map[string]interface{}, id int64) (domain.G
 
 func DeleteGoodsSkuCard(id int64) bool {
 	var goodsSkuCard domain.GoodsSkuCard
-	i, err := configs.Engine.Where("id = ?", id).Delete(&goodsSkuCard)
+	i, err := configs.Engine.Table("goods_sku_card").Where("id = ?", id).Delete(&goodsSkuCard)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/GoodsSkuDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetGoodsSkuById(id int64) (domain.GoodsSku, error) {
 	var goodsSku domain.GoodsSku
-	_, err := configs.Engine.Where("id = ?", id).Get(&goodsSku)
+	_, err := configs.Engine.Table("goods_sku").Where("id = ?", id).Get(&goodsSku)
 	if err != nil {
 		return goodsSku, err
 	}
@@ -16,7 +16,7 @@ func GetGoodsSkuById(id int64) (domain.GoodsSku, error) {
 }
 
 func GetGoodsSkuListInId(ids []int64) ([]domain.GoodsSku, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.GoodsSku{})
+	rows, err := configs.Engine.Table("goods_sku").In("id", ids).Rows(&domain.GoodsSku{})
 	if err != nil {
 		return make([]domain.GoodsSku, 0), err
 	}
@@ -31,7 +31,7 @@ func GetGoodsSkuListInId(ids []int64) ([]domain.GoodsSku, error) {
 
 func GetGoodsSkuList(goodsSku domain.GoodsSku, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.GoodsSku
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsSku)
+	Count, err := configs.Engine.Table("goods_sku").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &goodsSku)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetGoodsSkuList(goodsSku domain.GoodsSku, pageNum, pageSize int) (vo.BaseLi
 }
 
 func SaveGoodsSku(goodsSku *domain.GoodsSku) (domain.GoodsSku, error) {
-	_, err := configs.Engine.Insert(&goodsSku)
+	_, err := configs.Engine.Table("goods_sku").Insert(&goodsSku)
 	if err != nil {
 		return *goodsSku, err
 	}
@@ -68,7 +68,7 @@ func SetGoodsSku(goodsSkuMap map[string]interface{}, id int64) (domain.GoodsSku,
 
 func DeleteGoodsSku(id int64) bool {
 	var goodsSku domain.GoodsSku
-	i, err := configs.Engine.Where("id = ?", id).Delete(&goodsSku)
+	i, err := configs.Engine.Table("goods_sku").Where("id = ?", id).Delete(&goodsSku)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/GoodsTagDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetGoodsTagById(id int64) (domain.GoodsTag, error) {
 	var goodsTag domain.GoodsTag
-	_, err := configs.Engine.Where("id = ?", id).Get(&goodsTag)
+	_, err := configs.Engine.Table("goods_tag").Where("id = ?", id).Get(&goodsTag)
 	if err != nil {
 		return goodsTag, err
 	}
@@ -16,7 +16,7 @@ func GetGoodsTagById(id int64) (domain.GoodsTag, error) {
 }
 
 func GetGoodsTagListInId(ids []int64) ([]domain.GoodsTag, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.GoodsTag{})
+	rows, err := configs.Engine.Table("goods_tag").In("id", ids).Rows(&domain.GoodsTag{})
 	if err != nil {
 		return make([]domain.GoodsTag, 0), err
 	}
@@ -31,7 +31,7 @@ func GetGoodsTagListInId(ids []int64) ([]domain.GoodsTag, error) {
 
 func GetGoodsTagList(goodsTag domain.GoodsTag, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.GoodsTag
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsTag)
+	Count, err := configs.Engine.Table("goods_tag").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &goodsTag)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetGoodsTagList(goodsTag domain.GoodsTag, pageNum, pageSize int) (vo.BaseLi
 }
 
 func SaveGoodsTag(goodsTag *domain.GoodsTag) (domain.GoodsTag, error) {
-	_, err := configs.Engine.Insert(&goodsTag)
+	_, err := configs.Engine.Table("goods_tag").Insert(&goodsTag)
 	if err != nil {
 		return *goodsTag, err
 	}
@@ -68,7 +68,7 @@ func SetGoodsTag(goodsTagMap map[string]interface{}, id int64) (domain.GoodsTag,
 
 func DeleteGoodsTag(id int64) bool {
 	var goodsTag domain.GoodsTag
-	i, err := configs.Engine.Where("id = ?", id).Delete(&goodsTag)
+	i, err := configs.Engine.Table("goods_tag").Where("id = ?", id).Delete(&goodsTag)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/GoodsTopicDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetGoodsTopicById(id int64) (domain.GoodsTopic, error) {
 	var goodsTopic domain.GoodsTopic
-	_, err := configs.Engine.Where("id = ?", id).Get(&goodsTopic)
+	_, err := configs.Engine.Table("goods_topic").Where("id = ?", id).Get(&goodsTopic)
 	if err != nil {
 		return goodsTopic, err
 	}
@@ -16,7 +16,7 @@ func GetGoodsTopicById(id int64) (domain.GoodsTopic, error) {
 }
 
 func GetGoodsTopicListInId(ids []int64) ([]domain.GoodsTopic, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.GoodsTopic{})
+	rows, err := configs.Engine.Table("goods_topic").In("id", ids).Rows(&domain.GoodsTopic{})
 	if err != nil {
 		return make([]domain.GoodsTopic, 0), err
 	}
@@ -31,7 +31,7 @@ func GetGoodsTopicListInId(ids []int64) ([]domain.GoodsTopic, error) {
 
 func GetGoodsTopicList(goodsTopic domain.GoodsTopic, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.GoodsTopic
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsTopic)
+	Count, err := configs.Engine.Table("goods_topic").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &goodsTopic)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetGoodsTopicList(goodsTopic domain.GoodsTopic, pageNum, pageSize int) (vo.
 }
 
 func SaveGoodsTopic(goodsTopic *domain.GoodsTopic) (domain.GoodsTopic, error) {
-	_, err := configs.Engine.Insert(&goodsTopic)
+	_, err := configs.Engine.Table("goods_topic").Insert(&goodsTopic)
 	if err != nil {
 		return *goodsTopic, err
 	}
@@ -68,7 +68,7 @@ func SetGoodsTopic(goodsTopicMap map[string]interface{}, id int64) (domain.Goods
 
 func DeleteGoodsTopic(id int64) bool {
 	var goodsTopic domain.GoodsTopic
-	i, err := configs.Engine.Where("id = ?", id).Delete(&goodsTopic)
+	i, err := configs.Engine.Table("goods_topic").Where("id = ?", id).Delete(&goodsTopic)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/GoodsTypeDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetGoodsTypeById(id int64) (domain.GoodsType, error) {
 	var goodsType domain.GoodsType
-	_, err := configs.Engine.Where("id = ?", id).Get(&goodsType)
+	_, err := configs.Engine.Table("goods_type").Where("id = ?", id).Get(&goodsType)
 	if err != nil {
 		return goodsType, err
 	}
@@ -16,7 +16,7 @@ func GetGoodsTypeById(id int64) (domain.GoodsType, error) {
 }
 
 func GetGoodsTypeListInId(ids []int64) ([]domain.GoodsType, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.GoodsType{})
+	rows, err := configs.Engine.Table("goods_type").In("id", ids).Rows(&domain.GoodsType{})
 	if err != nil {
 		return make([]domain.GoodsType, 0), err
 	}
@@ -31,7 +31,7 @@ func GetGoodsTypeListInId(ids []int64) ([]domain.GoodsType, error) {
 
 func GetGoodsTypeList(goodsType domain.GoodsType, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.GoodsType
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &goodsType)
+	Count, err := configs.Engine.Table("goods_type").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &goodsType)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetGoodsTypeList(goodsType domain.GoodsType, pageNum, pageSize int) (vo.Bas
 }
 
 func SaveGoodsType(goodsType *domain.GoodsType) (domain.GoodsType, error) {
-	_, err := configs.Engine.Insert(&goodsType)
+	_, err := configs.Engine.Table("goods_type").Insert(&goodsType)
 	if err != nil {
 		return *goodsType, err
 	}
@@ -68,7 +68,7 @@ func SetGoodsType(goodsTypeMap map[string]interface{}, id int64) (domain.GoodsTy
 
 func DeleteGoodsType(id int64) bool {
 	var goodsType domain.GoodsType
-	i, err := configs.Engine.Where("id = ?", id).Delete(&goodsType)
+	i, err := configs.Engine.Table("goods_type").Where("id = ?", id).Delete(&goodsType)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/UserDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetUserById(id int64) (domain.User, error) {
 	var user domain.User
-	_, err := configs.Engine.Where("id = ?", id).Get(&user)
+	_, err := configs.Engine.Table("user").Where("id = ?", id).Get(&user)
 	if err != nil {
 		return user, err
 	}
@@ -16,7 +16,7 @@ func GetUserById(id int64) (domain.User, error) {
 }
 
 func GetUserListInId(ids []int64) ([]domain.User, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.User{})
+	rows, err := configs.Engine.Table("user").In("id", ids).Rows(&domain.User{})
 	if err != nil {
 		return make([]domain.User, 0), err
 	}
@@ -31,7 +31,7 @@ func GetUserListInId(ids []int64) ([]domain.User, error) {
 
 func GetUserList(user domain.User, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.User
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &user)
+	Count, err := configs.Engine.Table("user").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &user)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetUserList(user domain.User, pageNum, pageSize int) (vo.BaseListVo, error)
 }
 
 func SaveUser(user *domain.User) (domain.User, error) {
-	_, err := configs.Engine.Insert(&user)
+	_, err := configs.Engine.Table("user").Insert(&user)
 	if err != nil {
 		return *user, err
 	}
@@ -68,7 +68,7 @@ func SetUser(userMap map[string]interface{}, id int64) (domain.User, bool, error
 
 func DeleteUser(id int64) bool {
 	var user domain.User
-	i, err := configs.Engine.Where("id = ?", id).Delete(&user)
+	i, err := configs.Engine.Table("user").Where("id = ?", id).Delete(&user)
 	if err != nil {
 		return false
 	}

+ 5 - 5
data/dao/manage/UserWalletDao.go

@@ -8,7 +8,7 @@ import (
 
 func GetUserWalletById(id int64) (domain.UserWallet, error) {
 	var userWallet domain.UserWallet
-	_, err := configs.Engine.Where("id = ?", id).Get(&userWallet)
+	_, err := configs.Engine.Table("user_wallet").Where("id = ?", id).Get(&userWallet)
 	if err != nil {
 		return userWallet, err
 	}
@@ -16,7 +16,7 @@ func GetUserWalletById(id int64) (domain.UserWallet, error) {
 }
 
 func GetUserWalletListInId(ids []int64) ([]domain.UserWallet, error) {
-	rows, err := configs.Engine.In("id", ids).Rows(&domain.UserWallet{})
+	rows, err := configs.Engine.Table("user_wallet").In("id", ids).Rows(&domain.UserWallet{})
 	if err != nil {
 		return make([]domain.UserWallet, 0), err
 	}
@@ -31,7 +31,7 @@ func GetUserWalletListInId(ids []int64) ([]domain.UserWallet, error) {
 
 func GetUserWalletList(userWallet domain.UserWallet, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.UserWallet
-	Count, err := configs.Engine.Limit(pageSize, (pageNum-1)*pageSize).Desc("id").FindAndCount(&arr, &userWallet)
+	Count, err := configs.Engine.Table("user_wallet").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &userWallet)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -50,7 +50,7 @@ func GetUserWalletList(userWallet domain.UserWallet, pageNum, pageSize int) (vo.
 }
 
 func SaveUserWallet(userWallet *domain.UserWallet) (domain.UserWallet, error) {
-	_, err := configs.Engine.Insert(&userWallet)
+	_, err := configs.Engine.Table("user_wallet").Insert(&userWallet)
 	if err != nil {
 		return *userWallet, err
 	}
@@ -68,7 +68,7 @@ func SetUserWallet(userWalletMap map[string]interface{}, id int64) (domain.UserW
 
 func DeleteUserWallet(id int64) bool {
 	var userWallet domain.UserWallet
-	i, err := configs.Engine.Where("id = ?", id).Delete(&userWallet)
+	i, err := configs.Engine.Table("user_wallet").Where("id = ?", id).Delete(&userWallet)
 	if err != nil {
 		return false
 	}

+ 55 - 5
data/domain/DoMain.go

@@ -50,6 +50,17 @@ func (receiver ArticleTopic) String() string {
 	return fmt.Sprint("ArticleTopic{Id:", receiver.Id, ",Image:", receiver.Image, ",TopicName:", receiver.TopicName, ",TopicDesc:", receiver.TopicDesc, "}")
 }
 
+// Authority
+type Authority struct {
+	Id            int64  `json:"id"`                                   // 11 0 注释:
+	AuthorityName string `xorm:"authority_name"  json:"authorityName"` // 255 0 注释:
+	AuthorityPath string `xorm:"authority_path"  json:"authorityPath"` // 255 0 注释:
+}
+
+func (receiver Authority) String() string {
+	return fmt.Sprint("Authority{Id:", receiver.Id, ",AuthorityName:", receiver.AuthorityName, ",AuthorityPath:", receiver.AuthorityPath, "}")
+}
+
 // BackAuthority 后台权限校验
 type BackAuthority struct {
 	Id                    int64     `json:"id"`                                                   // 11 0 注释:id
@@ -115,10 +126,10 @@ func (receiver BackRoleMenu) String() string {
 
 // DictData 字典数据
 type DictData struct {
-	Id        int64  `json:"id"`                           // 11 0 注释:
+	Id        int64  `json:"id"`                           // 11 0 注释:字典编码
 	Sort      int64  `xorm:"sort"  json:"sort"`            // 11 0 注释:排序
 	DictLabel string `xorm:"dict_label"  json:"dictLabel"` // 255 0 注释:字典标签
-	DictValue string `xorm:"dict_value"  json:"dictValue"` // 255 0 注释:字典值
+	DictValue string `xorm:"dict_value"  json:"dictValue"` // 255 0 注释:字典
 	DictType  string `xorm:"dict_type"  json:"dictType"`   // 255 0 注释:字典类型
 	Status    string `xorm:"status"  json:"status"`        // 5 0 注释:状态
 	CssStyle  string `xorm:"css_style"  json:"cssStyle"`   // 50 0 注释:样式
@@ -133,9 +144,9 @@ func (receiver DictData) String() string {
 // DictType 字典类型
 type DictType struct {
 	Id       int64  `json:"id"`                         // 11 0 注释:
-	DictName string `xorm:"dict_name"  json:"dictName"` // 50 0 注释:字典名
-	DictType string `xorm:"dict_type"  json:"dictType"` // 50 0 注释:字典
-	Status   string `xorm:"status"  json:"status"`      // 5 0 注释:状态
+	DictName string `xorm:"dict_name"  json:"dictName"` // 50 0 注释:字典名
+	DictType string `xorm:"dict_type"  json:"dictType"` // 50 0 注释:字典类型
+	Status   string `xorm:"status"  json:"status"`      // 5 0 注释:状态(1正常/0停用)
 	Remark   string `xorm:"remark"  json:"remark"`      // 255 0 注释:备注
 }
 
@@ -348,6 +359,45 @@ func (receiver GoodsType) String() string {
 	return fmt.Sprint("GoodsType{Id:", receiver.Id, ",Sort:", receiver.Sort, ",TypeImage:", receiver.TypeImage, ",TypeName:", receiver.TypeName, ",CreateTime:", receiver.CreateTime, "}")
 }
 
+// ManageUser
+type ManageUser struct {
+	Id           int64  `json:"id"`                                 // 11 0 注释:
+	Name         string `xorm:"name"  json:"name"`                  // 255 0 注释:名称
+	Username     string `xorm:"username"  json:"username"`          // 255 0 注释:账号
+	Password     string `xorm:"password"  json:"password"`          // 255 0 注释:密码
+	CreationTime int64  `xorm:"creation_time"  json:"creationTime"` // 11 0 注释:账号创建时间
+	LoginTime    int64  `xorm:"login_time"  json:"loginTime"`       // 11 0 注释:登录时间
+	Status       string `xorm:"status"  json:"status"`              // 255 0 注释:账号状态
+	RoleId       int64  `xorm:"role_id"  json:"roleId"`             // 11 0 注释:角色id
+	Phone        string `xorm:"phone"  json:"phone"`                // 255 0 注释:手机
+	Email        string `xorm:"email"  json:"email"`                // 255 0 注释:邮箱
+	Avatar       string `xorm:"avatar"  json:"avatar"`              // 255 0 注释:头像
+}
+
+func (receiver ManageUser) String() string {
+	return fmt.Sprint("ManageUser{Id:", receiver.Id, ",Name:", receiver.Name, ",Username:", receiver.Username, ",Password:", receiver.Password, ",CreationTime:", receiver.CreationTime, ",LoginTime:", receiver.LoginTime, ",Status:", receiver.Status, ",RoleId:", receiver.RoleId, ",Phone:", receiver.Phone, ",Email:", receiver.Email, ",Avatar:", receiver.Avatar, "}")
+}
+
+// Role
+type Role struct {
+	Id       int64  `json:"id"`                         // 11 0 注释:
+	RoleName string `xorm:"role_name"  json:"roleName"` // 255 0 注释:
+}
+
+func (receiver Role) String() string {
+	return fmt.Sprint("Role{Id:", receiver.Id, ",RoleName:", receiver.RoleName, "}")
+}
+
+// RoleAuthority
+type RoleAuthority struct {
+	AuthorityId int64 `xorm:"authority_id"  json:"authorityId"` // 11 0 注释:
+	RoleId      int64 `xorm:"role_id"  json:"roleId"`           // 11 0 注释:
+}
+
+func (receiver RoleAuthority) String() string {
+	return fmt.Sprint("RoleAuthority{AuthorityId:", receiver.AuthorityId, ",RoleId:", receiver.RoleId, "}")
+}
+
 // User 用户表
 type User struct {
 	Id            int64  `json:"id"`                                   // 11 0 注释:

BIN
file/resources/202404231442072 - 副本.jpg


Файловите разлики са ограничени, защото са твърде много
+ 28 - 3
file/virtual_mall.sql


+ 3 - 0
router/BackRouter.go

@@ -18,6 +18,8 @@ func BaseBackRouter(group *gin.RouterGroup) {
 
 	BaseDictTypeRouter(group)
 	BaseDictDataRouter(group)
+	BaseGenTableRouter(group)
+	BaseGenTableColumnRouter(group)
 
 	BaseGoodsRouter(group)
 	BaseGoodsCommodityAreaRouter(group)
@@ -33,6 +35,7 @@ func BaseBackRouter(group *gin.RouterGroup) {
 	BaseUserRouter(group)
 	BaseUserWalletRouter(group)
 }
+
 func BackRouter(engine *gin.RouterGroup) {
 	user := engine.Group("/back")
 	PushRouter(user, "GET", "/role/authority", GetRoleAndAuthority)

+ 0 - 1
router/DetailRouter.go

@@ -16,7 +16,6 @@ func DetailRouter(engine *gin.RouterGroup) {
 	PushRouter(user, "GET", "/search", GetSearchByKey)
 	//获取文章详情
 	//user.GET("/:id", GetDetailData)
-	user.Use(LogInterceptor())
 	PushRouter(user, "GET", "/:id", GetDetailData)
 }
 

+ 3 - 1
router/FileRouter.go

@@ -50,5 +50,7 @@ func uploadHandler(c *gin.Context) {
 		err = errors.New(fmt.Sprintf("上传失败,%v", err))
 		return
 	}
-	c.JSON(200, CreateResult())
+	c.JSON(200, CreateResultData(map[string]interface{}{
+		"url": "/api/static/" + header.Filename,
+	}))
 }

+ 117 - 36
router/Interceptor.go

@@ -1,58 +1,139 @@
 package router
 
 import (
+	"demo/data/dao"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"strings"
 )
 
-func Interceptor(InterceptorName string) gin.HandlerFunc {
-	switch InterceptorName {
-	case "login":
-		return LoginInterceptor()
-	case "log":
-		return LogInterceptor()
-	case "authority":
-		return AuthorityInterceptor()
-	default:
-		return func(context *gin.Context) {
-			fmt.Println("未知拦截器:" + InterceptorName)
+//	func Interceptor(InterceptorName string) gin.HandlerFunc {
+//		switch InterceptorName {
+//		case "login":
+//			return LoginInterceptor()
+//		case "log":
+//			return LogInterceptor()
+//		case "authority":
+//			return AuthorityInterceptor()
+//		default:
+//			return func(context *gin.Context) {
+//				fmt.Println("未知拦截器:" + InterceptorName)
+//			}
+//		}
+//	}
+func Interceptor() gin.HandlerFunc {
+	return func(context *gin.Context) {
+		path := context.FullPath()
+		if path[0:len(Prefix)] == Prefix {
+			path = path[len(Prefix):]
+		}
+		authority := PathRouterMap[path]
+		if authority.AuthorityVerification != "" {
+			Interceptors := strings.Split(authority.AuthorityVerification, ",")
+			for _, v := range Interceptors {
+				switch v {
+				case "log":
+					if !LogInterceptor(context) {
+						return
+					}
+					break
+				case "login":
+					if !LoginInterceptor(context) {
+						return
+					}
+					break
+				case "authority":
+					if !AuthorityInterceptor(context) {
+						return
+					}
+					break
+				default:
+					fmt.Println("未知拦截器:" + v)
+				}
+			}
 		}
 	}
 }
 
 // LoginInterceptor 登录拦截器
-func LoginInterceptor() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		id := GetUserIdByToken(c)
-		fmt.Println("拦截器", id)
-		if id == 0 {
-			fmt.Println("拦截器:用户未登录")
-			//这里终止后续请求访问
-			c.Abort()
-			return
-		}
+func LoginInterceptor(c *gin.Context) bool {
+	id := GetUserIdByToken(c)
+	if id == 0 {
+		fmt.Println("拦截器:用户未登录")
+		//这里终止后续请求访问
+		c.Abort()
+		return false
 	}
+	return true
 }
 
 // LogInterceptor 日志拦截器
-func LogInterceptor() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		fmt.Println("日志系统")
-		c.Next()
-		fmt.Println("日志系统666")
-	}
+func LogInterceptor(c *gin.Context) bool {
+	keys := c.Keys
+	fmt.Println("==========================日志系统==========================\nkeys:", keys)
+	fmt.Println("路由地址:", c.Request.URL)
+	fmt.Println("路由参数:", c.Request.Form)
+	return true
 }
 
 // AuthorityInterceptor 权限拦截器
-func AuthorityInterceptor() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		id := GetUserIdByToken(c)
-		if id == 0 {
-			c.Abort()
-		}
-		path := c.FullPath()
-		fmt.Println(path)
+func AuthorityInterceptor(c *gin.Context) bool {
+	id := GetUserIdByToken(c)
+	if id == 0 {
+		fmt.Println("拦截器:用户未登录")
+		//这里终止后续请求访问
+		c.Abort()
+		return false
+	}
+	path := c.FullPath()
+	if path[0:len(Prefix)] == Prefix {
+		path = path[len(Prefix):]
+	}
 
-		//dao.CheckAuthorityByUserId(id,)
+	if !dao.CheckAuthorityByUserId(id, PathRouterMap[path].Id) {
+		fmt.Println("拦截器:用户权限不足")
+		c.JSON(200, CreateResultError(500, "权限不足"))
+		//这里终止后续请求访问
+		c.Abort()
+		return false
 	}
+	return true
 }
+
+//
+//// LoginInterceptor 登录拦截器
+//func LoginInterceptor() gin.HandlerFunc {
+//	return func(c *gin.Context) {
+//		id := GetUserIdByToken(c)
+//		fmt.Println("拦截器", id)
+//		if id == 0 {
+//			fmt.Println("拦截器:用户未登录")
+//			//这里终止后续请求访问
+//			c.Abort()
+//			return
+//		}
+//	}
+//}
+//
+//// LogInterceptor 日志拦截器
+//func LogInterceptor() gin.HandlerFunc {
+//	return func(c *gin.Context) {
+//		fmt.Println("日志系统")
+//		c.Next()
+//		fmt.Println("日志系统666")
+//	}
+//}
+//
+//// AuthorityInterceptor 权限拦截器
+//func AuthorityInterceptor() gin.HandlerFunc {
+//	return func(c *gin.Context) {
+//		id := GetUserIdByToken(c)
+//		if id == 0 {
+//			c.Abort()
+//		}
+//		path := c.FullPath()
+//		fmt.Println(path)
+//
+//		//dao.CheckAuthorityByUserId(id,)
+//	}
+//}

+ 25 - 25
router/Router.go

@@ -3,18 +3,19 @@ package router
 import (
 	"demo/data/dao"
 	"demo/data/domain"
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"strings"
 	"time"
 )
 
 var PathRouterMap = make(map[string]domain.BackAuthority)
-var PathIRouterMap = make(map[string]gin.IRoutes)
+
+//var PathIRouterMap = make(map[string]gin.IRoutes)
 
 const Prefix = "/api"
 
 func InitRouter(apiGroup *gin.RouterGroup) {
+	apiGroup.Use(Interceptor())
 	//用户,包含用户后台
 	UserRouth(apiGroup)
 	//文章详情页
@@ -35,35 +36,32 @@ func InitRouter(apiGroup *gin.RouterGroup) {
 
 // PushRouter 根据参数,添加到对应的路由组中,并保存路由信息
 func PushRouter(api *gin.RouterGroup, method, path string, handlerFunc gin.HandlerFunc) {
-	var iRouter gin.IRoutes
 	switch method {
 	case "GET":
-		iRouter = api.GET(path, handlerFunc)
+		api.GET(path, handlerFunc)
 		break
 	case "POST":
-		iRouter = api.POST(path, handlerFunc)
+		api.POST(path, handlerFunc)
 		break
 	case "PUT":
-		iRouter = api.PUT(path, handlerFunc)
+		api.PUT(path, handlerFunc)
 		break
 	case "DELETE":
-		iRouter = api.DELETE(path, handlerFunc)
+		api.DELETE(path, handlerFunc)
 		break
 	case "PATCH":
-		iRouter = api.PATCH(path, handlerFunc)
+		api.PATCH(path, handlerFunc)
 		break
 	case "HEAD":
-		iRouter = api.HEAD(path, handlerFunc)
+		api.HEAD(path, handlerFunc)
 		break
 	default:
-		iRouter = api.Any(path, handlerFunc)
+		api.Any(path, handlerFunc)
 	}
 	key := api.BasePath() + path
 	if strings.HasPrefix(key, Prefix) {
 		key = key[len(Prefix):]
 	}
-
-	PathIRouterMap[key] = iRouter
 }
 
 // InitAuthority 初始化,将数据库中的路径,对应到路由中
@@ -94,6 +92,7 @@ func InitAuthority(Router *gin.Engine) {
 				CreateTime:            time.Now()})
 		}
 	}
+
 	//添加接口数据到数据库
 	dao.AddAllListAuthorityAll(insertRouter)
 	for i := range insertRouter {
@@ -101,17 +100,18 @@ func InitAuthority(Router *gin.Engine) {
 	}
 	PathRouterMap = pathMap
 
-	for s := range PathIRouterMap {
-		fmt.Println("拦截器添加路由:", PathRouterMap[s].AuthorityPath, pathMap[s].AuthorityVerification)
-		AddUseInterceptor(PathIRouterMap[s], pathMap[s].AuthorityVerification)
-	}
-}
-func AddUseInterceptor(routes gin.IRoutes, AuthorityVerification string) {
-	split := strings.Split(AuthorityVerification, ",")
-	for i := range split {
-		//根据名称添加不同的拦截器
-		h := Interceptor(split[i])
-		routes.Use(h)
-	}
-	fmt.Println("===================================")
+	//for s := range PathIRouterMap {
+	//	fmt.Println("拦截器添加路由:", PathRouterMap[s].AuthorityPath, pathMap[s].AuthorityVerification)
+	//	AddUseInterceptor(PathIRouterMap[s], pathMap[s].AuthorityVerification)
+	//}
 }
+
+//func AddUseInterceptor(routes gin.IRoutes, AuthorityVerification string) {
+//	split := strings.Split(AuthorityVerification, ",")
+//	for i := range split {
+//		//根据名称添加不同的拦截器
+//		h := Interceptor(split[i])
+//		routes.Use(h)
+//	}
+//	fmt.Println("===================================")
+//}

+ 9 - 2
router/TestRouter.go

@@ -3,16 +3,16 @@ package router
 import (
 	"demo/data/dao/manage"
 	"demo/share"
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/spf13/cast"
 )
 
 func TestRouth(engine *gin.RouterGroup) {
 	user := engine.Group("/test")
-	user.Use(LoginInterceptor())
 	{
-		//user.GET("/order/pay", OrderSubmit)
 		PushRouter(user, "POST", "/order/pay", OrderSubmit)
+		PushRouter(user, "POST", "/test", DataTest)
 	}
 }
 
@@ -26,3 +26,10 @@ func OrderSubmit(c *gin.Context) {
 	}
 	c.JSON(200, CreateResultData(order))
 }
+func DataTest(c *gin.Context) {
+	body := make(map[string]interface{})
+	c.ShouldBindJSON(&body)
+	fmt.Println("router:", body)
+	fmt.Println("router:", c.Request.Body)
+	c.JSON(200, CreateResultData("test"))
+}

Някои файлове не бяха показани, защото твърде много файлове са промени