Skip to content

Commit 4433dce

Browse files
SliverHornSliverHorn
committed
完善代码结构
1 parent 37bb81e commit 4433dce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+94
-242
lines changed

‎.idea/dataSources.xml

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/rely/mysql.go renamed to ‎cmd/gva/internal/boot/mysql.go

+20-19
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
package rely
1+
package boot
22

33
import (
44
"fmt"
5-
data "gva/internal/information/system"
5+
dataExtra "gva/cmd/gva/internal/data/extra"
6+
dataSystem "gva/cmd/gva/internal/data/system"
67

7-
gormadapter "github.com/casbin/gorm-adapter/v3"
8+
gormAdapter "github.com/casbin/gorm-adapter/v3"
89
"github.com/gookit/color"
910
"gorm.io/driver/mysql"
1011
"gorm.io/gorm"
1112
"gorm.io/gorm/logger"
12-
"gva/internal/global"
13-
information "gva/internal/information/extra"
14-
"gva/internal/model"
13+
"gva/cmd/gva/internal/global"
14+
"gva/cmd/gva/internal/model"
15+
1516
"os"
1617
"strings"
1718
)
@@ -67,7 +68,7 @@ func (m *_mysql) Init(dbName ...string) {
6768
//@description: gorm 同步模型 生成mysql表
6869
func (m *_mysql) AutoMigrateTables() {
6970
if !global.GVA_DB.Migrator().HasTable("casbin_rule") {
70-
m.err = global.GVA_DB.Migrator().CreateTable(&gormadapter.CasbinRule{})
71+
m.err = global.GVA_DB.Migrator().CreateTable(&gormAdapter.CasbinRule{})
7172
}
7273
m.err = m.db.AutoMigrate(
7374
new(model.SysApi),
@@ -100,51 +101,51 @@ func (m *_mysql) AutoMigrateTables() {
100101
//@author: [SliverHorn](https://github.com/SliverHorn)
101102
//@description: 初始化数据
102103
func (m *_mysql) InitData() {
103-
if m.err = data.Api.Init(); m.err != nil {
104+
if m.err = dataSystem.Api.Init(); m.err != nil {
104105
color.Warn.Println("\n[Mysql] --> sys_apis 表初始数据失败, err: %v", m.err)
105106
os.Exit(0)
106107
}
107-
if m.err = data.Admin.Init(); m.err != nil {
108+
if m.err = dataSystem.Admin.Init(); m.err != nil {
108109
color.Warn.Println("\n[Mysql] --> sys_users 表初始数据失败, err: %v", m.err)
109110
os.Exit(0)
110111
}
111-
if m.err = data.Casbin.Init(); m.err != nil {
112+
if m.err = dataSystem.Casbin.Init(); m.err != nil {
112113
color.Error.Println("\n[Mysql] --> casbin_rule 表初始数据失败, err: %v", m.err)
113114
os.Exit(0)
114115
}
115-
if m.err = data.BaseMenu.Init(); m.err != nil {
116+
if m.err = dataSystem.BaseMenu.Init(); m.err != nil {
116117
color.Error.Println("\n[Mysql] --> sys_base_menus 表初始数据失败, err: %v", m.err)
117118
os.Exit(0)
118119
}
119-
if m.err = data.Authority.Init(); m.err != nil {
120+
if m.err = dataSystem.Authority.Init(); m.err != nil {
120121
color.Error.Println("\n[Mysql] --> sys_authorities 表初始数据失败, err: %v", m.err)
121122
os.Exit(0)
122123
}
123-
if m.err = data.AuthorityMenu.Init(); m.err != nil {
124+
if m.err = dataSystem.AuthorityMenu.Init(); m.err != nil {
124125
color.Error.Println("\n[Mysql] --> authority_menu 视图创建失败!, err:%v", m.err)
125126
os.Exit(0)
126127
}
127-
if m.err = data.Dictionary.Init(); m.err != nil {
128+
if m.err = dataSystem.Dictionary.Init(); m.err != nil {
128129
color.Warn.Println("\n[Mysql] --> dictionaries 表初始数据失败, err: %v", m.err)
129130
os.Exit(0)
130131
}
131-
if m.err = data.AuthoritiesMenus.Init(); m.err != nil {
132+
if m.err = dataSystem.AuthoritiesMenus.Init(); m.err != nil {
132133
color.Warn.Println("\n[Mysql] --> sys_authority_menus 表初始数据失败, err: %v", m.err)
133134
os.Exit(0)
134135
}
135-
if m.err = data.DataAuthorities.Init(); m.err != nil {
136+
if m.err = dataSystem.DataAuthorities.Init(); m.err != nil {
136137
color.Warn.Println("\n[Mysql] --> sys_data_authority_id 表初始数据失败, err: %v", m.err)
137138
os.Exit(0)
138139
}
139-
if m.err = data.DictionaryDetail.Init(); m.err != nil {
140+
if m.err = dataSystem.DictionaryDetail.Init(); m.err != nil {
140141
color.Warn.Println("\n[Mysql] --> sys_dictionary_details 表初始数据失败, err: %v", m.err)
141142
os.Exit(0)
142143
}
143-
if m.err = data.Workflow.Init(); m.err != nil {
144+
if m.err = dataSystem.Workflow.Init(); m.err != nil {
144145
color.Warn.Println("\n[Mysql] --> 工作流相关 表初始数据失败, err: %v", m.err)
145146
os.Exit(0)
146147
}
147-
if m.err = information.File.Init(); m.err != nil {
148+
if m.err = dataExtra.File.Init(); m.err != nil {
148149
color.Warn.Println("\n[Mysql] --> exa_file_upload_and_downloads 表初始数据失败, err: %v", m.err)
149150
os.Exit(0)
150151
}

‎internal/core/viper.go renamed to ‎cmd/gva/internal/boot/viper.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package core
1+
package boot
22

33
import (
44
"flag"
55
"fmt"
66
"github.com/spf13/viper"
7-
c "gva/internal/config"
7+
"gva/cmd/gva/internal/constant"
88
"os"
99
)
1010

@@ -14,9 +14,9 @@ func Viper(path ...string) *viper.Viper {
1414
flag.StringVar(&config, "c", "", "choose config file.")
1515
flag.Parse()
1616
if config == "" { // 优先级: 命令行 > 环境变量 > 默认值
17-
if configEnv := os.Getenv(c.ConfigEnv); configEnv == "" {
18-
config = c.ConfigFile
19-
fmt.Printf("您正在使用config的默认值,config的路径为%v\n", c.ConfigFile)
17+
if configEnv := os.Getenv(constant.ConfigEnv); configEnv == "" {
18+
config = constant.ConfigFile
19+
fmt.Printf("您正在使用config的默认值,config的路径为%v\n", constant.ConfigFile)
2020
} else {
2121
config = configEnv
2222
fmt.Printf("您正在使用GVA_CONFIG环境变量,config的路径为%v\n", config)

‎cmd/gva/internal/constant/config.go

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
package constant
2+

‎internal/config/config.go renamed to ‎cmd/gva/internal/constant/constant.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package config
1+
package constant
22

33
const (
44
ConfigEnv = "GVA_CONFIG"

‎internal/information/extra/file.go renamed to ‎cmd/gva/internal/data/extra/file.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package information
33
import (
44
"github.com/gookit/color"
55
"gorm.io/gorm"
6-
"gva/internal/global"
7-
"gva/internal/model"
6+
"gva/cmd/gva/internal/global"
7+
"gva/cmd/gva/internal/model"
88
"time"
99
)
1010

‎internal/information/system/admin.go renamed to ‎cmd/gva/internal/data/system/admin.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package information
22

33
import (
44
"github.com/gookit/color"
5-
"gva/internal/global"
6-
"gva/internal/model"
5+
"gva/cmd/gva/internal/global"
6+
"gva/cmd/gva/internal/model"
77
"time"
88

99
uuid "github.com/satori/go.uuid"

‎internal/information/system/api.go renamed to ‎cmd/gva/internal/data/system/api.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package information
22

33
import (
44
"github.com/gookit/color"
5-
"gva/internal/global"
6-
"gva/internal/model"
5+
"gva/cmd/gva/internal/global"
6+
"gva/cmd/gva/internal/model"
77
"time"
88

99
"gorm.io/gorm"

‎internal/information/system/authorities_menus.go renamed to ‎cmd/gva/internal/data/system/authorities_menus.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package information
33
import (
44
"github.com/gookit/color"
55
"gorm.io/gorm"
6-
"gva/internal/global"
6+
"gva/cmd/gva/internal/global"
77
)
88

99
var AuthoritiesMenus = new(authoritiesMenus)

‎internal/information/system/authority.go renamed to ‎cmd/gva/internal/data/system/authority.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package information
22

33
import (
44
"github.com/gookit/color"
5-
"gva/internal/global"
6-
"gva/internal/model"
5+
"gva/cmd/gva/internal/global"
6+
"gva/cmd/gva/internal/model"
77
"time"
88

99
"gorm.io/gorm"

‎internal/information/system/authority_menu.go renamed to ‎cmd/gva/internal/data/system/authority_menu.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package information
22

33
import (
44
"github.com/gookit/color"
5-
"gva/internal/global"
6-
"gva/internal/model"
5+
"gva/cmd/gva/internal/global"
6+
"gva/cmd/gva/internal/model"
77
)
88

99
var AuthorityMenu = new(authorityMenu)

‎internal/information/system/casbin.go renamed to ‎cmd/gva/internal/data/system/casbin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
gormadapter "github.com/casbin/gorm-adapter/v3"
55
"github.com/gookit/color"
66
"gorm.io/gorm"
7-
"gva/internal/global"
7+
"gva/cmd/gva/internal/global"
88
)
99

1010
var Casbin = new(casbin)

‎internal/information/system/data_authorities.go renamed to ‎cmd/gva/internal/data/system/data_authorities.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package information
33
import (
44
"github.com/gookit/color"
55
"gorm.io/gorm"
6-
"gva/internal/global"
6+
"gva/cmd/gva/internal/global"
77
)
88

99
var DataAuthorities = new(dataAuthorities)

‎internal/information/system/dictionary.go renamed to ‎cmd/gva/internal/data/system/dictionary.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package information
22

33
import (
44
"github.com/gookit/color"
5-
"gva/internal/global"
6-
"gva/internal/model"
5+
"gva/cmd/gva/internal/global"
6+
"gva/cmd/gva/internal/model"
77
"time"
88

99
"gorm.io/gorm"

‎internal/information/system/dictionary_details.go renamed to ‎cmd/gva/internal/data/system/dictionary_details.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package information
22

33
import (
44
"github.com/gookit/color"
5-
"gva/internal/global"
6-
"gva/internal/model"
5+
"gva/cmd/gva/internal/global"
6+
"gva/cmd/gva/internal/model"
77
"time"
88

99
"gorm.io/gorm"

‎internal/information/system/menu.go renamed to ‎cmd/gva/internal/data/system/menu.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package information
22

33
import (
44
"github.com/gookit/color"
5-
"gva/internal/global"
6-
"gva/internal/model"
5+
"gva/cmd/gva/internal/global"
6+
"gva/cmd/gva/internal/model"
77
"time"
88

99
"gorm.io/gorm"

‎internal/information/system/workflow.go renamed to ‎cmd/gva/internal/data/system/workflow.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package information
22

33
import (
4-
"gva/internal/global"
5-
"gva/internal/model"
4+
"gva/cmd/gva/internal/global"
5+
"gva/cmd/gva/internal/model"
66
"time"
77

88
"github.com/gookit/color"

‎internal/global/global.go renamed to ‎cmd/gva/internal/global/global.go

File renamed without changes.

‎internal/global/model.go renamed to ‎cmd/gva/internal/global/model.go

File renamed without changes.

‎cmd/initdb.go renamed to ‎cmd/gva/internal/initdb.go

+10-12
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
16-
package cmd
16+
package internal
1717

1818
import (
1919

2020
//"github.com/flipped-aurora/gin-vue-admin/server/core"
2121

22-
"gva/internal/core"
23-
"gva/internal/global"
24-
"gva/internal/rely"
25-
2622
"github.com/gookit/color"
23+
"gva/cmd/gva/internal/boot"
24+
"gva/cmd/gva/internal/global"
2725

2826
"github.com/spf13/cobra"
2927
)
@@ -40,17 +38,17 @@ var initdbCmd = &cobra.Command{
4038
Run: func(cmd *cobra.Command, args []string) {
4139
frame, _ := cmd.Flags().GetString("frame")
4240
path, _ := cmd.Flags().GetString("path")
43-
global.GVA_VP = core.Viper(path)
41+
global.GVA_VP = boot.Viper(path)
4442

45-
rely.Mysql.CheckDatabase()
46-
rely.Mysql.CheckUtf8mb4()
47-
rely.Mysql.Info()
48-
rely.Mysql.Init()
43+
boot.Mysql.CheckDatabase()
44+
boot.Mysql.CheckUtf8mb4()
45+
boot.Mysql.Info()
46+
boot.Mysql.Init()
4947
switch frame {
5048
case "gin":
5149
if global.GVA_VP.GetString("system.db-type") == "mysql" {
52-
rely.Mysql.AutoMigrateTables()
53-
rely.Mysql.InitData()
50+
boot.Mysql.AutoMigrateTables()
51+
boot.Mysql.InitData()
5452
}
5553
case "gf":
5654
color.Info.Println("gf功能开发中")

‎internal/model/exa_breakpoint_continue.go renamed to ‎cmd/gva/internal/model/exa_breakpoint_continue.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package model
22

33
import (
4-
"gva/internal/global"
4+
"gva/cmd/gva/internal/global"
55
)
66

77
// file struct, 文件结构体

‎internal/model/exa_customer.go renamed to ‎cmd/gva/internal/model/exa_customer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package model
22

33
import (
4-
"gva/internal/global"
4+
"gva/cmd/gva/internal/global"
55
)
66

77
type ExaCustomer struct {

‎internal/model/exa_excel.go renamed to ‎cmd/gva/internal/model/exa_excel.go

File renamed without changes.

‎internal/model/exa_file_upload_download.go renamed to ‎cmd/gva/internal/model/exa_file_upload_download.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package model
22

33
import (
4-
"gva/internal/global"
4+
"gva/cmd/gva/internal/global"
55
)
66

77
type ExaFileUploadAndDownload struct {

‎internal/model/exa_simple_uploader.go renamed to ‎cmd/gva/internal/model/exa_simple_uploader.go

File renamed without changes.

‎internal/model/exa_wf_leave.go renamed to ‎cmd/gva/internal/model/exa_wf_leave.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package model
33

44
import (
5-
"gva/internal/global"
5+
"gva/cmd/gva/internal/global"
66
"time"
77
)
88

‎internal/model/sys_api.go renamed to ‎cmd/gva/internal/model/sys_api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package model
22

33
import (
4-
"gva/internal/global"
4+
"gva/cmd/gva/internal/global"
55
)
66

77
type SysApi struct {

‎internal/model/sys_authority.go renamed to ‎cmd/gva/internal/model/sys_authority.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ type SysAuthority struct {
1414
DataAuthorityId []SysAuthority `json:"dataAuthorityId" gorm:"many2many:sys_data_authority_id"`
1515
Children []SysAuthority `json:"children" gorm:"-"`
1616
SysBaseMenus []SysBaseMenu `json:"menus" gorm:"many2many:sys_authority_menus;"`
17-
DefaultRouter string `json:"defaultRouter" gorm:"comment:默认菜单;default:dashboard"`
17+
DefaultRouter string `json:"defaultRouter" gorm:"comment:默认菜单;default:dashboard"`
1818
}

‎internal/model/sys_authority_menu.go renamed to ‎cmd/gva/internal/model/sys_authority_menu.go

File renamed without changes.

‎internal/model/sys_auto_code.go renamed to ‎cmd/gva/internal/model/sys_auto_code.go

File renamed without changes.

‎internal/model/sys_base_menu.go renamed to ‎cmd/gva/internal/model/sys_base_menu.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package model
22

33
import (
4-
"gva/internal/global"
4+
"gva/cmd/gva/internal/global"
55
)
66

77
type SysBaseMenu struct {

‎internal/model/sys_casbin.go renamed to ‎cmd/gva/internal/model/sys_casbin.go

File renamed without changes.

‎internal/model/sys_dictionary.go renamed to ‎cmd/gva/internal/model/sys_dictionary.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package model
33

44
import (
5-
"gva/internal/global"
5+
"gva/cmd/gva/internal/global"
66
)
77

88
// 如果含有time.Time 请自行import time包

‎internal/model/sys_dictionary_detail.go renamed to ‎cmd/gva/internal/model/sys_dictionary_detail.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package model
33

44
import (
5-
"gva/internal/global"
5+
"gva/cmd/gva/internal/global"
66
)
77

88
// 如果含有time.Time 请自行import time包

0 commit comments

Comments
 (0)