diff --git a/server/api/v1/sys_auto_code.go b/server/api/v1/sys_auto_code.go index 7b9934d94da2e729487c59ffb0ab97a097b26dcc..5a127e83570d6be7ed6fcc316c04d0ae30e35600 100644 --- a/server/api/v1/sys_auto_code.go +++ b/server/api/v1/sys_auto_code.go @@ -23,13 +23,13 @@ func CreateTemp(c *gin.Context) { var a model.AutoCodeStruct _ = c.ShouldBindJSON(&a) AutoCodeVerify := utils.Rules{ - "Abbreviation": {utils.NotEmpty()}, - "StructName": {utils.NotEmpty()}, - "PackageName": {utils.NotEmpty()}, - "Fields": {utils.NotEmpty()}, + "Abbreviation": {utils.NotEmpty()}, + "StructName": {utils.NotEmpty()}, + "PackageName": {utils.NotEmpty()}, + "Fields": {utils.NotEmpty()}, } WKVerifyErr := utils.Verify(a, AutoCodeVerify) - if WKVerifyErr!=nil { + if WKVerifyErr != nil { response.FailWithMessage(WKVerifyErr.Error(), c) return } diff --git a/server/api/v1/sys_work_flow.go b/server/api/v1/sys_work_flow.go index e9261df63abb987072826e3870165e39740424c3..f0833282a89a3780a61c8fe543d3b684c670febd 100644 --- a/server/api/v1/sys_work_flow.go +++ b/server/api/v1/sys_work_flow.go @@ -19,13 +19,13 @@ func CreateWorkFlow(c *gin.Context) { var wk model.SysWorkflow _ = c.ShouldBindJSON(&wk) WKVerify := utils.Rules{ - "WorkflowNickName": {utils.NotEmpty()}, - "WorkflowName": {utils.NotEmpty()}, - "WorkflowDescription": {utils.NotEmpty()}, - "WorkflowStepInfo": {utils.NotEmpty()}, + "WorkflowNickName": {utils.NotEmpty()}, + "WorkflowName": {utils.NotEmpty()}, + "WorkflowDescription": {utils.NotEmpty()}, + "WorkflowStepInfo": {utils.NotEmpty()}, } WKVerifyErr := utils.Verify(wk, WKVerify) - if WKVerifyErr!=nil { + if WKVerifyErr != nil { response.FailWithMessage(WKVerifyErr.Error(), c) return } diff --git a/server/config/config.go b/server/config/config.go index 53d1ca5e316073864afb44b18ffd5e86b26e56ea..51f71240bcd8c9f4a2cf7dfa9cabf0d6ffcb360d 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -46,8 +46,8 @@ type Redis struct { type Qiniu struct { AccessKey string `mapstructure:"access-key" json:"accessKey" yaml:"access-key"` SecretKey string `mapstructure:"secret-key" json:"secretKey" yaml:"secret-key"` - Bucket string `mapstructure:"bucket" json:"bucket" yaml:"bucket"` - ImgPath string `mapstructure:"img-path" json:"imgPath" yaml:"img-path"` + Bucket string `mapstructure:"bucket" json:"bucket" yaml:"bucket"` + ImgPath string `mapstructure:"img-path" json:"imgPath" yaml:"img-path"` } type Captcha struct { diff --git a/server/global/response/response.go b/server/global/response/response.go index ed88f22b55c159d98b42e041c3cd601d5c03d146..35bc3fa29fc59b82fe1156e419649a75f9ba613a 100644 --- a/server/global/response/response.go +++ b/server/global/response/response.go @@ -50,5 +50,5 @@ func FailWithMessage(message string, c *gin.Context) { } func FailWithDetailed(code int, data interface{}, message string, c *gin.Context) { - Result(code, data, message, c ) -} \ No newline at end of file + Result(code, data, message, c) +} diff --git a/server/model/exa_breakpoint_continue.go b/server/model/exa_breakpoint_continue.go index 1d9a62309928cc4badcd483df5bfdbd505c1e7e1..722baed73550383a0cec03d06084a9d0dba0c877 100644 --- a/server/model/exa_breakpoint_continue.go +++ b/server/model/exa_breakpoint_continue.go @@ -21,4 +21,4 @@ type ExaFileChunk struct { ExaFileId uint FileChunkNumber int FileChunkPath string -} \ No newline at end of file +} diff --git a/server/model/exa_customer.go b/server/model/exa_customer.go index 7b0e428789b198ebd9dccd0fb1364ae113927882..9cb96b1f43ee926708c8c2454713e0946104fd7b 100644 --- a/server/model/exa_customer.go +++ b/server/model/exa_customer.go @@ -11,4 +11,4 @@ type ExaCustomer struct { SysUserID uint `json:"sysUserId" form:"sysUserId"` SysUserAuthorityID string `json:"sysUserAuthorityID" form:"sysUserAuthorityID"` SysUser SysUser `json:"sysUser" form:"sysUser"` -} \ No newline at end of file +} diff --git a/server/model/exa_file_upload_download.go b/server/model/exa_file_upload_download.go index b8becc8563ac478dcc38e3e6fc3b7b7413c43f92..1b0557b4c010051c7b11b57e55a2b340706d40a0 100644 --- a/server/model/exa_file_upload_download.go +++ b/server/model/exa_file_upload_download.go @@ -10,4 +10,4 @@ type ExaFileUploadAndDownload struct { Url string `json:"url"` Tag string `json:"tag"` Key string `json:"key"` -} \ No newline at end of file +} diff --git a/server/model/request/jwt.go b/server/model/request/jwt.go index 6192090000807e65167ce756452cb97c9d9647da..27ed3f76d1149ff6b2bc254d85303536aee85ed7 100644 --- a/server/model/request/jwt.go +++ b/server/model/request/jwt.go @@ -12,4 +12,4 @@ type CustomClaims struct { NickName string AuthorityId string jwt.StandardClaims -} \ No newline at end of file +} diff --git a/server/model/request/sys_menu.go b/server/model/request/sys_menu.go index 57524a130dff07540246051739674efbee713897..7096a9e2717773494cb80a5feb421f1dcda56724 100644 --- a/server/model/request/sys_menu.go +++ b/server/model/request/sys_menu.go @@ -11,4 +11,4 @@ type AddMenuAuthorityInfo struct { // Get role by id structure type AuthorityIdInfo struct { AuthorityId string -} \ No newline at end of file +} diff --git a/server/model/request/sys_user.go b/server/model/request/sys_user.go index c04992b89405c494b30383384115bd4c426e56ea..a0f5086e81a8729ad024df395dab64d800401162 100644 --- a/server/model/request/sys_user.go +++ b/server/model/request/sys_user.go @@ -30,4 +30,4 @@ type ChangePasswordStruct struct { type SetUserAuth struct { UUID uuid.UUID `json:"uuid"` AuthorityId string `json:"authorityId"` -} \ No newline at end of file +} diff --git a/server/model/response/exa_breakpoint_continue.go b/server/model/response/exa_breakpoint_continue.go index 58727f4ddb11a3c7c9f1be426334bbd86fcf5184..43596696edc050e44f7148abc7dfd0725afee7c0 100644 --- a/server/model/response/exa_breakpoint_continue.go +++ b/server/model/response/exa_breakpoint_continue.go @@ -8,4 +8,4 @@ type FilePathResponse struct { type FileResponse struct { File model.ExaFile `json:"file"` -} \ No newline at end of file +} diff --git a/server/model/sys_api.go b/server/model/sys_api.go index 9c6ab0800e68f5ffa07cdaa91a57366d19aecd39..0a1457d0c643716be9e42018f2e25f03d468f5d4 100644 --- a/server/model/sys_api.go +++ b/server/model/sys_api.go @@ -10,4 +10,4 @@ type SysApi struct { Description string `json:"description"` ApiGroup string `json:"apiGroup"` Method string `json:"method" gorm:"default:'POST'"` -} \ No newline at end of file +} diff --git a/server/model/sys_authority.go b/server/model/sys_authority.go index 042faa68b5677b4a499d4e4e9ca3da9a6c462252..cdc2391d19899f0948e144394f14129d06b259c8 100644 --- a/server/model/sys_authority.go +++ b/server/model/sys_authority.go @@ -14,4 +14,4 @@ type SysAuthority struct { DataAuthorityId []SysAuthority `json:"dataAuthorityId" gorm:"many2many:sys_data_authority_id;association_jointable_foreignkey:data_authority_id"` Children []SysAuthority `json:"children"` SysBaseMenus []SysBaseMenu `json:"menus" gorm:"many2many:sys_authority_menus;"` -} \ No newline at end of file +} diff --git a/server/model/sys_authority_menu.go b/server/model/sys_authority_menu.go index a2fad72dd81729d46681ec363a43ab73a3814016..b325a2adfa63e057277bbf49a5d939ef81cdb595 100644 --- a/server/model/sys_authority_menu.go +++ b/server/model/sys_authority_menu.go @@ -5,4 +5,4 @@ type SysMenu struct { MenuId string `json:"menuId"` AuthorityId string `json:"-"` Children []SysMenu `json:"children"` -} \ No newline at end of file +} diff --git a/server/model/sys_casbin.go b/server/model/sys_casbin.go index 74aac211075d9e05e20691d52039c6f249c5d99f..0880d08d9fe580fb87e8a1a7284b775f62f09f7d 100644 --- a/server/model/sys_casbin.go +++ b/server/model/sys_casbin.go @@ -6,4 +6,4 @@ type CasbinModel struct { AuthorityId string `json:"rolename" gorm:"column:v0"` Path string `json:"path" gorm:"column:v1"` Method string `json:"method" gorm:"column:v2"` -} \ No newline at end of file +} diff --git a/server/model/sys_jwt_blacklist.go b/server/model/sys_jwt_blacklist.go index 433ce4565e0e101347642a63c56b768755e62bda..fa7b93e325ec6ccc13f14889587de43cee9541d7 100644 --- a/server/model/sys_jwt_blacklist.go +++ b/server/model/sys_jwt_blacklist.go @@ -7,4 +7,4 @@ import ( type JwtBlacklist struct { gorm.Model Jwt string `gorm:"type:text"` -} \ No newline at end of file +} diff --git a/server/model/sys_system.go b/server/model/sys_system.go index d2634bde98ad14aa212be8f4a89643e80ff68107..9855b9d5e64607c0afb44d88526245df8795b613 100644 --- a/server/model/sys_system.go +++ b/server/model/sys_system.go @@ -7,4 +7,4 @@ import ( //配置文件结构体 type System struct { Config config.Server -} \ No newline at end of file +} diff --git a/server/model/sys_user.go b/server/model/sys_user.go index 801db1d627880f375d241d1fd43312abb9dfdf8a..947c0cb13f952fa188751b47caa5d00b18f38142 100644 --- a/server/model/sys_user.go +++ b/server/model/sys_user.go @@ -14,4 +14,4 @@ type SysUser struct { HeaderImg string `json:"headerImg" gorm:"default:'http://www.henrongyi.top/avatar/lufu.jpg'"` Authority SysAuthority `json:"authority" gorm:"ForeignKey:AuthorityId;AssociationForeignKey:AuthorityId"` AuthorityId string `json:"authorityId" gorm:"default:888"` -} \ No newline at end of file +} diff --git a/server/model/sys_workflow.go b/server/model/sys_workflow.go index 05d6bd3dafe062a4284a21f08739723d923a7ba3..e4ed4739e1a1d0e2267eabfda2ec7e6c08264fa4 100644 --- a/server/model/sys_workflow.go +++ b/server/model/sys_workflow.go @@ -22,4 +22,4 @@ type SysWorkflowStepInfo struct { StepNo float64 `json:"stepNo"` // 步骤id （第几步） StepAuthorityID string `json:"stepAuthorityID"` // 操作者级别id IsEnd bool `json:"isEnd"` // 是否是完结流节点 -} \ No newline at end of file +} diff --git a/server/router/exp_customer.go b/server/router/exp_customer.go index b7d326185cd87a29487177361d9160e2d915735e..b9290369f3d77ddb8dc1793135680411775e93ae 100644 --- a/server/router/exp_customer.go +++ b/server/router/exp_customer.go @@ -9,8 +9,8 @@ import ( func InitCustomerRouter(Router *gin.RouterGroup) { ApiRouter := Router.Group("customer").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()) { - ApiRouter.POST("customer", v1.CreateExaCustomer) // 创建客户 - ApiRouter.PUT("customer", v1.UpdateExaCustomer) // 更新客户 + ApiRouter.POST("customer", v1.CreateExaCustomer) // 创建客户 + ApiRouter.PUT("customer", v1.UpdateExaCustomer) // 更新客户 ApiRouter.DELETE("customer", v1.DeleteExaCustomer) // 删除客户 ApiRouter.GET("customer", v1.GetExaCustomer) // 获取单一客户信息 ApiRouter.GET("customerList", v1.GetExaCustomerList) // 获取客户列表 diff --git a/server/service/sys_menu.go b/server/service/sys_menu.go index 50314a2646dafc954ac84bc637a321f7d98b57bb..5b8e01644e83696802a96d049c8ca4d1640f8108 100644 --- a/server/service/sys_menu.go +++ b/server/service/sys_menu.go @@ -13,15 +13,15 @@ import ( // @return err error // @return menusMsp map{string}[]SysBaseMenu -func getMenuTreeMap(authorityId string)(err error,treeMap map[string][]model.SysMenu){ +func getMenuTreeMap(authorityId string) (err error, treeMap map[string][]model.SysMenu) { var allMenus []model.SysMenu treeMap = make(map[string][]model.SysMenu) sql := "SELECT authority_menu.keep_alive,authority_menu.default_menu,authority_menu.created_at,authority_menu.updated_at,authority_menu.deleted_at,authority_menu.menu_level,authority_menu.parent_id,authority_menu.path,authority_menu.`name`,authority_menu.hidden,authority_menu.component,authority_menu.title,authority_menu.icon,authority_menu.sort,authority_menu.menu_id,authority_menu.authority_id FROM authority_menu WHERE authority_menu.authority_id = ? ORDER BY authority_menu.sort ASC" - err = global.GVA_DB.Raw(sql,authorityId).Scan(&allMenus).Error - for _,v := range allMenus{ + err = global.GVA_DB.Raw(sql, authorityId).Scan(&allMenus).Error + for _, v := range allMenus { treeMap[v.ParentId] = append(treeMap[v.ParentId], v) } - return err,treeMap + return err, treeMap } // @title GetMenuTree @@ -32,7 +32,7 @@ func getMenuTreeMap(authorityId string)(err error,treeMap map[string][]model.Sys // @return menus []model.SysMenu func GetMenuTree(authorityId string) (err error, menus []model.SysMenu) { - err,menuTree := getMenuTreeMap(authorityId) + err, menuTree := getMenuTreeMap(authorityId) menus = menuTree["0"] for i := 0; i < len(menus); i++ { err = getChildrenList(&menus[i], menuTree) @@ -47,7 +47,7 @@ func GetMenuTree(authorityId string) (err error, menus []model.SysMenu) { // @param sql string // @return err error -func getChildrenList(menu *model.SysMenu,treeMap map[string][]model.SysMenu) (err error) { +func getChildrenList(menu *model.SysMenu, treeMap map[string][]model.SysMenu) (err error) { menu.Children = treeMap[menu.MenuId] for i := 0; i < len(menu.Children); i++ { err = getChildrenList(&menu.Children[i], treeMap) @@ -65,10 +65,10 @@ func getChildrenList(menu *model.SysMenu,treeMap map[string][]model.SysMenu) (er func GetInfoList() (err error, list interface{}, total int) { var menuList []model.SysBaseMenu - err,treeMap := getBaseMenuTreeMap() + err, treeMap := getBaseMenuTreeMap() menuList = treeMap["0"] for i := 0; i < len(menuList); i++ { - err = getBaseChildrenList(&menuList[i],treeMap) + err = getBaseChildrenList(&menuList[i], treeMap) } return err, menuList, total } @@ -79,10 +79,10 @@ func GetInfoList() (err error, list interface{}, total int) { // @param menu *model.SysBaseMenu // @return err error -func getBaseChildrenList(menu *model.SysBaseMenu ,treeMap map[string][]model.SysBaseMenu) (err error) { +func getBaseChildrenList(menu *model.SysBaseMenu, treeMap map[string][]model.SysBaseMenu) (err error) { menu.Children = treeMap[strconv.Itoa(int(menu.ID))] for i := 0; i < len(menu.Children); i++ { - err = getBaseChildrenList(&menu.Children[i],treeMap) + err = getBaseChildrenList(&menu.Children[i], treeMap) } return err } @@ -110,14 +110,14 @@ func AddBaseMenu(menu model.SysBaseMenu) (err error) { // @return err error // @return menusMsp map{string}[]SysBaseMenu -func getBaseMenuTreeMap()(err error,treeMap map[string][]model.SysBaseMenu){ +func getBaseMenuTreeMap() (err error, treeMap map[string][]model.SysBaseMenu) { var allMenus []model.SysBaseMenu treeMap = make(map[string][]model.SysBaseMenu) err = global.GVA_DB.Order("sort", true).Find(&allMenus).Error - for _,v := range allMenus{ + for _, v := range allMenus { treeMap[v.ParentId] = append(treeMap[v.ParentId], v) } - return err,treeMap + return err, treeMap } // @title GetBaseMenuTree @@ -127,10 +127,10 @@ func getBaseMenuTreeMap()(err error,treeMap map[string][]model.SysBaseMenu){ // @return menus []SysBaseMenu func GetBaseMenuTree() (err error, menus []model.SysBaseMenu) { - err,treeMap := getBaseMenuTreeMap() + err, treeMap := getBaseMenuTreeMap() menus = treeMap["0"] for i := 0; i < len(menus); i++ { - err = getBaseChildrenList(&menus[i],treeMap) + err = getBaseChildrenList(&menus[i], treeMap) } return err, menus }