Administrator 1 年之前
父節點
當前提交
ae2e88e63c
共有 13 個文件被更改,包括 566 次插入1117 次删除
  1. 1 1
      create/CreateFile.go
  2. 3 6
      create/api.ts.tmpl
  3. 50 51
      create/back.vue.tmpl
  4. 17 10
      create/dao.go.tmpl
  5. 0 1
      create/domainQuery.go.tmpl
  6. 4 4
      create/router.go.tmpl
  7. 5 6
      main.go
  8. 242 161
      output/dao/Dao.go
  9. 11 53
      output/domain/Domain.go
  10. 68 452
      output/router/Router.go
  11. 70 346
      output/vue/BaseApi.ts
  12. 3 2
      sqlload/SqlLoad.go
  13. 92 24
      util/BaseTemplateFunc.go

+ 1 - 1
create/CreateFile.go

@@ -63,7 +63,7 @@ func BaseCreateVue(outputPath, tmplUrl string) {
 	tmpl := loadTemplate(tmplUrl)
 
 	for i := range sqlload.CGans {
-		fileName := outputPath + sqlload.CGans[i].Table.Name + ".vue"
+		fileName := outputPath + sqlload.CGans[i].Table.Name + "View.vue"
 		m := make(map[string]interface{})
 		m["gen"] = sqlload.CGans[i]
 

+ 3 - 6
create/api.ts.tmpl

@@ -1,6 +1,5 @@
 import api, {ResponseData} from "../api.ts";
 import {BaseListVo} from "../detail/DetailApi.ts";
-
 {{range .gens}}
 export function GetBase{{.table.name}}ById(id: number | string) {
     return api.GetDataByPath("/back/base/{{.table.routerName}}?id=" + id, {}, true) as Promise<ResponseData<{{.table.name}}>>;
@@ -11,9 +10,7 @@ export function GetBase{{.table.name}}ListBy{{.table.name}}(param: {{.table.name
 }
 
 export function GetBase{{.table.name}}ListByIds(ids: number[] | string[]) {
-    return api.PostDataByPath("/back/base/{{.table.routerName}}/in", {
-        ids: ids
-    }, true) as Promise<ResponseData<{{.table.name}}[]>>;
+    return api.PostDataByPath("/back/base/{{.table.routerName}}/in", {ids: ids}, true) as Promise<ResponseData<{{.table.name}}[]>>;
 }
 
 export function SaveBase{{.table.name}}({{.table.name}}: {{.table.name}}) {
@@ -42,8 +39,8 @@ export class {{.table.name}}{
 		 {{end}}
 	}
 }
-
-{{end}}{{range .gens}}
+{{end}}
+{{range .gens}}
 export class {{.table.name}}Query{
     {{range .tableColumns}}
     {{if eq .queryType "BETWEEN"}}{{smallHump .goField}}Start: {{formatSqlToVueType .columnType}}

+ 50 - 51
create/back.vue.tmpl

@@ -1,5 +1,19 @@
 <template>
   <div class="back-form-container">
+    <div>
+    <el-form ref="dictRef" :model="query" label-width="80px">
+      {{ range .gen.tableColumns }}
+        {{ $value := smallHump .columnName }}
+        {{ if not (eq (ToLower $value) "id") }}
+            {{ $name := .columnComment }}
+            {{ if eq $name "" }}
+              {{ $name = $value }}
+            {{ end }}
+            {{ ElFrom $name $value .vueShowType .dictType }}
+        {{ end }}
+      {{ end }}
+    </el-form>
+    </div>
     <div class="back-table-handler">
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
@@ -11,7 +25,7 @@
           </el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button type="primary" plain size="small" @click="openDialog('save', {{ .Table.GenTable.Name }}.Create())">
+          <el-button type="primary" plain size="small" @click="openDialog('save', {{ .gen.table.name }}.Create())">
             <el-icon>
               <Plus/>
             </el-icon>
@@ -32,18 +46,7 @@
     <div class="back-table">
       <el-table v-loading="listLoading" :data="list" @selection-change="selected" border :key="ListKey">
         <el-table-column type="selection" width="40" align="center"/>
-        {{ range .gen.tableColumns }}
-          {{ $value := smallHump .ColumnName }}
-          {{ $name := .ColumnComment }}
-          {{ if eq $name "" }}
-            {{ $name = $value }}
-          {{ end }}
-          {{ if eq .IsKey "1" }}
-            {{ ElTableColumn $name $value .VueShowType .DictType }}
-          {{ else }}
-            {{ ElTableColumn $name $value .VueShowType .DictType }}
-          {{ end }}
-        {{ end }}
+        {{ range .gen.tableColumns }}{{ $value := smallHump .columnName }}{{ $name := .columnComment }}{{ if eq $name "" }}{{ $name = $value }}{{ end }}{{ if eq .IsKey "1" }}{{ ElTableColumn $name $value .vueShowType .dictType }}{{ else }}{{ ElTableColumn $name $value .vueShowType .dictType }}{{ end }}{{ end }}
         <el-table-column label="操作" align="center" fixed="right">
           <template #default="scope">
             <el-button link type="primary" @click="openDialog('update', scope.row)">修改</el-button>
@@ -63,59 +66,56 @@
             layout="total, sizes, prev, pager, next"
         />
       </div>
-    </div>
 
-    <el-dialog :title="dialogType=='update'?'更改字典类型':'新增字典类型'" v-model="open" width="500px" append-to-body>
-      <el-form ref="dictRef" :model="dialogForm" label-width="80px">
-        {{ range .Columns }}
-          {{ $value := smallHump .ColumnName }}
-          {{ if not (eq (strings.ToLower $value) "id") }}
-            {{ $name := .ColumnComment }}
-            {{ if eq $name "" }}
-              {{ $name = $value }}
-            {{ end }}
-            {{ elDialog $name $value .VueShowType .DictType }}
-          {{ end }}
-        {{ end }}
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm()">确 定</el-button>
-          <el-button @click="open=false">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
+        <!-- 添加或修改参数配置对话框 -->
+        <el-dialog :title="dialogType=='update'?'更改字典类型':'新增字典类型'" v-model="open" width="500px" append-to-body>
+          <el-form ref="dictRef" :model="dialogForm" label-width="80px">
+            {{ range .gen.tableColumns }}{{ $value := smallHump .columnName }}{{ if not (eq (ToLower $value) "id") }}{{ $name := .columnComment }}{{ if eq $name "" }}{{ $name = $value }}{{ end }}{{ ElDialog $name $value .vueShowType .dictType }}{{ end }}{{ end }}
+          </el-form>
+          <template #footer>
+            <div class="dialog-footer">
+              <el-button type="primary" @click="submitForm()">确 定</el-button>
+              <el-button @click="open=false">取 消</el-button>
+            </div>
+          </template>
+        </el-dialog>
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
 import {ref} from "vue";
 import {
-  DeleteBase{{ .Table.GenTable.Name }}ById,
-  {{ .Table.GenTable.Name }},
-  GetBase{{ .Table.GenTable.Name }}ListBy{{ .Table.GenTable.Name }},
-  SaveBase{{ .Table.GenTable.Name }},
-  UpdateBase{{ .Table.GenTable.Name }}
+  DeleteBase{{ .gen.table.name }}ById,
+  GetBase{{ .gen.table.name }}ListBy{{ .gen.table.name }},
+  SaveBase{{ .gen.table.name }},
+  UpdateBase{{ .gen.table.name }},
+  {{.gen.table.name}},
+  {{.gen.table.name}}Query
 } from "../../../api/back/BaseBackApi.ts";
 import {ElMessage} from "element-plus";
 import {Delete, Plus, RefreshLeft} from "@element-plus/icons-vue";
 import router from "../../../router";
 import {store} from "../../../state/TokenState.ts";
+import DictTag from "../../../components/dict/DictTag.vue";
+import MultipleTag from "../../../components/MultipleTag/MultipleTag.vue";
+import ImageUpload from "../../../components/ImageUpload/ImageUpload.vue";
 
 let listLoading = ref(true)
 let total = ref(0)
 let pageNum = ref(1)
 let pageSize = ref(10)
-let list = ref<{{ .Table.GenTable.Name }}[]>([])
+let list = ref<{{ .gen.table.name }}[]>([])
 let ListKey = ref(0)
 //搜索用
-let search = ref<{{ .Table.GenTable.Name }}>({{ .Table.GenTable.Name }}.Create())
+let search = ref<{{ .gen.table.name }}>({{ .gen.table.name }}.Create())
 //修改,添加用
 let open = ref(false)
 let dialogType = ref("")//save添加,update修改
-let dialogForm = ref<{{ .Table.GenTable.Name }}>(null)
-let selectItems = ref<{{ .Table.GenTable.Name }}[]>([])
-const selected = (arr: {{ .Table.GenTable.Name }}[]) => {
+let dialogForm = ref<{{ .gen.table.name }}>(null)
+let query = ref<{{ .gen.table.name }}Query>({{ .gen.table.name }}Query.Create())
+let selectItems = ref<{{ .gen.table.name }}[]>([])
+const selected = (arr: {{ .gen.table.name }}[]) => {
   selectItems.value = arr
 }
 
@@ -125,11 +125,11 @@ const SetPageSized = (val: number) => {
   getList(pageNum.value)
 }
 
-function openDialog(type: string, row: {{ .Table.GenTable.Name }}) {
+function openDialog(type: string, row: {{ .gen.table.name }}) {
   open.value = true
   dialogType.value = type
   if (type==="save"){
-    dialogForm.value = {{ .Table.GenTable.Name }}.Create()
+    dialogForm.value = {{ .gen.table.name }}.Create()
     return
   }
   //深拷贝,不会影响数据
@@ -143,7 +143,7 @@ function deleteByIds() {
 }
 
 function deleteById(id) {
-  DeleteBase{{ .Table.GenTable.Name }}ById(id).then(response => {
+  DeleteBase{{ .gen.table.name }}ById(id).then(response => {
     if (response.code == 200) {
       ElMessage.success("删除成功,id:" + id)
       getList()
@@ -155,7 +155,7 @@ function deleteById(id) {
 
 function getList(pn = 1) {
   pageNum.value = pn
-  GetBase{{ .Table.GenTable.Name }}ListBy{{ .Table.GenTable.Name }}(search.value, pageNum.value, pageSize.value).then(response => {
+  GetBase{{ .gen.table.name }}ListBy{{ .gen.table.name }}(search.value, pageNum.value, pageSize.value).then(response => {
     let data = response.data
     total.value = data.total
     list.value = response.data.list
@@ -167,7 +167,7 @@ function getList(pn = 1) {
 function submitForm() {
   switch (dialogType.value) {
     case "update":
-      UpdateBase{{ .Table.GenTable.Name }}(dialogForm.value, dialogForm.value.id).then(response => {
+      UpdateBase{{ .gen.table.name }}(dialogForm.value, dialogForm.value.id).then(response => {
         if (response.code == 200) {
           open.value = false
           getList()
@@ -178,7 +178,7 @@ function submitForm() {
       })
       break
     case "save":
-      SaveBase{{ .Table.GenTable.Name }}(dialogForm.value).then(response => {
+      SaveBase{{ .gen.table.name }}(dialogForm.value).then(response => {
         if (response.code == 200) {
           open.value = false
           getList()
@@ -193,4 +193,3 @@ function submitForm() {
   }
 }
 </script>
-{{ end }}

+ 17 - 10
create/dao.go.tmpl

@@ -8,7 +8,7 @@ import (
 {{range .gens}}
 func Get{{.table.name}}ById(id int64) (domain.{{.table.name}}, error) {
 	var {{.table.routerName}} domain.{{.table.name}}
-	_, err := configs.Engine.Table("{{.table.routerName}}").Where("id = ?", id).Get(&{{.table.routerName}})
+	_, err := configs.Engine.Table("{{.table.tableName}}").Where("id = ?", id).Get(&{{.table.routerName}})
 	if err != nil {
 		return {{.table.routerName}}, err
 	}
@@ -16,7 +16,7 @@ func Get{{.table.name}}ById(id int64) (domain.{{.table.name}}, error) {
 }
 
 func Get{{.table.name}}ListInId(ids []int64) ([]domain.{{.table.name}}, error) {
-	rows, err := configs.Engine.Table("{{.table.routerName}}").In("id", ids).Rows(&domain.{{.table.name}}{})
+	rows, err := configs.Engine.Table("{{.table.tableName}}").In("id", ids).Rows(&domain.{{.table.name}}{})
 	if err != nil {
 		return make([]domain.{{.table.name}}, 0), err
 	}
@@ -32,7 +32,7 @@ func Get{{.table.name}}ListInId(ids []int64) ([]domain.{{.table.name}}, error) {
 
 func Get{{.table.name}}List({{.table.routerName}} domain.{{.table.name}}, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.{{.table.name}}
-	Count, err := configs.Engine.Table("{{.table.routerName}}").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &{{.table.routerName}})
+	Count, err := configs.Engine.Table("{{.table.tableName}}").Limit(pageSize, (pageNum-1)*pageSize).FindAndCount(&arr, &{{.table.routerName}})
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -51,11 +51,18 @@ func Get{{.table.name}}List({{.table.routerName}} domain.{{.table.name}}, pageNu
 }
 func Get2{{.table.name}}List(query domain.{{.table.name}}Query, pageNum, pageSize int) (vo.BaseListVo, error) {
 	var arr []domain.{{.table.name}}
-	session := configs.Engine.Table("{{.table.routerName}}").Limit(pageSize, (pageNum-1)*pageSize){{range .tableColumns}}{{$defData := "0"}}{{if eq .goType "int"}}{{$defData = "0"}}{{else if eq .goType "int64"}}{{$defData = "0"}}{{else if eq .goType "float64"}}{{$defData = "0"}}{{else if eq .goType "string"}}{{$defData = "\"0\""}}{{else if eq .goType "time.Time"}}{{$defData = "\"0\""}}{{else}}{{$defData = "\"0\""}}{{end}}
+	session := configs.Engine.Table("{{.table.tableName}}").Limit(pageSize, (pageNum-1)*pageSize){{$defData := "0"}}{{range .tableColumns}}{{if eq .goType "int"}}{{$defData = "0"}}{{else if eq .goType "int64"}}{{$defData = "0"}}{{else if eq .goType "float64"}}{{$defData = "0"}}{{else if eq .goType "string"}}{{$defData = "\"0\""}}{{else if eq .goType "time.Time"}}{{$defData = "\"0\""}}{{else}}{{$defData = "\"0\""}}{{end}}
+    {{if eq .queryType "BETWEEN"}}
+    if query.{{.goField}}Start != {{$defData}} || query.{{.goField}}End != {{$defData}}{
+        session.Where("{{.columnName}} between ? and ?", query.{{.goField}}Start, query.{{.goField}}End)
+    }{{else if eq .queryType "LIKE"}}
     if query.{{.goField}} != {{$defData}}{
-    {{if eq .queryType "EQ"}}   session.Where("{{.columnName}} = ?", query.{{.goField}}){{else if eq .queryType "NEQ"}}     session.Where("{{.columnName}} != ?", query.{{.goField}}){{else if eq .queryType "GT"}}      session.Where("{{.columnName}} > ?", query.{{.goField}}){{else if eq .queryType "LT"}}      session.Where("{{.columnName}} < ?", query.{{.goField}}){{else if eq .queryType "GTEQ"}}    session.Where("{{.columnName}} >= ?", query.{{.goField}}){{else if eq .queryType "LTEQ"}}    session.Where("{{.columnName}} <= ?", query.{{.goField}}){{else if eq .queryType "LIKE"}}    session.Where("{{.columnName}} like ?", "%"+query.{{.goField}}+"%"){{else if eq .queryType "BETWEEN"}}session.Where("{{.columnName}} between ? and ?", query.{{.goField}}Start, query.{{.goField}}End){{else}}    session.Where("{{.columnName}} = ?", query.{{.goField}}){{end}}
-    }{{end}}
-	Count, err := session.FindAndCount(&arr, &{{.table.routerName}})
+        session.Where("{{.columnName}} like ?", "%"+query.{{.goField}}+"%")
+    }{{else}}{{$v := ""}}{{if eq .queryType "EQ"}} {{$v = "= ?"}}{{else if eq .queryType "NEQ"}}{{$v = "!= ?"}}{{else if eq .queryType "GT"}}{{$v = "> ?"}}{{else if eq .queryType "LT"}}{{$v = "< ?"}}{{else if eq .queryType "GTEQ"}}{{$v = ">= ?"}}{{else if eq .queryType "LTEQ"}}{{$v = "<= ?"}}{{else}}{{$v = "= ?"}}{{end}}
+    if query.{{.goField}} != {{$defData}}{
+         session.Where("{{.columnName}} != ?", query.{{.goField}})
+    }{{end}}{{end}}
+	Count, err := session.FindAndCount(&arr, &query)
 	var vo vo.BaseListVo
 	if err != nil {
 		return vo, err
@@ -73,7 +80,7 @@ func Get2{{.table.name}}List(query domain.{{.table.name}}Query, pageNum, pageSiz
 	return vo, nil
 }
 func Save{{.table.name}}({{.table.routerName}} *domain.{{.table.name}}) (domain.{{.table.name}}, error) {
-	_, err := configs.Engine.Table("{{.table.routerName}}").Insert(&{{.table.routerName}})
+	_, err := configs.Engine.Table("{{.table.tableName}}").Insert(&{{.table.routerName}})
 	if err != nil {
 		return *{{.table.routerName}}, err
 	}
@@ -82,7 +89,7 @@ func Save{{.table.name}}({{.table.routerName}} *domain.{{.table.name}}) (domain.
 
 func Set{{.table.name}}({{.table.routerName}}Map map[string]interface{}, id int64) (domain.{{.table.name}}, bool, error) {
 	var {{.table.routerName}} domain.{{.table.name}}
-	_, err := configs.Engine.Table("{{.table.routerName}}").Where("id = ?", id).Update({{.table.routerName}}Map)
+	_, err := configs.Engine.Table("{{.table.tableName}}").Where("id = ?", id).Update({{.table.routerName}}Map)
 	if err != nil {
 		return {{.table.routerName}}, false, err
 	}
@@ -91,7 +98,7 @@ func Set{{.table.name}}({{.table.routerName}}Map map[string]interface{}, id int6
 
 func Delete{{.table.name}}(id int64) bool {
 	var {{.table.routerName}} domain.{{.table.name}}
-	i, err := configs.Engine.Table("{{.table.routerName}}").Where("id = ?", id).Delete(&{{.table.routerName}})
+	i, err := configs.Engine.Table("{{.table.tableName}}").Where("id = ?", id).Delete(&{{.table.routerName}})
 	if err != nil {
 		return false
 	}

+ 0 - 1
create/domainQuery.go.tmpl

@@ -2,7 +2,6 @@ package vo
 
 {{range .gens}}
 type {{bigHump .table.tableName}}Query struct {
-
     {{range .tableColumns}}
 	{{queryType .goType .goField .queryType .columnName .columnComment}}{{end}}
 }

+ 4 - 4
create/router.go.tmpl

@@ -63,13 +63,13 @@ func GetBase{{.table.name}}List(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	{{.table.routerName}} := domain.{{.table.name}}{}
+	{{.table.routerName}} := domain.{{.table.name}}Query{}
 	err := mapstructure.Decode(param, &{{.table.routerName}})
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.Get{{.table.name}}List({{.table.routerName}}, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2{{.table.name}}List({{.table.routerName}}, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -95,8 +95,8 @@ func SaveBase{{.table.name}}(c *gin.Context) {
 	{{.table.routerName}}Param, _ := data("{{.table.routerName}}")
 	{{.table.routerName}} := domain.{{.table.name}}{}
 	err := mapstructure.Decode({{.table.routerName}}Param, &{{.table.routerName}})
-	{{if $createBy}}goods{{.table.routerName}}.CreateBy = fmt.Sprint(GetUserIdByToken(c)){{end}}
-	{{if $createTime}}goods{{.table.routerName}}.CreateTime = time.Now(){{end}}
+	{{if $createBy}}{{.table.routerName}}.CreateBy = fmt.Sprint(GetUserIdByToken(c)){{end}}
+	{{if $createTime}}{{.table.routerName}}.CreateTime = time.Now(){{end}}
 	save{{.table.name}}, err := manage.Save{{.table.name}}(&{{.table.routerName}})
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "保存错误"))

+ 5 - 6
main.go

@@ -11,11 +11,10 @@ func init() {
 }
 func main() {
 	sqlload.Load()
-	//create.DomainCreate("./output/domain/Domain.go")
-	//create.RouterCreate("./output/router/Router.go")
-	//create.DaoCreate("./output/dao/Dao.go")
-	//create.ApiTsCreate("./output/vue/BaseApi.ts")
-	//create.QueryCreate("./output/domain/Query.go")
+	create.DomainCreate("./output/domain/Domain.go")
+	create.RouterCreate("./output/router/Router.go")
+	create.DaoCreate("./output/dao/Dao.go")
+	create.ApiTsCreate("./output/vue/BaseApi.ts")
+	create.QueryCreate("./output/domain/Query.go")
 	create.VueCreate("./output/vue/page/")
-
 }

文件差異過大導致無法顯示
+ 242 - 161
output/dao/Dao.go


+ 11 - 53
output/domain/Domain.go

@@ -21,21 +21,23 @@ type Article struct {
 	CreateTime time.Time `xorm:"create_time" json:"createTime"` //注释:创建时间
 	UpdateBy string `xorm:"update_by" json:"updateBy"` //注释:更新人
 	UpdateTime time.Time `xorm:"update_time" json:"updateTime"` //注释:更新时间
-	Id int64 `xorm:"id" json:"id"` //注释:id
+	ArticleDesc string `xorm:"article_desc" json:"articleDesc"` //注释:文章简介
 }
 
 func (receiver Article) String() string {
-	return fmt.Sprint("Article{","Id:",receiver.Id,"ArticleTitle:",receiver.ArticleTitle,"ArticleContent:",receiver.ArticleContent,"State:",receiver.State,"ArticleTagIds:",receiver.ArticleTagIds,"ArticleTopicId:",receiver.ArticleTopicId,"Image:",receiver.Image,"PublishTime:",receiver.PublishTime,"EyeFill:",receiver.EyeFill,"LikeCount:",receiver.LikeCount,"CreateBy:",receiver.CreateBy,"CreateTime:",receiver.CreateTime,"UpdateBy:",receiver.UpdateBy,"UpdateTime:",receiver.UpdateTime,"Id:",receiver.Id,"}")
+	return fmt.Sprint("Article{","Id:",receiver.Id,"ArticleTitle:",receiver.ArticleTitle,"ArticleContent:",receiver.ArticleContent,"State:",receiver.State,"ArticleTagIds:",receiver.ArticleTagIds,"ArticleTopicId:",receiver.ArticleTopicId,"Image:",receiver.Image,"PublishTime:",receiver.PublishTime,"EyeFill:",receiver.EyeFill,"LikeCount:",receiver.LikeCount,"CreateBy:",receiver.CreateBy,"CreateTime:",receiver.CreateTime,"UpdateBy:",receiver.UpdateBy,"UpdateTime:",receiver.UpdateTime,"ArticleDesc:",receiver.ArticleDesc,"}")
 }
 
 type ArticleTag struct { 
 	Id int64 `xorm:"id" json:"id"` //注释:
 	TagName string `xorm:"tag_name" json:"tagName"` //注释:标签名
 	TagDesc string `xorm:"tag_desc" json:"tagDesc"` //注释:标签描述
+	TagTextColor string `xorm:"tag_text_color" json:"tagTextColor"` //注释:标签字体颜色
+	TagBackgroundColor string `xorm:"tag_background_color" json:"tagBackgroundColor"` //注释:标签背景颜色
 }
 
 func (receiver ArticleTag) String() string {
-	return fmt.Sprint("ArticleTag{","Id:",receiver.Id,"TagName:",receiver.TagName,"TagDesc:",receiver.TagDesc,"}")
+	return fmt.Sprint("ArticleTag{","Id:",receiver.Id,"TagName:",receiver.TagName,"TagDesc:",receiver.TagDesc,"TagTextColor:",receiver.TagTextColor,"TagBackgroundColor:",receiver.TagBackgroundColor,"}")
 }
 
 type ArticleTopic struct { 
@@ -124,7 +126,6 @@ type GenTableColumn struct {
 	Id int64 `xorm:"id" json:"id"` //注释:id
 	TableId int64 `xorm:"table_id" json:"tableId"` //注释:表格id
 	Sort int64 `xorm:"sort" json:"sort"` //注释:排序
-	ColumnName string `xorm:"column_name" json:"columnName"` //注释:字段名
 	ColumnComment string `xorm:"column_comment" json:"columnComment"` //注释:字段注释
 	ColumnType string `xorm:"column_type" json:"columnType"` //注释:字段类型
 	GoType string `xorm:"go_type" json:"goType"` //注释:go类型
@@ -135,11 +136,11 @@ type GenTableColumn struct {
 	QueryType string `xorm:"query_type" json:"queryType"` //注释:查询方式
 	VueShowType string `xorm:"vue_show_type" json:"vueShowType"` //注释:前端显示类型
 	DictType string `xorm:"dict_type" json:"dictType"` //注释:字典类型
-	QueryType string `xorm:"query_type" json:"queryType"` //注释:查询方式
+	ColumnName string `xorm:"column_name" json:"columnName"` //注释:字段名
 }
 
 func (receiver GenTableColumn) String() string {
-	return fmt.Sprint("GenTableColumn{","Id:",receiver.Id,"TableId:",receiver.TableId,"Sort:",receiver.Sort,"ColumnName:",receiver.ColumnName,"ColumnComment:",receiver.ColumnComment,"ColumnType:",receiver.ColumnType,"GoType:",receiver.GoType,"GoField:",receiver.GoField,"IsKey:",receiver.IsKey,"IsIncrement:",receiver.IsIncrement,"IsRequired:",receiver.IsRequired,"QueryType:",receiver.QueryType,"VueShowType:",receiver.VueShowType,"DictType:",receiver.DictType,"QueryType:",receiver.QueryType,"}")
+	return fmt.Sprint("GenTableColumn{","Id:",receiver.Id,"TableId:",receiver.TableId,"Sort:",receiver.Sort,"ColumnComment:",receiver.ColumnComment,"ColumnType:",receiver.ColumnType,"GoType:",receiver.GoType,"GoField:",receiver.GoField,"IsKey:",receiver.IsKey,"IsIncrement:",receiver.IsIncrement,"IsRequired:",receiver.IsRequired,"QueryType:",receiver.QueryType,"VueShowType:",receiver.VueShowType,"DictType:",receiver.DictType,"ColumnName:",receiver.ColumnName,"}")
 }
 
 type Goods struct { 
@@ -225,10 +226,11 @@ type GoodsOrder struct {
 	State string `xorm:"state" json:"state"` //注释:支付状态,0待支付,1待发货,2已发货,3订单完成,4订单异常
 	CreateBy int64 `xorm:"create_by" json:"createBy"` //注释:用户id
 	CreateTime time.Time `xorm:"create_time" json:"createTime"` //注释:订单创建时间
+	OtherData string `xorm:"other_data" json:"otherData"` //注释:其他数据
 }
 
 func (receiver GoodsOrder) String() string {
-	return fmt.Sprint("GoodsOrder{","Id:",receiver.Id,"OrderName:",receiver.OrderName,"SkuId:",receiver.SkuId,"Count:",receiver.Count,"Price:",receiver.Price,"TotalPrice:",receiver.TotalPrice,"ContactInformation:",receiver.ContactInformation,"CouponUserId:",receiver.CouponUserId,"State:",receiver.State,"CreateBy:",receiver.CreateBy,"CreateTime:",receiver.CreateTime,"}")
+	return fmt.Sprint("GoodsOrder{","Id:",receiver.Id,"OrderName:",receiver.OrderName,"SkuId:",receiver.SkuId,"Count:",receiver.Count,"Price:",receiver.Price,"TotalPrice:",receiver.TotalPrice,"ContactInformation:",receiver.ContactInformation,"CouponUserId:",receiver.CouponUserId,"State:",receiver.State,"CreateBy:",receiver.CreateBy,"CreateTime:",receiver.CreateTime,"OtherData:",receiver.OtherData,"}")
 }
 
 type GoodsSku struct { 
@@ -301,10 +303,11 @@ type User struct {
 	Name string `xorm:"name" json:"name"` //注释:用户名
 	Avatar string `xorm:"avatar" json:"avatar"` //注释:头像
 	RecommendCode string `xorm:"recommend_code" json:"recommendCode"` //注释:推荐码
+	InviterBy int64 `xorm:"inviter_by" json:"inviterBy"` //注释:邀请人
 }
 
 func (receiver User) String() string {
-	return fmt.Sprint("User{","Id:",receiver.Id,"Username:",receiver.Username,"Password:",receiver.Password,"CreationTime:",receiver.CreationTime,"LoginTime:",receiver.LoginTime,"Status:",receiver.Status,"RoleId:",receiver.RoleId,"Phone:",receiver.Phone,"Email:",receiver.Email,"Name:",receiver.Name,"Avatar:",receiver.Avatar,"RecommendCode:",receiver.RecommendCode,"}")
+	return fmt.Sprint("User{","Id:",receiver.Id,"Username:",receiver.Username,"Password:",receiver.Password,"CreationTime:",receiver.CreationTime,"LoginTime:",receiver.LoginTime,"Status:",receiver.Status,"RoleId:",receiver.RoleId,"Phone:",receiver.Phone,"Email:",receiver.Email,"Name:",receiver.Name,"Avatar:",receiver.Avatar,"RecommendCode:",receiver.RecommendCode,"InviterBy:",receiver.InviterBy,"}")
 }
 
 type UserWallet struct { 
@@ -319,16 +322,6 @@ func (receiver UserWallet) String() string {
 	return fmt.Sprint("UserWallet{","Id:",receiver.Id,"UserId:",receiver.UserId,"Balance:",receiver.Balance,"PromotionAmount:",receiver.PromotionAmount,"RechargeAmount:",receiver.RechargeAmount,"}")
 }
 
-type Authority struct { 
-	Id int64 `xorm:"id" json:"id"` //注释:
-	AuthorityName string `xorm:"authority_name" json:"authorityName"` //注释:
-	AuthorityPath string `xorm:"authority_path" json:"authorityPath"` //注释:
-}
-
-func (receiver Authority) String() string {
-	return fmt.Sprint("Authority{","Id:",receiver.Id,"AuthorityName:",receiver.AuthorityName,"AuthorityPath:",receiver.AuthorityPath,"}")
-}
-
 type DictData struct { 
 	Id int64 `xorm:"id" json:"id"` //注释:字典编码
 	Sort int64 `xorm:"sort" json:"sort"` //注释:排序
@@ -375,24 +368,6 @@ 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,"}")
 }
 
-type ShopAdviceCarousel struct { 
-	Id int64 `xorm:"id" json:"id"` //注释:
-	Name string `xorm:"name" json:"name"` //注释:广告名称
-	ToId int64 `xorm:"to_id" json:"toId"` //注释:目标id
-	AdviceType string `xorm:"advice_type" json:"adviceType"` //注释:广告类型
-	Sort string `xorm:"sort" json:"sort"` //注释:排序
-	State string `xorm:"state" json:"state"` //注释:状态
-	ShowType string `xorm:"show_type" json:"showType"` //注释:显示类型
-	CreateBy string `xorm:"create_by" json:"createBy"` //注释:创建人
-	CreateTime time.Time `xorm:"create_time" json:"createTime"` //注释:创建时间
-	UpdateBy string `xorm:"update_by" json:"updateBy"` //注释:更新人
-	UpdateTime time.Time `xorm:"update_time" json:"updateTime"` //注释:更新时间
-}
-
-func (receiver ShopAdviceCarousel) String() string {
-	return fmt.Sprint("ShopAdviceCarousel{","Id:",receiver.Id,"Name:",receiver.Name,"ToId:",receiver.ToId,"AdviceType:",receiver.AdviceType,"Sort:",receiver.Sort,"State:",receiver.State,"ShowType:",receiver.ShowType,"CreateBy:",receiver.CreateBy,"CreateTime:",receiver.CreateTime,"UpdateBy:",receiver.UpdateBy,"UpdateTime:",receiver.UpdateTime,"}")
-}
-
 type ShopTopic struct { 
 	Id int64 `xorm:"id" json:"id"` //注释:
 	Sort string `xorm:"sort" json:"sort"` //注释:
@@ -407,16 +382,6 @@ func (receiver ShopTopic) String() string {
 	return fmt.Sprint("ShopTopic{","Id:",receiver.Id,"Sort:",receiver.Sort,"ParentId:",receiver.ParentId,"TopicPageImage:",receiver.TopicPageImage,"TopicName:",receiver.TopicName,"TopicDesc:",receiver.TopicDesc,"TypeIds:",receiver.TypeIds,"}")
 }
 
-type ShopTopicSku struct { 
-	Id int64 `xorm:"id" json:"id"` //注释: 
-	TopicId int64 `xorm:"topic_id" json:"topicId"` //注释:
-	SkuId int64 `xorm:"sku_id" json:"skuId"` //注释:
-}
-
-func (receiver ShopTopicSku) String() string {
-	return fmt.Sprint("ShopTopicSku{","Id:",receiver.Id,"TopicId:",receiver.TopicId,"SkuId:",receiver.SkuId,"}")
-}
-
 type ShopAdviceCarousel struct { 
 	Id int64 `xorm:"id" json:"id"` //注释:
 	Name string `xorm:"name" json:"name"` //注释:广告名称
@@ -446,10 +411,3 @@ type ShopTopicSku struct {
 func (receiver ShopTopicSku) String() string {
 	return fmt.Sprint("ShopTopicSku{","Id:",receiver.Id,"TopicId:",receiver.TopicId,"SkuId:",receiver.SkuId,"}")
 }
-
-type Authority struct { 
-}
-
-func (receiver Authority) String() string {
-	return fmt.Sprint("Authority{","}")
-}

+ 68 - 452
output/router/Router.go

@@ -253,16 +253,6 @@ func BaseUserWalletRouter(group *gin.RouterGroup) {
 	PushRouter(BaseArticleGroup, "DELETE", "/userWallet", DeleteBaseUserWallet)
 }
 
-func BaseAuthorityRouter(group *gin.RouterGroup) {
-	BaseArticleGroup := group.Group("/back/base")
-	PushRouter(BaseArticleGroup, "GET", "/authority", GetBaseAuthorityById)
-	PushRouter(BaseArticleGroup, "POST", "/authority/list", GetBaseAuthorityList)
-	PushRouter(BaseArticleGroup, "POST", "/authority/in", GetBaseAuthorityListInId)
-	PushRouter(BaseArticleGroup, "POST", "/authority", SaveBaseAuthority)
-	PushRouter(BaseArticleGroup, "PUT", "/authority", UpdateBaseAuthority)
-	PushRouter(BaseArticleGroup, "DELETE", "/authority", DeleteBaseAuthority)
-}
-
 func BaseDictDataRouter(group *gin.RouterGroup) {
 	BaseArticleGroup := group.Group("/back/base")
 	PushRouter(BaseArticleGroup, "GET", "/dictData", GetBaseDictDataById)
@@ -293,16 +283,6 @@ func BaseManageUserRouter(group *gin.RouterGroup) {
 	PushRouter(BaseArticleGroup, "DELETE", "/manageUser", DeleteBaseManageUser)
 }
 
-func BaseShopAdviceCarouselRouter(group *gin.RouterGroup) {
-	BaseArticleGroup := group.Group("/back/base")
-	PushRouter(BaseArticleGroup, "GET", "/shopAdviceCarousel", GetBaseShopAdviceCarouselById)
-	PushRouter(BaseArticleGroup, "POST", "/shopAdviceCarousel/list", GetBaseShopAdviceCarouselList)
-	PushRouter(BaseArticleGroup, "POST", "/shopAdviceCarousel/in", GetBaseShopAdviceCarouselListInId)
-	PushRouter(BaseArticleGroup, "POST", "/shopAdviceCarousel", SaveBaseShopAdviceCarousel)
-	PushRouter(BaseArticleGroup, "PUT", "/shopAdviceCarousel", UpdateBaseShopAdviceCarousel)
-	PushRouter(BaseArticleGroup, "DELETE", "/shopAdviceCarousel", DeleteBaseShopAdviceCarousel)
-}
-
 func BaseShopTopicRouter(group *gin.RouterGroup) {
 	BaseArticleGroup := group.Group("/back/base")
 	PushRouter(BaseArticleGroup, "GET", "/shopTopic", GetBaseShopTopicById)
@@ -313,16 +293,6 @@ func BaseShopTopicRouter(group *gin.RouterGroup) {
 	PushRouter(BaseArticleGroup, "DELETE", "/shopTopic", DeleteBaseShopTopic)
 }
 
-func BaseShopTopicSkuRouter(group *gin.RouterGroup) {
-	BaseArticleGroup := group.Group("/back/base")
-	PushRouter(BaseArticleGroup, "GET", "/shopTopicSku", GetBaseShopTopicSkuById)
-	PushRouter(BaseArticleGroup, "POST", "/shopTopicSku/list", GetBaseShopTopicSkuList)
-	PushRouter(BaseArticleGroup, "POST", "/shopTopicSku/in", GetBaseShopTopicSkuListInId)
-	PushRouter(BaseArticleGroup, "POST", "/shopTopicSku", SaveBaseShopTopicSku)
-	PushRouter(BaseArticleGroup, "PUT", "/shopTopicSku", UpdateBaseShopTopicSku)
-	PushRouter(BaseArticleGroup, "DELETE", "/shopTopicSku", DeleteBaseShopTopicSku)
-}
-
 func BaseShopAdviceCarouselRouter(group *gin.RouterGroup) {
 	BaseArticleGroup := group.Group("/back/base")
 	PushRouter(BaseArticleGroup, "GET", "/shopAdviceCarousel", GetBaseShopAdviceCarouselById)
@@ -343,16 +313,6 @@ func BaseShopTopicSkuRouter(group *gin.RouterGroup) {
 	PushRouter(BaseArticleGroup, "DELETE", "/shopTopicSku", DeleteBaseShopTopicSku)
 }
 
-func BaseAuthorityRouter(group *gin.RouterGroup) {
-	BaseArticleGroup := group.Group("/back/base")
-	PushRouter(BaseArticleGroup, "GET", "/authority", GetBaseAuthorityById)
-	PushRouter(BaseArticleGroup, "POST", "/authority/list", GetBaseAuthorityList)
-	PushRouter(BaseArticleGroup, "POST", "/authority/in", GetBaseAuthorityListInId)
-	PushRouter(BaseArticleGroup, "POST", "/authority", SaveBaseAuthority)
-	PushRouter(BaseArticleGroup, "PUT", "/authority", UpdateBaseAuthority)
-	PushRouter(BaseArticleGroup, "DELETE", "/authority", DeleteBaseAuthority)
-}
-
 
 
  
@@ -373,13 +333,13 @@ func GetBaseArticleList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	article := domain.Article{}
+	article := domain.ArticleQuery{}
 	err := mapstructure.Decode(param, &article)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetArticleList(article, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2ArticleList(article, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -405,8 +365,8 @@ func SaveBaseArticle(c *gin.Context) {
 	articleParam, _ := data("article")
 	article := domain.Article{}
 	err := mapstructure.Decode(articleParam, &article)
-	goodsarticle.CreateBy = fmt.Sprint(GetUserIdByToken(c))
-	goodsarticle.CreateTime = time.Now()
+	article.CreateBy = fmt.Sprint(GetUserIdByToken(c))
+	article.CreateTime = time.Now()
 	saveArticle, err := manage.SaveArticle(&article)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "保存错误"))
@@ -459,13 +419,13 @@ func GetBaseArticleTagList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	articleTag := domain.ArticleTag{}
+	articleTag := domain.ArticleTagQuery{}
 	err := mapstructure.Decode(param, &articleTag)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetArticleTagList(articleTag, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2ArticleTagList(articleTag, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -545,13 +505,13 @@ func GetBaseArticleTopicList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	articleTopic := domain.ArticleTopic{}
+	articleTopic := domain.ArticleTopicQuery{}
 	err := mapstructure.Decode(param, &articleTopic)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetArticleTopicList(articleTopic, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2ArticleTopicList(articleTopic, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -631,13 +591,13 @@ func GetBaseBackAuthorityList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	backAuthority := domain.BackAuthority{}
+	backAuthority := domain.BackAuthorityQuery{}
 	err := mapstructure.Decode(param, &backAuthority)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetBackAuthorityList(backAuthority, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2BackAuthorityList(backAuthority, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -664,7 +624,7 @@ func SaveBaseBackAuthority(c *gin.Context) {
 	backAuthority := domain.BackAuthority{}
 	err := mapstructure.Decode(backAuthorityParam, &backAuthority)
 	
-	goodsbackAuthority.CreateTime = time.Now()
+	backAuthority.CreateTime = time.Now()
 	saveBackAuthority, err := manage.SaveBackAuthority(&backAuthority)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "保存错误"))
@@ -717,13 +677,13 @@ func GetBaseBackMenuList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	backMenu := domain.BackMenu{}
+	backMenu := domain.BackMenuQuery{}
 	err := mapstructure.Decode(param, &backMenu)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetBackMenuList(backMenu, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2BackMenuList(backMenu, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -803,13 +763,13 @@ func GetBaseBackRoleList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	backRole := domain.BackRole{}
+	backRole := domain.BackRoleQuery{}
 	err := mapstructure.Decode(param, &backRole)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetBackRoleList(backRole, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2BackRoleList(backRole, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -889,13 +849,13 @@ func GetBaseBackRoleAuthorityList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	backRoleAuthority := domain.BackRoleAuthority{}
+	backRoleAuthority := domain.BackRoleAuthorityQuery{}
 	err := mapstructure.Decode(param, &backRoleAuthority)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetBackRoleAuthorityList(backRoleAuthority, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2BackRoleAuthorityList(backRoleAuthority, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -975,13 +935,13 @@ func GetBaseBackRoleMenuList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	backRoleMenu := domain.BackRoleMenu{}
+	backRoleMenu := domain.BackRoleMenuQuery{}
 	err := mapstructure.Decode(param, &backRoleMenu)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetBackRoleMenuList(backRoleMenu, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2BackRoleMenuList(backRoleMenu, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -1061,13 +1021,13 @@ func GetBaseGenTableList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	genTable := domain.GenTable{}
+	genTable := domain.GenTableQuery{}
 	err := mapstructure.Decode(param, &genTable)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetGenTableList(genTable, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2GenTableList(genTable, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -1147,13 +1107,13 @@ func GetBaseGenTableColumnList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	genTableColumn := domain.GenTableColumn{}
+	genTableColumn := domain.GenTableColumnQuery{}
 	err := mapstructure.Decode(param, &genTableColumn)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetGenTableColumnList(genTableColumn, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2GenTableColumnList(genTableColumn, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -1233,13 +1193,13 @@ func GetBaseGoodsList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	goods := domain.Goods{}
+	goods := domain.GoodsQuery{}
 	err := mapstructure.Decode(param, &goods)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetGoodsList(goods, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2GoodsList(goods, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -1319,13 +1279,13 @@ func GetBaseGoodsCommodityAreaList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	goodsCommodityArea := domain.GoodsCommodityArea{}
+	goodsCommodityArea := domain.GoodsCommodityAreaQuery{}
 	err := mapstructure.Decode(param, &goodsCommodityArea)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetGoodsCommodityAreaList(goodsCommodityArea, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2GoodsCommodityAreaList(goodsCommodityArea, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -1405,13 +1365,13 @@ func GetBaseGoodsCouponList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	goodsCoupon := domain.GoodsCoupon{}
+	goodsCoupon := domain.GoodsCouponQuery{}
 	err := mapstructure.Decode(param, &goodsCoupon)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetGoodsCouponList(goodsCoupon, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2GoodsCouponList(goodsCoupon, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -1491,13 +1451,13 @@ func GetBaseGoodsCouponUserList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	goodsCouponUser := domain.GoodsCouponUser{}
+	goodsCouponUser := domain.GoodsCouponUserQuery{}
 	err := mapstructure.Decode(param, &goodsCouponUser)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetGoodsCouponUserList(goodsCouponUser, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2GoodsCouponUserList(goodsCouponUser, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -1577,13 +1537,13 @@ func GetBaseGoodsIntroductionList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	goodsIntroduction := domain.GoodsIntroduction{}
+	goodsIntroduction := domain.GoodsIntroductionQuery{}
 	err := mapstructure.Decode(param, &goodsIntroduction)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetGoodsIntroductionList(goodsIntroduction, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2GoodsIntroductionList(goodsIntroduction, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -1609,8 +1569,8 @@ func SaveBaseGoodsIntroduction(c *gin.Context) {
 	goodsIntroductionParam, _ := data("goodsIntroduction")
 	goodsIntroduction := domain.GoodsIntroduction{}
 	err := mapstructure.Decode(goodsIntroductionParam, &goodsIntroduction)
-	goodsgoodsIntroduction.CreateBy = fmt.Sprint(GetUserIdByToken(c))
-	goodsgoodsIntroduction.CreateTime = time.Now()
+	goodsIntroduction.CreateBy = fmt.Sprint(GetUserIdByToken(c))
+	goodsIntroduction.CreateTime = time.Now()
 	saveGoodsIntroduction, err := manage.SaveGoodsIntroduction(&goodsIntroduction)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "保存错误"))
@@ -1663,13 +1623,13 @@ func GetBaseGoodsOrderList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	goodsOrder := domain.GoodsOrder{}
+	goodsOrder := domain.GoodsOrderQuery{}
 	err := mapstructure.Decode(param, &goodsOrder)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetGoodsOrderList(goodsOrder, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2GoodsOrderList(goodsOrder, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -1695,8 +1655,8 @@ func SaveBaseGoodsOrder(c *gin.Context) {
 	goodsOrderParam, _ := data("goodsOrder")
 	goodsOrder := domain.GoodsOrder{}
 	err := mapstructure.Decode(goodsOrderParam, &goodsOrder)
-	goodsgoodsOrder.CreateBy = fmt.Sprint(GetUserIdByToken(c))
-	goodsgoodsOrder.CreateTime = time.Now()
+	goodsOrder.CreateBy = fmt.Sprint(GetUserIdByToken(c))
+	goodsOrder.CreateTime = time.Now()
 	saveGoodsOrder, err := manage.SaveGoodsOrder(&goodsOrder)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "保存错误"))
@@ -1749,13 +1709,13 @@ func GetBaseGoodsSkuList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	goodsSku := domain.GoodsSku{}
+	goodsSku := domain.GoodsSkuQuery{}
 	err := mapstructure.Decode(param, &goodsSku)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetGoodsSkuList(goodsSku, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2GoodsSkuList(goodsSku, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -1781,8 +1741,8 @@ func SaveBaseGoodsSku(c *gin.Context) {
 	goodsSkuParam, _ := data("goodsSku")
 	goodsSku := domain.GoodsSku{}
 	err := mapstructure.Decode(goodsSkuParam, &goodsSku)
-	goodsgoodsSku.CreateBy = fmt.Sprint(GetUserIdByToken(c))
-	goodsgoodsSku.CreateTime = time.Now()
+	goodsSku.CreateBy = fmt.Sprint(GetUserIdByToken(c))
+	goodsSku.CreateTime = time.Now()
 	saveGoodsSku, err := manage.SaveGoodsSku(&goodsSku)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "保存错误"))
@@ -1835,13 +1795,13 @@ func GetBaseGoodsSkuCardList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	goodsSkuCard := domain.GoodsSkuCard{}
+	goodsSkuCard := domain.GoodsSkuCardQuery{}
 	err := mapstructure.Decode(param, &goodsSkuCard)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetGoodsSkuCardList(goodsSkuCard, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2GoodsSkuCardList(goodsSkuCard, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -1921,13 +1881,13 @@ func GetBaseGoodsTagList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	goodsTag := domain.GoodsTag{}
+	goodsTag := domain.GoodsTagQuery{}
 	err := mapstructure.Decode(param, &goodsTag)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetGoodsTagList(goodsTag, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2GoodsTagList(goodsTag, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -2007,13 +1967,13 @@ func GetBaseGoodsTypeList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	goodsType := domain.GoodsType{}
+	goodsType := domain.GoodsTypeQuery{}
 	err := mapstructure.Decode(param, &goodsType)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetGoodsTypeList(goodsType, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2GoodsTypeList(goodsType, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -2040,7 +2000,7 @@ func SaveBaseGoodsType(c *gin.Context) {
 	goodsType := domain.GoodsType{}
 	err := mapstructure.Decode(goodsTypeParam, &goodsType)
 	
-	goodsgoodsType.CreateTime = time.Now()
+	goodsType.CreateTime = time.Now()
 	saveGoodsType, err := manage.SaveGoodsType(&goodsType)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "保存错误"))
@@ -2093,13 +2053,13 @@ func GetBaseUserList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	user := domain.User{}
+	user := domain.UserQuery{}
 	err := mapstructure.Decode(param, &user)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetUserList(user, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2UserList(user, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -2179,13 +2139,13 @@ func GetBaseUserWalletList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	userWallet := domain.UserWallet{}
+	userWallet := domain.UserWalletQuery{}
 	err := mapstructure.Decode(param, &userWallet)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetUserWalletList(userWallet, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2UserWalletList(userWallet, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -2248,92 +2208,6 @@ func DeleteBaseUserWallet(c *gin.Context) {
 	c.JSON(200, CreateResult())
 }
  
-//================Authority ==============================
-func GetBaseAuthorityById(c *gin.Context) {
-	id := c.Query("id")
-	authority, err := manage.GetAuthorityById(cast.ToInt64(id))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "用户查询不存在"))
-		return
-	}
-	c.JSON(200, CreateResultData(authority))
-	return
-}
-
-func GetBaseAuthorityList(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	param, _ := data("param")
-	pageNum, _ := data("pageNum")
-	pageSize, _ := data("pageSize")
-	authority := domain.Authority{}
-	err := mapstructure.Decode(param, &authority)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "json转换错误"))
-		return
-	}
-	list, err := manage.GetAuthorityList(authority, cast.ToInt(pageNum), cast.ToInt(pageSize))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func GetBaseAuthorityListInId(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	idsString, _ := data("ids")
-	var ids []int64
-	err := mapstructure.Decode([]byte(cast.ToString(idsString)), &ids)
-	list, err := manage.GetAuthorityListInId(ids)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func SaveBaseAuthority(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	authorityParam, _ := data("authority")
-	authority := domain.Authority{}
-	err := mapstructure.Decode(authorityParam, &authority)
-	
-	
-	saveAuthority, err := manage.SaveAuthority(&authority)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "保存错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(saveAuthority))
-}
-
-func UpdateBaseAuthority(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	authority, _ := data("authority")
-	id, _ := data("id")
-	toMap := UtilStructToMap(cast.ToStringMap(authority))
-	
-    
-    
-    
-	setAuthority, b, err := manage.SetAuthority(toMap, cast.ToInt64(id))
-	if err != nil || !b {
-		c.JSON(200, CreateResultError(500, "修改错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(setAuthority))
-}
-
-func DeleteBaseAuthority(c *gin.Context) {
-	id := c.Query("id")
-	res := manage.DeleteAuthority(cast.ToInt64(id))
-	if !res {
-		c.JSON(200, CreateResultError(500, "删除错误"))
-		return
-	}
-	c.JSON(200, CreateResult())
-}
- 
 //================DictData 字典数据==============================
 func GetBaseDictDataById(c *gin.Context) {
 	id := c.Query("id")
@@ -2351,13 +2225,13 @@ func GetBaseDictDataList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	dictData := domain.DictData{}
+	dictData := domain.DictDataQuery{}
 	err := mapstructure.Decode(param, &dictData)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetDictDataList(dictData, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2DictDataList(dictData, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -2437,13 +2311,13 @@ func GetBaseDictTypeList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	dictType := domain.DictType{}
+	dictType := domain.DictTypeQuery{}
 	err := mapstructure.Decode(param, &dictType)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetDictTypeList(dictType, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2DictTypeList(dictType, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -2523,13 +2397,13 @@ func GetBaseManageUserList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	manageUser := domain.ManageUser{}
+	manageUser := domain.ManageUserQuery{}
 	err := mapstructure.Decode(param, &manageUser)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetManageUserList(manageUser, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2ManageUserList(manageUser, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -2592,92 +2466,6 @@ func DeleteBaseManageUser(c *gin.Context) {
 	c.JSON(200, CreateResult())
 }
  
-//================ShopAdviceCarousel ==============================
-func GetBaseShopAdviceCarouselById(c *gin.Context) {
-	id := c.Query("id")
-	shopAdviceCarousel, err := manage.GetShopAdviceCarouselById(cast.ToInt64(id))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "用户查询不存在"))
-		return
-	}
-	c.JSON(200, CreateResultData(shopAdviceCarousel))
-	return
-}
-
-func GetBaseShopAdviceCarouselList(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	param, _ := data("param")
-	pageNum, _ := data("pageNum")
-	pageSize, _ := data("pageSize")
-	shopAdviceCarousel := domain.ShopAdviceCarousel{}
-	err := mapstructure.Decode(param, &shopAdviceCarousel)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "json转换错误"))
-		return
-	}
-	list, err := manage.GetShopAdviceCarouselList(shopAdviceCarousel, cast.ToInt(pageNum), cast.ToInt(pageSize))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func GetBaseShopAdviceCarouselListInId(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	idsString, _ := data("ids")
-	var ids []int64
-	err := mapstructure.Decode([]byte(cast.ToString(idsString)), &ids)
-	list, err := manage.GetShopAdviceCarouselListInId(ids)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func SaveBaseShopAdviceCarousel(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	shopAdviceCarouselParam, _ := data("shopAdviceCarousel")
-	shopAdviceCarousel := domain.ShopAdviceCarousel{}
-	err := mapstructure.Decode(shopAdviceCarouselParam, &shopAdviceCarousel)
-	goodsshopAdviceCarousel.CreateBy = fmt.Sprint(GetUserIdByToken(c))
-	goodsshopAdviceCarousel.CreateTime = time.Now()
-	saveShopAdviceCarousel, err := manage.SaveShopAdviceCarousel(&shopAdviceCarousel)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "保存错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(saveShopAdviceCarousel))
-}
-
-func UpdateBaseShopAdviceCarousel(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	shopAdviceCarousel, _ := data("shopAdviceCarousel")
-	id, _ := data("id")
-	toMap := UtilStructToMap(cast.ToStringMap(shopAdviceCarousel))
-	toMap["create_by"] = nil
-    toMap["create_time"] = nil
-    toMap["update_by"] = fmt.Sprint(GetUserIdByToken(c))
-    toMap["update_time"] = DateToString(time.Now())
-	setShopAdviceCarousel, b, err := manage.SetShopAdviceCarousel(toMap, cast.ToInt64(id))
-	if err != nil || !b {
-		c.JSON(200, CreateResultError(500, "修改错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(setShopAdviceCarousel))
-}
-
-func DeleteBaseShopAdviceCarousel(c *gin.Context) {
-	id := c.Query("id")
-	res := manage.DeleteShopAdviceCarousel(cast.ToInt64(id))
-	if !res {
-		c.JSON(200, CreateResultError(500, "删除错误"))
-		return
-	}
-	c.JSON(200, CreateResult())
-}
- 
 //================ShopTopic 商品主题==============================
 func GetBaseShopTopicById(c *gin.Context) {
 	id := c.Query("id")
@@ -2695,13 +2483,13 @@ func GetBaseShopTopicList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	shopTopic := domain.ShopTopic{}
+	shopTopic := domain.ShopTopicQuery{}
 	err := mapstructure.Decode(param, &shopTopic)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetShopTopicList(shopTopic, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2ShopTopicList(shopTopic, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -2764,92 +2552,6 @@ func DeleteBaseShopTopic(c *gin.Context) {
 	c.JSON(200, CreateResult())
 }
  
-//================ShopTopicSku ==============================
-func GetBaseShopTopicSkuById(c *gin.Context) {
-	id := c.Query("id")
-	shopTopicSku, err := manage.GetShopTopicSkuById(cast.ToInt64(id))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "用户查询不存在"))
-		return
-	}
-	c.JSON(200, CreateResultData(shopTopicSku))
-	return
-}
-
-func GetBaseShopTopicSkuList(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	param, _ := data("param")
-	pageNum, _ := data("pageNum")
-	pageSize, _ := data("pageSize")
-	shopTopicSku := domain.ShopTopicSku{}
-	err := mapstructure.Decode(param, &shopTopicSku)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "json转换错误"))
-		return
-	}
-	list, err := manage.GetShopTopicSkuList(shopTopicSku, cast.ToInt(pageNum), cast.ToInt(pageSize))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func GetBaseShopTopicSkuListInId(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	idsString, _ := data("ids")
-	var ids []int64
-	err := mapstructure.Decode([]byte(cast.ToString(idsString)), &ids)
-	list, err := manage.GetShopTopicSkuListInId(ids)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func SaveBaseShopTopicSku(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	shopTopicSkuParam, _ := data("shopTopicSku")
-	shopTopicSku := domain.ShopTopicSku{}
-	err := mapstructure.Decode(shopTopicSkuParam, &shopTopicSku)
-	
-	
-	saveShopTopicSku, err := manage.SaveShopTopicSku(&shopTopicSku)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "保存错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(saveShopTopicSku))
-}
-
-func UpdateBaseShopTopicSku(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	shopTopicSku, _ := data("shopTopicSku")
-	id, _ := data("id")
-	toMap := UtilStructToMap(cast.ToStringMap(shopTopicSku))
-	
-    
-    
-    
-	setShopTopicSku, b, err := manage.SetShopTopicSku(toMap, cast.ToInt64(id))
-	if err != nil || !b {
-		c.JSON(200, CreateResultError(500, "修改错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(setShopTopicSku))
-}
-
-func DeleteBaseShopTopicSku(c *gin.Context) {
-	id := c.Query("id")
-	res := manage.DeleteShopTopicSku(cast.ToInt64(id))
-	if !res {
-		c.JSON(200, CreateResultError(500, "删除错误"))
-		return
-	}
-	c.JSON(200, CreateResult())
-}
- 
 //================ShopAdviceCarousel 商城广告==============================
 func GetBaseShopAdviceCarouselById(c *gin.Context) {
 	id := c.Query("id")
@@ -2867,13 +2569,13 @@ func GetBaseShopAdviceCarouselList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	shopAdviceCarousel := domain.ShopAdviceCarousel{}
+	shopAdviceCarousel := domain.ShopAdviceCarouselQuery{}
 	err := mapstructure.Decode(param, &shopAdviceCarousel)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetShopAdviceCarouselList(shopAdviceCarousel, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2ShopAdviceCarouselList(shopAdviceCarousel, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -2899,8 +2601,8 @@ func SaveBaseShopAdviceCarousel(c *gin.Context) {
 	shopAdviceCarouselParam, _ := data("shopAdviceCarousel")
 	shopAdviceCarousel := domain.ShopAdviceCarousel{}
 	err := mapstructure.Decode(shopAdviceCarouselParam, &shopAdviceCarousel)
-	goodsshopAdviceCarousel.CreateBy = fmt.Sprint(GetUserIdByToken(c))
-	goodsshopAdviceCarousel.CreateTime = time.Now()
+	shopAdviceCarousel.CreateBy = fmt.Sprint(GetUserIdByToken(c))
+	shopAdviceCarousel.CreateTime = time.Now()
 	saveShopAdviceCarousel, err := manage.SaveShopAdviceCarousel(&shopAdviceCarousel)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "保存错误"))
@@ -2953,13 +2655,13 @@ func GetBaseShopTopicSkuList(c *gin.Context) {
 	param, _ := data("param")
 	pageNum, _ := data("pageNum")
 	pageSize, _ := data("pageSize")
-	shopTopicSku := domain.ShopTopicSku{}
+	shopTopicSku := domain.ShopTopicSkuQuery{}
 	err := mapstructure.Decode(param, &shopTopicSku)
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "json转换错误"))
 		return
 	}
-	list, err := manage.GetShopTopicSkuList(shopTopicSku, cast.ToInt(pageNum), cast.ToInt(pageSize))
+	list, err := manage.Get2ShopTopicSkuList(shopTopicSku, cast.ToInt(pageNum), cast.ToInt(pageSize))
 	if err != nil {
 		c.JSON(200, CreateResultError(500, "查询错误"))
 		return
@@ -3021,89 +2723,3 @@ func DeleteBaseShopTopicSku(c *gin.Context) {
 	}
 	c.JSON(200, CreateResult())
 }
- 
-//================Authority ==============================
-func GetBaseAuthorityById(c *gin.Context) {
-	id := c.Query("id")
-	authority, err := manage.GetAuthorityById(cast.ToInt64(id))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "用户查询不存在"))
-		return
-	}
-	c.JSON(200, CreateResultData(authority))
-	return
-}
-
-func GetBaseAuthorityList(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	param, _ := data("param")
-	pageNum, _ := data("pageNum")
-	pageSize, _ := data("pageSize")
-	authority := domain.Authority{}
-	err := mapstructure.Decode(param, &authority)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "json转换错误"))
-		return
-	}
-	list, err := manage.GetAuthorityList(authority, cast.ToInt(pageNum), cast.ToInt(pageSize))
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func GetBaseAuthorityListInId(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	idsString, _ := data("ids")
-	var ids []int64
-	err := mapstructure.Decode([]byte(cast.ToString(idsString)), &ids)
-	list, err := manage.GetAuthorityListInId(ids)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "查询错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(list))
-}
-
-func SaveBaseAuthority(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	authorityParam, _ := data("authority")
-	authority := domain.Authority{}
-	err := mapstructure.Decode(authorityParam, &authority)
-	
-	
-	saveAuthority, err := manage.SaveAuthority(&authority)
-	if err != nil {
-		c.JSON(200, CreateResultError(500, "保存错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(saveAuthority))
-}
-
-func UpdateBaseAuthority(c *gin.Context) {
-	data := share.GetJsonAnyParam(c)
-	authority, _ := data("authority")
-	id, _ := data("id")
-	toMap := UtilStructToMap(cast.ToStringMap(authority))
-	
-    
-    
-    
-	setAuthority, b, err := manage.SetAuthority(toMap, cast.ToInt64(id))
-	if err != nil || !b {
-		c.JSON(200, CreateResultError(500, "修改错误"))
-		return
-	}
-	c.JSON(200, CreateResultData(setAuthority))
-}
-
-func DeleteBaseAuthority(c *gin.Context) {
-	id := c.Query("id")
-	res := manage.DeleteAuthority(cast.ToInt64(id))
-	if !res {
-		c.JSON(200, CreateResultError(500, "删除错误"))
-		return
-	}
-	c.JSON(200, CreateResult())
-}

文件差異過大導致無法顯示
+ 70 - 346
output/vue/BaseApi.ts


+ 3 - 2
sqlload/SqlLoad.go

@@ -51,12 +51,12 @@ func Load() {
 // LoadGenTableAndGenTableColumn 加载数据库中的表格和列字段生成
 func LoadGenTableAndGenTableColumn() {
 	var tables = make([]GenTable, 0)
-	err := configs.Engine.Table("gen_table").Find(&tables)
+	err := configs.Engine.Table("gen_table").Asc("id").Find(&tables)
 	if err != nil {
 		panic(err)
 	}
 	var genTableColumns []GenTableColumn
-	err = configs.Engine.Table("gen_table_column").Find(&genTableColumns)
+	err = configs.Engine.Table("gen_table_column").Asc("id").Find(&genTableColumns)
 	if err != nil {
 		panic(err)
 	}
@@ -133,6 +133,7 @@ func LoadGenTableData() {
 			configs.Engine.Table("gen_table_column").
 				Where("table_id = ? and column_name = ?", table.Id, CTables[i].CTableColumns[j].Name).Get(&tableColumn)
 			if tableColumn.Id == 0 {
+				fmt.Println(table.Id, CTables[i].CTableColumns[j].Name)
 				column := GenTableColumn{
 					TableId:       table.Id,
 					Sort:          0,

+ 92 - 24
util/BaseTemplateFunc.go

@@ -13,7 +13,9 @@ var FuncMap = template.FuncMap{
 	"bigHump":            BigHump,
 	"queryType":          QueryType,
 	"ElDialog":           ElDialog,
+	"ElFrom":             ElFrom,
 	"ElTableColumn":      ElTableColumn,
+	"ToLower":            strings.ToLower,
 }
 
 // ToGoType sql类型转go类型
@@ -93,39 +95,105 @@ func SmallHump(str string) string {
 	return res
 }
 func QueryType(GoType, GoField, QueryType, ColumnName, ColumnComment string) string {
-	switch GoType {
-	case "int":
-	case "int64":
-	case "float64":
+	if GoType == "int" || GoType == "int64" || GoType == "float64" {
 		if QueryType == "BETWEEN" {
-			return GoField + "Start string  `xorm:" + ColumnName + "  json:" + SmallHump(ColumnName) + "` // " + ColumnComment + "\n\t" +
-				GoField + "End string  `xorm:" + ColumnName + "  json:" + SmallHump(ColumnName) + "` // " + ColumnComment
+			return GoField + "Start " + GoType + "  `xorm:\"" + ColumnName + "\"  json:\"" + SmallHump(ColumnName) + "\"` // " + ColumnComment + "\n\t" +
+				GoField + "End " + GoType + "  `xorm:\"" + ColumnName + "\"  json:\"" + SmallHump(ColumnName) + "\"` // " + ColumnComment
 		} else {
-			return GoField + " " + GoType + "  `xorm:" + ColumnName + "  json:" + SmallHump(ColumnName) + "` // " + ColumnComment
+			return GoField + " " + GoType + "  `xorm:\"" + ColumnName + "\"  json:\"" + SmallHump(ColumnName) + "\"` // " + ColumnComment
 		}
-	case "time.Time":
+	}
+	if GoType == "time.Time" {
 		if QueryType == "BETWEEN" {
-			return GoField + "Start string  `xorm:" + ColumnName + "  json:" + SmallHump(ColumnName) + "` // " + ColumnComment + "\n\t" +
-				GoField + "End string  `xorm:" + ColumnName + "  json:" + SmallHump(ColumnName) + "` // " + ColumnComment
+			return GoField + "Start string  `xorm:\"" + ColumnName + "\"  json:\"" + SmallHump(ColumnName) + "\"` // " + ColumnComment + "\n\t" +
+				GoField + "End string  `xorm:\"" + ColumnName + "\"  json:" + SmallHump(ColumnName) + "\"` // " + ColumnComment
 		} else {
-			return GoField + " string  `xorm:" + ColumnName + "  json:" + SmallHump(ColumnName) + "` // " + ColumnComment
+			return GoField + " string  `xorm:\"" + ColumnName + "\"  json:\"" + SmallHump(ColumnName) + "\"` // " + ColumnComment
 		}
-	case "string":
-	default:
-		return GoField + " string  `xorm:" + ColumnName + "  json:" + SmallHump(ColumnName) + "` // " + ColumnComment
 	}
-	return GoField + " string  `xorm:" + ColumnName + "  json:" + SmallHump(ColumnName) + "` // " + ColumnComment
+	return GoField + " string  `xorm:\"" + ColumnName + "\"  json:\"" + SmallHump(ColumnName) + "\"` // " + ColumnComment
+}
+
+func ElFrom(name, value, typeName, dictType string) string {
+	typeName = strings.ToLower(typeName)
+	if typeName == "input" {
+		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+			"\n          <el-input v-model=\"query." + value + "\" placeholder=\"请输入" + name + "\"/>" +
+			"\n        </el-form-item>"
+	} else if typeName == "number" {
+		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+			"\n          <el-input-number v-model=\"query." + value + "\" placeholder=\"请输入" + name + "\"/>" +
+			"\n        </el-form-item>"
+	} else if typeName == "textarea" {
+		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+			"\n          <el-input v-model=\"query." + value + "\" placeholder=\"请输入" + name + "\" type=\"textarea\"/>" +
+			"\n        </el-form-item>"
+	} else if typeName == "select" {
+		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+			"\n          <el-select v-model=\"query." + value + "\" placeholder=\"请选择" + name + "\">" +
+			"\n            <el-option" +
+			"\n              v-for=\"item in store.state.dicts.get('" + dictType + "')\"" +
+			"\n              :key=\"item.dictValue\"" +
+			"\n              :label=\"item.dictLabel\"" +
+			"\n              :value=\"item.dictValue\"/>" +
+			"\n          </el-select>" +
+			"\n        </el-form-item>"
+	} else if typeName == "radio" {
+		if dictType == "" {
+			return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+				"            <el-radio-group v-model=\"query." + value + "\">" +
+				"\n              <el-radio" +
+				"\n                  v-for=\"item in [['0','否'], ['1','是']]\"" +
+				"\n                  :key=\"item[0]\"" +
+				"\n                  :label=\"item[0]\">" +
+				"\n                {{ item[1] }}" +
+				"\n              </el-radio>" +
+				"\n            </el-radio-group>" +
+				"\n        </el-form-item>"
+		} else {
+			return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+				"\n          <el-radio-group v-model=\"query." + value + "\">" +
+				"\n            <el-radio" +
+				"\n              v-for=\"item in store.state.dicts.get(" + dictType + ")\"" +
+				"\n              :key=\"item.dictValue\"" +
+				"\n              :label=\"item.dictLabel\">" +
+				"\n              {{item.dictLabel}}" +
+				"\n            </el-radio>" +
+				"\n          </el-radio-group>" +
+				"\n        </el-form-item>"
+		}
+	} else if typeName == "checkbox" {
+		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+			"\n        	<el-checkbox-group v-model=\"query." + value + "\">" +
+			"\n          <el-checkbox :label=\"item.dictLabel\" :value=\"item.dictValue\" v-for=\"item in store.state.dicts.get('" + dictType + "')\"/>" +
+			"\n        </el-checkbox-group>" +
+			"\n        </el-form-item>"
+	} else if typeName == "time" {
+		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+			"      <el-date-picker v-model=\"query." + value + "\" type=\"datetime\" placeholder=\"请选择时间\" value-format=\"YYYY-MM-DD hh:mm:ss\"/>" +
+			"\n        </el-form-item>"
+	} else if typeName == "image" {
+		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+			"              <ImageUpload v-model:ImgUrl=\"query." + value + "\"/>" +
+			"\n        </el-form-item>"
+	} else if typeName == "file" {
+
+	} else if typeName == "editor" {
+
+		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+			"              <EditorComponent v-model:htmlString=\"query." + value + "\"/>" +
+			"\n        </el-form-item>"
+	} else if typeName == "text" {
+		return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+			"                <el-text class=\"mx-1\">{{query." + value + "}}</el-text>" +
+			"\n        </el-form-item>"
+	}
+	//默认的就显示文本
+	return "\n        <el-form-item label=\"" + name + "\" prop=\"" + value + "\">" +
+		"                <el-text class=\"mx-1\">{{query." + value + "}}</el-text>" +
+		"\n        </el-form-item>"
 }
 
-// 输入框 input
-// 文本域 textarea
-// 下拉框 Select
-// 复选框 Checkbox
-// 单选框 Radio
-// 时间选择 Time
-// 图片上传 Image
-// 文件上传 File
-// 富文本 Editor
 func ElTableColumn(name, value, typeName string, dictType string) string {
 	if typeName == "input" || typeName == "textarea" || typeName == "select" || typeName == "radio" ||
 		typeName == "checkbox" || typeName == "time" || typeName == "text" {

部分文件因文件數量過多而無法顯示