Merge branch 'flipped-aurora:main' into main

Author: xue-ding-e

server/go.mod

@@ -36,14 +36,15 @@ require (
 github.com/unrolled/secure v1.13.0
 github.com/xuri/excelize/v2 v2.8.0
 go.mongodb.org/mongo-driver v1.12.1
+go.uber.org/automaxprocs v1.5.3
 go.uber.org/zap v1.24.0
 golang.org/x/crypto v0.16.0
 golang.org/x/sync v0.5.0
 golang.org/x/text v0.14.0
-gorm.io/driver/mysql v1.5.1
+gorm.io/driver/mysql v1.5.6
 gorm.io/driver/postgres v1.5.2
 gorm.io/driver/sqlserver v1.5.1
-gorm.io/gorm v1.25.2
+gorm.io/gorm v1.25.7
 nhooyr.io/websocket v1.8.7
 )
 
@@ -123,7 +124,6 @@ require (
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
 github.com/yusufpapurcu/wmi v1.2.3 // indirect
 go.uber.org/atomic v1.9.0 // indirect
-go.uber.org/automaxprocs v1.5.3 // indirect
 go.uber.org/multierr v1.8.0 // indirect
 golang.org/x/arch v0.3.0 // indirect
 golang.org/x/image v0.11.0 // indirect
@@ -134,7 +134,6 @@ require (
 google.golang.org/protobuf v1.30.0 // indirect
 gopkg.in/ini.v1 v1.67.0 // indirect
 gopkg.in/yaml.v3 v3.0.1 // indirect
-gorm.io/datatypes v1.2.0 // indirect
 gorm.io/plugin/dbresolver v1.4.1 // indirect
 modernc.org/libc v1.24.1 // indirect
 modernc.org/mathutil v1.5.0 // indirect

server/go.sum

@@ -301,8 +301,6 @@ github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
-github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/microsoft/go-mssqldb v1.1.0 h1:jsV+tpvcPTbNNKW0o3kiCD69kOHICsfjZ2VcVu2lKYc=
 github.com/microsoft/go-mssqldb v1.1.0/go.mod h1:LzkFdl4z2Ck+Hi+ycGOTbL56VEfgoyA2DvYejrNGbRk=
 github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
@@ -342,6 +340,7 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/qiniu/api.v7/v7 v7.4.1 h1:BnNUBimLk6nrA/mIwsww9yJRupmViSsb1ndLMC7a9OY=
 github.com/qiniu/api.v7/v7 v7.4.1/go.mod h1:VE5oC5rkE1xul0u1S2N0b2Uxq9/6hZzhyqjgK25XDcM=
@@ -836,22 +835,18 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/datatypes v1.2.0 h1:5YT+eokWdIxhJgWHdrb2zYUimyk0+TaFth+7a0ybzco=
-gorm.io/datatypes v1.2.0/go.mod h1:o1dh0ZvjIjhH/bngTpypG6lVRJ5chTBxE09FH/71k04=
 gorm.io/driver/mysql v1.4.3/go.mod h1:sSIebwZAVPiT+27jK9HIwvsqOGKx3YMPmrA3mBJR10c=
-gorm.io/driver/mysql v1.5.1 h1:WUEH5VF9obL/lTtzjmML/5e6VfFR/788coz2uaVCAZw=
-gorm.io/driver/mysql v1.5.1/go.mod h1:Jo3Xu7mMhCyj8dlrb3WoCaRd1FhsVh+yMXb1jUInf5o=
+gorm.io/driver/mysql v1.5.6 h1:Ld4mkIickM+EliaQZQx3uOJDJHtrd70MxAUqWqlx3Y8=
+gorm.io/driver/mysql v1.5.6/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
 gorm.io/driver/postgres v1.5.2 h1:ytTDxxEv+MplXOfFe3Lzm7SjG09fcdb3Z/c056DTBx0=
 gorm.io/driver/postgres v1.5.2/go.mod h1:fmpX0m2I1PKuR7mKZiEluwrP3hbs+ps7JIGMUBpCgl8=
-gorm.io/driver/sqlite v1.4.3 h1:HBBcZSDnWi5BW3B3rwvVTc510KGkBkexlOg0QrmLUuU=
-gorm.io/driver/sqlite v1.4.3/go.mod h1:0Aq3iPO+v9ZKbcdiz8gLWRw5VOPcBOPUQJFLq5e2ecI=
 gorm.io/driver/sqlserver v1.5.1 h1:wpyW/pR26U94uaujltiFGXY7fd2Jw5hC9PB1ZF/Y5s4=
 gorm.io/driver/sqlserver v1.5.1/go.mod h1:AYHzzte2msKTmYBYsSIq8ZUsznLJwBdkB2wpI+kt0nM=
 gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
 gorm.io/gorm v1.24.3/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
 gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-gorm.io/gorm v1.25.2 h1:gs1o6Vsa+oVKG/a9ElL3XgyGfghFfkKA2SInQaCyMho=
-gorm.io/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
+gorm.io/gorm v1.25.7 h1:VsD6acwRjz2zFxGO50gPO6AkNs7KKnvfzUjHQhZDz/A=
+gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
 gorm.io/plugin/dbresolver v1.4.1 h1:Ug4LcoPhrvqq71UhxtF346f+skTYoCa/nEsdjvHwEzk=
 gorm.io/plugin/dbresolver v1.4.1/go.mod h1:CTbCtMWhsjXSiJqiW2R8POvJ2cq18RVOl4WGyT5nhNc=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

server/service/system/sys_api.go

@@ -107,7 +107,7 @@ func (apiService *ApiService) GetAPIInfoList(api system.SysApi, info request.Pag
 
 err = db.Order(OrderStr).Find(&apiList).Error
 } else {
-err = db.Order("api_group").Find(&apiList).Error
+err = db.Order("id desc").Find(&apiList).Error
 }
 }
 return apiList, total, err

server/service/system/sys_export_template.go

@@ -15,7 +15,6 @@ import (
 "net/url"
 "strconv"
 "strings"
-"time"
 )
 
 type SysExportTemplateService struct {
@@ -316,14 +315,17 @@ func (sysExportTemplateService *SysExportTemplateService) ImportExcel(templateID
 key := titleKeyMap[excelTitle[ii]]
 item[key] = value
 }
-needCreated := tx.Migrator().HasColumn(template.TableName, "created_at")
-needUpdated := tx.Migrator().HasColumn(template.TableName, "updated_at")
-if item["created_at"] == nil && needCreated {
-item["created_at"] = time.Now()
-}
-if item["updated_at"] == nil && needUpdated {
-item["updated_at"] = time.Now()
-}
+
+// 此处需要等待gorm修复HasColumn中的painc问题
+//needCreated := tx.Migrator().HasColumn(template.TableName, "created_at")
+//needUpdated := tx.Migrator().HasColumn(template.TableName, "updated_at")
+//
+//if item["created_at"] == nil && needCreated {
+//	item["created_at"] = time.Now()
+//}
+//if item["updated_at"] == nil && needUpdated {
+//	item["updated_at"] = time.Now()
+//}
 
 cErr := tx.Table(template.TableName).Create(&item).Error
 if cErr != nil {

server/source/system/excel_template.go

@@ -0,0 +1,75 @@
+package system
+
+import (
+"context"
+sysModel "github.com/flipped-aurora/gin-vue-admin/server/model/system"
+"github.com/flipped-aurora/gin-vue-admin/server/service/system"
+"github.com/pkg/errors"
+"gorm.io/gorm"
+)
+
+type initExcelTemplate struct{}
+
+const initOrderExcelTemplate = initOrderDictDetail + 1
+
+// auto run
+func init() {
+system.RegisterInit(initOrderExcelTemplate, &initExcelTemplate{})
+}
+
+func (i initExcelTemplate) InitializerName() string {
+return "sys_export_templates"
+}
+
+func (i *initExcelTemplate) MigrateTable(ctx context.Context) (context.Context, error) {
+db, ok := ctx.Value("db").(*gorm.DB)
+if !ok {
+return ctx, system.ErrMissingDBContext
+}
+return ctx, db.AutoMigrate(&sysModel.SysExportTemplate{})
+}
+
+func (i *initExcelTemplate) TableCreated(ctx context.Context) bool {
+db, ok := ctx.Value("db").(*gorm.DB)
+if !ok {
+return false
+}
+return db.Migrator().HasTable(&sysModel.SysExportTemplate{})
+}
+
+func (i *initExcelTemplate) InitializeData(ctx context.Context) (context.Context, error) {
+db, ok := ctx.Value("db").(*gorm.DB)
+if !ok {
+return ctx, system.ErrMissingDBContext
+}
+
+entities := []sysModel.SysExportTemplate{
+{
+Name: "api",
+TableName: "sys_apis",
+TemplateID: "api",
+TemplateInfo: `{
+"path":"路径",
+"method":"方法（大写）",
+"description":"方法介绍",
+"api_group":"方法分组"
+}`,
+},
+}
+if err := db.Create(&entities).Error; err != nil {
+return ctx, errors.Wrap(err, "sys_export_templates"+"表数据初始化失败!")
+}
+next := context.WithValue(ctx, i.InitializerName(), entities)
+return next, nil
+}
+
+func (i *initExcelTemplate) DataInserted(ctx context.Context) bool {
+db, ok := ctx.Value("db").(*gorm.DB)
+if !ok {
+return false
+}
+if errors.Is(db.First(&sysModel.SysExportTemplate{}).Error, gorm.ErrRecordNotFound) {
+return false
+}
+return true
+}

web/src/style/element_visiable.scss

@@ -5,19 +5,6 @@
  border-radius: 2px;
 }
 
-::-webkit-scrollbar {
- @apply hidden;
-}
-
-
-.gva-search-box {
- @apply p-6 pb-0.5 bg-white rounded mb-3;
-}
-
-.gva-form-box {
- @apply p-6 bg-white rounded;
-}
-
 .gva-pagination {
  @apply flex justify-end;
  .el-pagination__editor {
@@ -40,3 +27,181 @@
  padding-bottom: 16px !important;
  @apply border-0 border-b border-solid border-gray-200;
 }
+
+
+.el-form--inline {
+ .el-form-item {
+ & > .el-input, .el-cascader, .el-select, .el-date-editor, .el-autocomplete {
+ @apply w-52;
+ }
+ }
+}
+
+.el-dropdown {
+ @apply overflow-hidden
+}
+
+
+.admin-box {
+ @apply min-h-[calc(100vh-200px)] px-3 py-4 mt-28 mb-4 mx-1;
+ .el-table {
+ th {
+ @apply px-0 py-2;
+ .cell {
+ @apply leading-[40px] text-gray-700;
+ }
+ }
+ td {
+ @apply px-0 py-2;
+ .cell {
+ @apply leading-[40px] text-gray-600;
+ }
+ }
+ .is-leaf {
+ @apply border-b border-t-0 border-l-0 border-solid border-gray-50;
+ border-right:var(--el-table-border);
+ background: #F7FBFF !important;
+ }
+ }
+}
+
+// layout
+
+// table
+.el-pagination {
+ @apply mt-8;
+ .btn-prev,
+ .btn-next {
+ @apply border border-solid border-gray-300 rounded;
+ }
+ .el-pager {
+ li {
+ @apply border border-solid border-gray-300 rounded text-gray-600 text-sm mx-1;
+ }
+ }
+}
+
+// 导航
+#app {
+ .el-container {
+ @apply relative h-full w-full;
+ }
+ .el-container.mobile.openside {
+ @apply fixed top-0;
+ }
+ .gva-aside {
+ @apply fixed top-0 left-0 z-[1001] overflow-hidden;
+ .el-menu {
+ @apply border-r-0;
+ }
+ }
+ .aside {
+ .el-menu--collapse {
+ >.el-menu-item {
+ display: flex;
+ justify-content: center;
+ }
+ }
+ .el-sub-menu {
+ .el-menu {
+ .is-active {
+ // 关闭三级菜单二级菜单样式
+ ul {
+ border: none;
+ }
+ }
+ // 关闭三级菜单二级菜单样式
+ .is-active.is-opened {
+ ul {
+ border: none;
+ }
+ }
+ }
+ }
+ }
+ .hideside {
+ .aside {
+ @apply w-[54px]
+ }
+ }
+
+ .mobile {
+ .gva-aside {
+ @apply w-[54px];
+ }
+ }
+
+ .hideside {
+ .main-cont.el-main {
+ @apply ml-[54px];
+ }
+ }
+ .mobile {
+ .main-cont.el-main {
+ @apply ml-0;
+ }
+ }
+}
+
+.el-container.layout-cont {
+ .header-cont {
+ @apply px-4 h-16 bg-white;
+ }
+
+
+ .main-cont {
+ @apply h-screen overflow-visible;
+ &.el-main {
+ @apply min-h-full ml-[220px] bg-main p-0 overflow-auto;
+ }
+
+ .breadcrumb {
+ @apply h-16 flex items-center p-0 ml-12 text-lg;
+ .el-breadcrumb__item {
+ .el-breadcrumb__inner {
+ @apply text-gray-600;
+ }
+ }
+ .el-breadcrumb__item:nth-last-child(1) {
+ .el-breadcrumb__inner {
+ @apply text-gray-600;
+ }
+ }
+ }
+
+ .router-history {
+ @apply bg-white p-0 border-t border-l-0 border-r-0 border-b-0 border-solid border-gray-100;
+ .el-tabs__header {
+ @apply m-0;
+ .el-tabs__item{
+ @apply border-solid border-r border-t-0 border-gray-100 border-b-0 border-l-0;
+ }
+ .el-tabs__item.is-active {
+ @apply bg-blue-500 bg-opacity-5;
+ }
+ .el-tabs__nav {
+ @apply border-0;
+ }
+ }
+ }
+
+ .aside {
+ @apply overflow-auto;
+ }
+ .el-menu-vertical {
+ @apply h-[calc(100vh-60px)];
+ &:not(.el-menu--collapse) {
+ @apply w-[220px];
+ }
+ }
+ .el-menu--collapse {
+ @apply w-[54px];
+ li {
+ .el-tooltip,
+ .el-sub-menu__title {
+ @apply px-4;
+ }
+ }
+ }
+ }
+}