diff --git a/app/admin/apis/captcha.go b/app/admin/apis/captcha.go index 0b99d96..3fd4ea0 100644 --- a/app/admin/apis/captcha.go +++ b/app/admin/apis/captcha.go @@ -11,7 +11,7 @@ type System struct { } func (e System) GenerateCaptchaHandler(c *gin.Context) { - e.Context = c + e.MakeContext(c) log := e.GetLogger() id, b64s, err := captcha.DriverDigitFunc() if err != nil { @@ -25,4 +25,4 @@ func (e System) GenerateCaptchaHandler(c *gin.Context) { "id": id, "msg": "success", }) -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_api.go b/app/admin/apis/sys_api.go new file mode 100644 index 0000000..062ae0f --- /dev/null +++ b/app/admin/apis/sys_api.go @@ -0,0 +1,209 @@ +package apis + +import ( + "net/http" + + "github.com/gin-gonic/gin" + "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" + _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" + + "go-admin/app/admin/models" + "go-admin/app/admin/service" + "go-admin/app/admin/service/dto" + "go-admin/common/actions" + "go-admin/common/apis" +) + +type SysApi struct { + apis.Api +} + +// GetSysApiList 获取接口管理列表 +// @Summary 获取接口管理列表 +// @Description 获取接口管理列表 +// @Tags 接口管理 +// @Param name query string false "名称" +// @Param title query string false "标题" +// @Param path query string false "地址" +// @Param action query string false "类型" +// @Param parentId query string false "按钮id" +// @Param pageSize query int false "页条数" +// @Param pageIndex query int false "页码" +// @Success 200 {object} response.Response{data=response.Page{list=[]models.SysApi}} "{"code": 200, "data": [...]}" +// @Router /api/v1/sys_api [get] +// @Security Bearer +func (e SysApi) GetSysApiList(c *gin.Context) { + e.MakeContext(c) + log := e.GetLogger() + db, err := e.GetOrm() + if err != nil { + log.Error(err) + return + } + + d := new(dto.SysApiSearch) + //查询列表 + err = d.Bind(c) + if err != nil { + log.Warnf("request body bind error, %s", err.Error()) + e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") + return + } + + //数据权限检查 + p := actions.GetPermissionFromContext(c) + + list := make([]models.SysApi, 0) + var count int64 + serviceSysApi := service.SysApi{} + serviceSysApi.Log = log + serviceSysApi.Orm = db + err = serviceSysApi.GetSysApiPage(d, p, &list, &count) + if err != nil { + log.Errorf("Get SysApi Page error, %s", err.Error()) + e.Error(http.StatusInternalServerError, err, "查询失败") + return + } + + e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") +} + +// GetSysApi 获取接口管理 +// @Summary 获取接口管理 +// @Description 获取接口管理 +// @Tags 接口管理 +// @Param id path string false "id" +// @Success 200 {object} response.Response{data=models.SysApi} "{"code": 200, "data": [...]}" +// @Router /api/v1/sys_api/{id} [get] +// @Security Bearer +func (e SysApi) GetSysApi(c *gin.Context) { + e.MakeContext(c) + log := e.GetLogger() + db, err := e.GetOrm() + if err != nil { + log.Error(err) + return + } + + control := new(dto.SysApiById) + + //查看详情 + err = e.Bind(control) + if err != nil { + log.Warnf("request body bind error, %s", err.Error()) + e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") + return + } + var object models.SysApi + + //数据权限检查 + p := actions.GetPermissionFromContext(c) + + serviceSysApi := service.SysApi{} + serviceSysApi.Log = log + serviceSysApi.Orm = db + err = serviceSysApi.GetSysApi(control, p, &object) + if err != nil { + log.Errorf("Get SysApi error, %s", err.Error()) + e.Error(http.StatusInternalServerError, err, "查询失败") + return + } + + e.OK(object, "查看成功") +} + +// UpdateSysApi 修改接口管理 +// @Summary 修改接口管理 +// @Description 修改接口管理 +// @Tags 接口管理 +// @Accept application/json +// @Product application/json +// @Param data body dto.SysApiControl true "body" +// @Success 200 {object} response.Response "{"code": 200, "message": "修改成功"}" +// @Router /api/v1/sys_api/{id} [put] +// @Security Bearer +func (e SysApi) UpdateSysApi(c *gin.Context) { + e.MakeContext(c) + log := e.GetLogger() + db, err := e.GetOrm() + if err != nil { + log.Error(err) + return + } + + control := new(dto.SysApiControl) + + //更新操作 + err = control.Bind(c) + if err != nil { + log.Warnf("request body bind error, %s", err.Error()) + e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") + return + } + object, err := control.GenerateM() + if err != nil { + log.Errorf("generate SysApi model error, %s", err.Error()) + e.Error(http.StatusInternalServerError, err, "模型生成失败") + return + } + object.SetUpdateBy(user.GetUserId(c)) + + //数据权限检查 + p := actions.GetPermissionFromContext(c) + + serviceSysApi := service.SysApi{} + serviceSysApi.Orm = db + serviceSysApi.Log = log + err = serviceSysApi.UpdateSysApi(object.(*models.SysApi), p) + if err != nil { + log.Errorf("Update SysApi error, %s", err.Error()) + e.Error(http.StatusInternalServerError, err, "更新失败") + return + } + e.OK(object.GetId(), "更新成功") +} + +// DeleteSysApi 删除接口管理 +// @Summary 删除接口管理 +// @Description 删除接口管理 +// @Tags 接口管理 +// @Param ids body []int false "ids" +// @Success 200 {object} response.Response "{"code": 200, "message": "删除成功"}" +// @Router /api/v1/sys_api [delete] +// @Security Bearer +func (e SysApi) DeleteSysApi(c *gin.Context) { + e.MakeContext(c) + log := e.GetLogger() + db, err := e.GetOrm() + if err != nil { + log.Error(err) + return + } + + control := new(dto.SysApiById) + + //删除操作 + err = control.Bind(c) + if err != nil { + log.Warnf("request body bind error, %s", err.Error()) + e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") + return + } + + // 设置编辑人 + control.SetUpdateBy(user.GetUserId(c)) + + // 数据权限检查 + p := actions.GetPermissionFromContext(c) + + serviceSysApi := service.SysApi{} + serviceSysApi.Orm = db + serviceSysApi.Log = log + err = serviceSysApi.RemoveSysApi(control, p) + if err != nil { + log.Errorf("Remove SysApi error, %s", err.Error()) + e.Error(http.StatusInternalServerError, err, "删除失败") + return + } + e.OK(control.GetId(), "删除成功") +} \ No newline at end of file diff --git a/app/admin/apis/sys_config.go b/app/admin/apis/sys_config.go index fdb1d30..0a13f3f 100644 --- a/app/admin/apis/sys_config.go +++ b/app/admin/apis/sys_config.go @@ -2,12 +2,12 @@ package apis import ( "github.com/gin-gonic/gin/binding" + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -18,7 +18,7 @@ type SysConfig struct { } func (e SysConfig) GetSysConfigList(c *gin.Context) { - e.SetContext(c) //Context = c + e.MakeContext(c) log := e.GetLogger() d := new(dto.SysConfigSearch) db, err := e.GetOrm() @@ -35,7 +35,7 @@ func (e SysConfig) GetSysConfigList(c *gin.Context) { return } - list := make([]system.SysConfig, 0) + list := make([]models.SysConfig, 0) var count int64 s := service.SysConfig{} s.Log = log @@ -69,7 +69,7 @@ func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) { // 控制只读前台的数据 d.IsFrontend = 1 - list := make([]system.SysConfig, 0) + list := make([]models.SysConfig, 0) s := service.SysConfig{} s.Log = log s.Orm = db @@ -107,7 +107,7 @@ func (e SysConfig) GetSysConfig(c *gin.Context) { e.Error(500, err, "Orm获取失败") return } - var object system.SysConfig + var object models.SysConfig serviceSysLoginLog := service.SysConfig{} serviceSysLoginLog.Log = log @@ -272,4 +272,4 @@ func (e SysConfig) GetSysConfigByKEYForService(c *gin.Context) { return } e.OK(v, s.Msg) -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_dept.go b/app/admin/apis/sys_dept.go index e718956..d9c2efd 100644 --- a/app/admin/apis/sys_dept.go +++ b/app/admin/apis/sys_dept.go @@ -2,13 +2,13 @@ package apis import ( "github.com/go-admin-team/go-admin-core/sdk/pkg" + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -44,7 +44,7 @@ func (e SysDept) GetSysDeptList(c *gin.Context) { return } - list := make([]system.SysDept, 0) + list := make([]models.SysDept, 0) serviceStudent := service.SysDept{} serviceStudent.Log = log serviceStudent.Orm = db @@ -81,7 +81,7 @@ func (e SysDept) GetSysDept(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysDept + var object models.SysDept serviceSysOperlog := service.SysDept{} serviceSysOperlog.Log = log @@ -291,4 +291,4 @@ func (e SysDept) GetDeptTreeRoleSelect(c *gin.Context) { "depts": result, "checkedKeys": menuIds, }, "") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_dict_data.go b/app/admin/apis/sys_dict_data.go index d708bf7..faa51c7 100644 --- a/app/admin/apis/sys_dict_data.go +++ b/app/admin/apis/sys_dict_data.go @@ -1,13 +1,13 @@ package apis import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -48,7 +48,7 @@ func (e SysDictData) GetSysDictDataList(c *gin.Context) { return } - list := make([]system.SysDictData, 0) + list := make([]models.SysDictData, 0) var count int64 s := service.SysDictData{} s.Log = log @@ -87,7 +87,7 @@ func (e SysDictData) GetSysDictData(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysDictData + var object models.SysDictData s := service.SysDictData{} s.Log = log @@ -136,7 +136,7 @@ func (e SysDictData) InsertSysDictData(c *gin.Context) { s := service.SysDictData{} s.Orm = db s.Log = log - err = s.Insert(object.(*system.SysDictData)) + err = s.Insert(object.(*models.SysDictData)) if err != nil { log.Errorf("Insert error, %s", err) e.Error(http.StatusInternalServerError, err, "创建失败") @@ -179,7 +179,7 @@ func (e SysDictData) UpdateSysDictData(c *gin.Context) { s := service.SysDictData{} s.Orm = db s.Log = log - err = s.Update(object.(*system.SysDictData)) + err = s.Update(object.(*models.SysDictData)) if err != nil { log.Errorf("Update error, %s", err) e.Error(http.StatusInternalServerError, err, "更新失败") @@ -226,7 +226,7 @@ func (e SysDictData) DeleteSysDictData(c *gin.Context) { s := service.SysDictData{} s.Orm = db s.Log = log - err = s.Remove(req, object.(*system.SysDictData)) + err = s.Remove(req, object.(*models.SysDictData)) if err != nil { log.Errorf("Remove error, %s", err) e.Error(http.StatusInternalServerError, err, "删除失败") @@ -254,7 +254,7 @@ func (e SysDictData) GetSysDictDataAll(c *gin.Context) { return } - list := make([]system.SysDictData, 0) + list := make([]models.SysDictData, 0) s := service.SysDictData{} s.Log = log s.Orm = db @@ -266,4 +266,4 @@ func (e SysDictData) GetSysDictDataAll(c *gin.Context) { } e.OK(list, "查询成功") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_dict_type.go b/app/admin/apis/sys_dict_type.go index bc8fda2..6391f15 100644 --- a/app/admin/apis/sys_dict_type.go +++ b/app/admin/apis/sys_dict_type.go @@ -1,13 +1,13 @@ package apis import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -47,7 +47,7 @@ func (e SysDictType) GetSysDictTypeList(c *gin.Context) { return } - list := make([]system.SysDictType, 0) + list := make([]models.SysDictType, 0) var count int64 s := service.SysDictType{} s.Log = log @@ -84,7 +84,7 @@ func (e SysDictType) GetSysDictType(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysDictType + var object models.SysDictType s := service.SysDictType{} s.Log = log @@ -131,7 +131,7 @@ func (e SysDictType) InsertSysDictType(c *gin.Context) { s := service.SysDictType{} s.Orm = db s.Log = log - err = s.Insert(object.(*system.SysDictType)) + err = s.Insert(object.(*models.SysDictType)) if err != nil { log.Error(err) e.Error(http.StatusInternalServerError, err, "创建失败") @@ -173,7 +173,7 @@ func (e SysDictType) UpdateSysDictType(c *gin.Context) { s := service.SysDictType{} s.Orm = db s.Log = log - err = s.Update(object.(*system.SysDictType)) + err = s.Update(object.(*models.SysDictType)) if err != nil { log.Error(err) return @@ -218,7 +218,7 @@ func (e SysDictType) DeleteSysDictType(c *gin.Context) { s := service.SysDictType{} s.Orm = db s.Log = log - err = s.Remove(req, object.(*system.SysDictType)) + err = s.Remove(req, object.(*models.SysDictType)) if err != nil { log.Error(err) return @@ -253,7 +253,7 @@ func (e SysDictType) GetSysDictTypeAll(c *gin.Context) { return } - list := make([]system.SysDictType, 0) + list := make([]models.SysDictType, 0) s := service.SysDictType{} s.Log = log s.Orm = db @@ -264,4 +264,4 @@ func (e SysDictType) GetSysDictTypeAll(c *gin.Context) { } e.OK(list, "查询成功") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_login_log.go b/app/admin/apis/sys_login_log.go index f604c58..f3a79dd 100644 --- a/app/admin/apis/sys_login_log.go +++ b/app/admin/apis/sys_login_log.go @@ -1,12 +1,12 @@ package apis import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -33,7 +33,7 @@ func (e SysLoginLog) GetSysLoginLogList(c *gin.Context) { return } - list := make([]system.SysLoginLog, 0) + list := make([]models.SysLoginLog, 0) var count int64 serviceStudent := service.SysLoginLog{} serviceStudent.Log = log @@ -63,7 +63,7 @@ func (e SysLoginLog) GetSysLoginLog(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysLoginLog + var object models.SysLoginLog serviceSysLoginLog := service.SysLoginLog{} serviceSysLoginLog.Log = log @@ -185,4 +185,4 @@ func (e SysLoginLog) DeleteSysLoginLog(c *gin.Context) { return } e.OK(object.GetId(), "删除成功") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_menu.go b/app/admin/apis/sys_menu.go index ca3ec62..15ab0d1 100644 --- a/app/admin/apis/sys_menu.go +++ b/app/admin/apis/sys_menu.go @@ -1,12 +1,12 @@ package apis import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -41,7 +41,7 @@ func (e SysMenu) GetSysMenuList(c *gin.Context) { return } - var list *[]system.SysMenu + var list *[]models.SysMenu serviceSysMenu := service.SysMenu{} serviceSysMenu.Log = log serviceSysMenu.Orm = db @@ -54,6 +54,7 @@ func (e SysMenu) GetSysMenuList(c *gin.Context) { e.OK(list, "查询成功") } +// GetSysMenu 获取菜单详情 // @Summary Menu详情数据 // @Description 获取JSON // @Tags 菜单 @@ -80,7 +81,7 @@ func (e SysMenu) GetSysMenu(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysMenu + var object models.SysMenu serviceSysMenu := service.SysMenu{} serviceSysMenu.Log = log @@ -94,6 +95,7 @@ func (e SysMenu) GetSysMenu(c *gin.Context) { e.OK(object, "查看成功") } +// InsertSysMenu 创建菜单 // @Summary 创建菜单 // @Description 获取JSON // @Tags 菜单 @@ -111,43 +113,36 @@ func (e SysMenu) GetSysMenu(c *gin.Context) { // @Security Bearer func (e SysMenu) InsertSysMenu(c *gin.Context) { control := new(dto.SysMenuControl) - - e.Context = c - log := e.GetLogger() - - db, err := e.GetOrm() + err := e.MakeContext(c). + MakeOrm(). + Errors if err != nil { - log.Error(err) + e.Error(http.StatusInternalServerError, err, err.Error()) + e.Logger.Error(err) return } - //新增操作 - err = control.Bind(c) + // 绑定数据 + err = e.Bind(control) if err != nil { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } + // 设置创建人 - object.SetCreateBy(user.GetUserId(c)) + control.SetCreateBy(user.GetUserId(c)) serviceSysMenu := service.SysMenu{} - serviceSysMenu.Orm = db - serviceSysMenu.Log = log - err = serviceSysMenu.InsertSysMenu(object) + err = serviceSysMenu.MakeLog(e.Logger).MakeOrm(e.Orm).InsertSysMenu(control).Error if err != nil { - log.Error(err) + e.Logger.Error(err) e.Error(http.StatusInternalServerError, err, "创建失败") return } - - e.OK(object.GetId(), "创建成功") + e.OK(control.GetId(), "创建成功") } +// UpdateSysMenu 修改菜单 // @Summary 修改菜单 // @Description 获取JSON // @Tags 菜单 @@ -161,40 +156,36 @@ func (e SysMenu) InsertSysMenu(c *gin.Context) { // @Security Bearer func (e SysMenu) UpdateSysMenu(c *gin.Context) { control := new(dto.SysMenuControl) - - e.Context = c - log := e.GetLogger() - - db, err := e.GetOrm() + err := e.MakeContext(c). + MakeOrm(). + Errors if err != nil { - log.Error(err) + e.Logger.Error(err) return } - //更新操作 - err = control.Bind(c) + // 绑定数据 + err = e.Bind(control) if err != nil { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - object, err := control.Generate() - if err != nil { - e.Error(http.StatusInternalServerError, err, "模型生成失败") - return - } - object.SetUpdateBy(user.GetUserId(c)) + control.SetUpdateBy(user.GetUserId(c)) serviceSysMenu := service.SysMenu{} - serviceSysMenu.Orm = db - serviceSysMenu.Log = log - err = serviceSysMenu.UpdateSysMenu(object) + err = serviceSysMenu. + MakeOrm(e.Orm). + MakeLog(e.Logger). + UpdateSysMenu(control).Error + if err != nil { - log.Error(err) + e.Logger.Error(err) return } - e.OK(object.GetId(), "更新成功") + e.OK(control.GetId(), "更新成功") } +// DeleteSysMenu 删除菜单 // @Summary 删除菜单 // @Description 删除数据 // @Tags 菜单 @@ -234,6 +225,7 @@ func (e SysMenu) DeleteSysMenu(c *gin.Context) { e.OK(control.GetId(), "删除成功") } +// GetMenuRole 根据角色名称获取菜单列表数据(左菜单使用) // @Summary 根据角色名称获取菜单列表数据(左菜单使用) // @Description 获取JSON // @Tags 菜单 @@ -264,6 +256,7 @@ func (e SysMenu) GetMenuRole(c *gin.Context) { e.OK(result, "") } +// GetMenuIDS 获取角色对应的菜单id数组 // @Summary 获取角色对应的菜单id数组 // @Description 获取JSON // @Tags 菜单 @@ -280,7 +273,7 @@ func (e SysMenu) GetMenuIDS(c *gin.Context) { log.Error(err) return } - var data system.RoleMenu + var data models.RoleMenu data.RoleName = c.GetString("role") data.UpdateBy = user.GetUserId(c) result, err := data.GetIDS(db) @@ -292,33 +285,7 @@ func (e SysMenu) GetMenuIDS(c *gin.Context) { e.OK(result, "") } -//// GetMenuTreeRoleselect 角色修改中的菜单列表 -//func (e SysMenu) GetMenuTreeRoleselect(c *gin.Context) { -// var Menu models.Menu -// var SysRole models.SysRole -// -// id, err := tools.StringToInt(c.Param("roleId")) -// SysRole.RoleId = id -// //var r *models.SysRole -// r, err := SysRole.Get() -// -// var result *[]models.MenuLable -// menuIds := make([]int, 0) -// if r.RoleKey != "admin" { -// result, err = Menu.SetMenuLabel() -// tools.HasError(err, "抱歉未找到相关信息", -1) -// if id != 0 { -// menuIds, err = SysRole.GetRoleMeunId() -// tools.HasError(err, "抱歉未找到相关信息", -1) -// } -// } -// app.Custum(c, gin.H{ -// "code": 200, -// "menus": result, -// "checkedKeys": menuIds, -// }) -//} - +// GetMenuTreeSelect 获取菜单树 // @Summary 获取菜单树 // @Description 获取JSON // @Tags 菜单 @@ -366,4 +333,4 @@ func (e SysMenu) GetMenuTreeSelect(c *gin.Context) { "menus": result, "checkedKeys": menuIds, }, "获取成功") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_opera_log.go b/app/admin/apis/sys_opera_log.go index 2dbc31e..f3858a7 100644 --- a/app/admin/apis/sys_opera_log.go +++ b/app/admin/apis/sys_opera_log.go @@ -1,12 +1,12 @@ package apis import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -33,7 +33,7 @@ func (e SysOperaLog) GetSysOperaLogList(c *gin.Context) { return } - list := make([]system.SysOperaLog, 0) + list := make([]models.SysOperaLog, 0) var count int64 serviceStudent := service.SysOperaLog{} serviceStudent.Log = log @@ -63,7 +63,7 @@ func (e SysOperaLog) GetSysOperaLog(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysOperaLog + var object models.SysOperaLog serviceSysOperlog := service.SysOperaLog{} serviceSysOperlog.Log = log @@ -175,4 +175,4 @@ func (e SysOperaLog) DeleteSysOperaLog(c *gin.Context) { return } e.OK(control.GetId(), "删除成功") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_post.go b/app/admin/apis/sys_post.go index 6ec209f..e119d89 100644 --- a/app/admin/apis/sys_post.go +++ b/app/admin/apis/sys_post.go @@ -1,13 +1,13 @@ package apis import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -44,7 +44,7 @@ func (e SysPost) GetSysPostList(c *gin.Context) { return } - list := make([]system.SysPost, 0) + list := make([]models.SysPost, 0) var count int64 serviceStudent := service.SysPost{} serviceStudent.Log = log @@ -81,7 +81,7 @@ func (e SysPost) GetSysPost(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysPost + var object models.SysPost serviceSysOperlog := service.SysPost{} serviceSysOperlog.Log = log @@ -220,4 +220,4 @@ func (e SysPost) DeleteSysPost(c *gin.Context) { return } e.OK(control.GetId(), "删除成功") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_role.go b/app/admin/apis/sys_role.go index a4f31f1..9e924a3 100644 --- a/app/admin/apis/sys_role.go +++ b/app/admin/apis/sys_role.go @@ -1,13 +1,13 @@ package apis import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/apis" @@ -46,7 +46,7 @@ func (e SysRole) GetSysRoleList(c *gin.Context) { return } - list := make([]system.SysRole, 0) + list := make([]models.SysRole, 0) var count int64 s := service.SysRole{} s.Log = log @@ -84,7 +84,7 @@ func (e SysRole) GetSysRole(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysRole + var object models.SysRole s := service.SysRole{} s.Log = log @@ -261,7 +261,7 @@ func (e SysRole) UpdateRoleDataScope(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - data := &system.SysRole{ + data := &models.SysRole{ RoleId: control.RoleId, DataScope: control.DataScope, DeptIds: control.DeptIds, @@ -276,4 +276,4 @@ func (e SysRole) UpdateRoleDataScope(c *gin.Context) { return } e.OK(nil, "操作成功") -} +} \ No newline at end of file diff --git a/app/admin/apis/sys_user.go b/app/admin/apis/sys_user.go index a8d2c19..d9ed47c 100644 --- a/app/admin/apis/sys_user.go +++ b/app/admin/apis/sys_user.go @@ -1,6 +1,7 @@ package apis import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" @@ -8,7 +9,6 @@ import ( _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" "github.com/google/uuid" - "go-admin/app/admin/models/system" "go-admin/app/admin/service" "go-admin/app/admin/service/dto" "go-admin/common/actions" @@ -51,7 +51,7 @@ func (e SysUser) GetSysUserList(c *gin.Context) { //数据权限检查 p := actions.GetPermissionFromContext(c) - list := make([]system.SysUser, 0) + list := make([]models.SysUser, 0) var count int64 serviceStudent := service.SysUser{} serviceStudent.Log = log @@ -89,7 +89,7 @@ func (e SysUser) GetSysUser(c *gin.Context) { e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") return } - var object system.SysUser + var object models.SysUser //数据权限检查 p := actions.GetPermissionFromContext(c) @@ -288,7 +288,7 @@ func (e SysUser) InsetSysUserAvatar(c *gin.Context) { } } - object := &system.SysUser{ + object := &models.SysUser{ UserId: p.UserId, Avatar: "/" + filPath, } @@ -363,9 +363,9 @@ func (e SysUser) GetSysUserProfile(c *gin.Context) { serviceSysUser := service.SysUser{} serviceSysUser.Log = log serviceSysUser.Orm = db - user := new(system.SysUser) - roles := make([]system.SysRole, 0) - posts := make([]system.SysPost, 0) + user := new(models.SysUser) + roles := make([]models.SysRole, 0) + posts := make([]models.SysPost, 0) err = serviceSysUser.GetSysUserProfile(id, user, &roles, &posts) if err != nil { log.Errorf("get user profile error, %s", err.Error()) @@ -432,7 +432,7 @@ func (e SysUser) GetInfo(c *gin.Context) { var buttons = make([]string, 1) buttons[0] = "*:*:*" - RoleMenu := system.RoleMenu{} + RoleMenu := models.RoleMenu{} RoleMenu.RoleId = user.GetRoleId(c) var mp = make(map[string]interface{}) @@ -446,7 +446,7 @@ func (e SysUser) GetInfo(c *gin.Context) { mp["buttons"] = list } - var sysUser system.SysUser + var sysUser models.SysUser req := new(dto.SysUserById) req.Id = user.GetUserId(c) serviceSysUser := service.SysUser{} @@ -469,4 +469,4 @@ func (e SysUser) GetInfo(c *gin.Context) { mp["deptId"] = sysUser.DeptId mp["name"] = sysUser.NickName e.OK(mp, "") -} +} \ No newline at end of file diff --git a/app/admin/apis/tools/gen.go b/app/admin/apis/tools/gen.go index 2f4c52a..5292111 100644 --- a/app/admin/apis/tools/gen.go +++ b/app/admin/apis/tools/gen.go @@ -490,70 +490,70 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { Amenu.UpdatedAt = timeNow Amenu.MenuId, err = Amenu.Create(db) - AList := models.SysApi{} - AList.Name = "" - AList.Title = "分页获取" + tab.TableComment - AList.Path = "/api/v1/" + tab.ModuleFrontName - AList.Action = "GET" - AList.ParentId = Amenu.MenuId - AList.Sort = 0 - AList.CreateBy = 1 - AList.UpdateBy = 1 - AList.CreatedAt = timeNow - AList.UpdatedAt = timeNow - AList.Id, err = AList.Create(db) - - AGet := models.SysApi{} - AList.Name = "" - AGet.Title = "根据id获取" + tab.TableComment - AGet.Path = "/api/v1/" + tab.ModuleFrontName + "/:id" - AGet.Action = "GET" - AGet.ParentId = Amenu.MenuId - AGet.Sort = 0 - AGet.CreateBy = 1 - AGet.UpdateBy = 1 - AGet.CreatedAt = timeNow - AGet.UpdatedAt = timeNow - AGet.Id, err = AGet.Create(db) - - ACreate := models.SysApi{} - AList.Name = "" - ACreate.Title = "创建" + tab.TableComment - ACreate.Path = "/api/v1/" + tab.ModuleFrontName - ACreate.Action = "POST" - ACreate.ParentId = Amenu.MenuId - ACreate.Sort = 0 - ACreate.CreateBy = 1 - ACreate.UpdateBy = 1 - ACreate.CreatedAt = timeNow - ACreate.UpdatedAt = timeNow - ACreate.Id, err = ACreate.Create(db) - - AUpdate := models.SysApi{} - AList.Name = "" - AUpdate.Title = "修改" + tab.TableComment - AUpdate.Path = "/api/v1/" + tab.ModuleFrontName + "/:id" - AUpdate.Action = "PUT" - AUpdate.ParentId = Amenu.MenuId - AUpdate.Sort = 0 - AUpdate.CreateBy = 1 - AUpdate.UpdateBy = 1 - AUpdate.CreatedAt = timeNow - AUpdate.UpdatedAt = timeNow - AUpdate.Id, err = AUpdate.Create(db) - - ADelete := models.SysApi{} - AList.Name = "" - ADelete.Title = "删除" + tab.TableComment - ADelete.Path = "/api/v1/" + tab.ModuleFrontName - ADelete.Action = "DELETE" - ADelete.ParentId = Amenu.MenuId - ADelete.Sort = 0 - ADelete.CreateBy = 1 - ADelete.UpdateBy = 1 - ADelete.CreatedAt = timeNow - ADelete.UpdatedAt = timeNow - ADelete.Id, err = ADelete.Create(db) + //AList := models.SysApi{} + //AList.Name = "" + //AList.Title = "分页获取" + tab.TableComment + //AList.Path = "/api/v1/" + tab.ModuleFrontName + //AList.Action = "GET" + //AList.ParentId = Amenu.MenuId + //AList.Sort = 0 + //AList.CreateBy = 1 + //AList.UpdateBy = 1 + //AList.CreatedAt = timeNow + //AList.UpdatedAt = timeNow + //AList.Id, err = AList.Create(db) + // + //AGet := models.SysApi{} + //AList.Name = "" + //AGet.Title = "根据id获取" + tab.TableComment + //AGet.Path = "/api/v1/" + tab.ModuleFrontName + "/:id" + //AGet.Action = "GET" + //AGet.ParentId = Amenu.MenuId + //AGet.Sort = 0 + //AGet.CreateBy = 1 + //AGet.UpdateBy = 1 + //AGet.CreatedAt = timeNow + //AGet.UpdatedAt = timeNow + //AGet.Id, err = AGet.Create(db) + // + //ACreate := models.SysApi{} + //AList.Name = "" + //ACreate.Title = "创建" + tab.TableComment + //ACreate.Path = "/api/v1/" + tab.ModuleFrontName + //ACreate.Action = "POST" + //ACreate.ParentId = Amenu.MenuId + //ACreate.Sort = 0 + //ACreate.CreateBy = 1 + //ACreate.UpdateBy = 1 + //ACreate.CreatedAt = timeNow + //ACreate.UpdatedAt = timeNow + //ACreate.Id, err = ACreate.Create(db) + // + //AUpdate := models.SysApi{} + //AList.Name = "" + //AUpdate.Title = "修改" + tab.TableComment + //AUpdate.Path = "/api/v1/" + tab.ModuleFrontName + "/:id" + //AUpdate.Action = "PUT" + //AUpdate.ParentId = Amenu.MenuId + //AUpdate.Sort = 0 + //AUpdate.CreateBy = 1 + //AUpdate.UpdateBy = 1 + //AUpdate.CreatedAt = timeNow + //AUpdate.UpdatedAt = timeNow + //AUpdate.Id, err = AUpdate.Create(db) + // + //ADelete := models.SysApi{} + //AList.Name = "" + //ADelete.Title = "删除" + tab.TableComment + //ADelete.Path = "/api/v1/" + tab.ModuleFrontName + //ADelete.Action = "DELETE" + //ADelete.ParentId = Amenu.MenuId + //ADelete.Sort = 0 + //ADelete.CreateBy = 1 + //ADelete.UpdateBy = 1 + //ADelete.CreatedAt = timeNow + //ADelete.UpdatedAt = timeNow + //ADelete.Id, err = ADelete.Create(db) e.OK("", "数据生成成功!") -} +} \ No newline at end of file diff --git a/app/admin/models/system/casbin_rule.go b/app/admin/models/casbin_rule.go similarity index 96% rename from app/admin/models/system/casbin_rule.go rename to app/admin/models/casbin_rule.go index 7563420..f4ef826 100644 --- a/app/admin/models/system/casbin_rule.go +++ b/app/admin/models/casbin_rule.go @@ -1,4 +1,4 @@ -package system +package models //sys_casbin_rule type CasbinRule struct { @@ -13,4 +13,4 @@ type CasbinRule struct { func (CasbinRule) TableName() string { return "sys_casbin_rule" -} +} \ No newline at end of file diff --git a/app/admin/models/system/datascope.go b/app/admin/models/datascope.go similarity index 99% rename from app/admin/models/system/datascope.go rename to app/admin/models/datascope.go index a95acfd..3c384c8 100644 --- a/app/admin/models/system/datascope.go +++ b/app/admin/models/datascope.go @@ -1,4 +1,4 @@ -package system +package models import ( "errors" @@ -78,4 +78,4 @@ func DataScopes(tableName string, userId int) func(db *gorm.DB) *gorm.DB { } return db } -} +} \ No newline at end of file diff --git a/app/admin/models/menu.go b/app/admin/models/menu.go index 0e1d5f0..cbd8658 100644 --- a/app/admin/models/menu.go +++ b/app/admin/models/menu.go @@ -6,34 +6,33 @@ import ( "go-admin/common/models" "gorm.io/gorm" - - "go-admin/app/admin/models/system" ) type Menu struct { - MenuId int `json:"menuId" gorm:"primaryKey;autoIncrement"` - MenuName string `json:"menuName" gorm:"size:128;"` - Title string `json:"title" gorm:"size:128;"` - Icon string `json:"icon" gorm:"size:128;"` - Path string `json:"path" gorm:"size:128;"` - Paths string `json:"paths" gorm:"size:128;"` - MenuType string `json:"menuType" gorm:"size:1;"` - Action string `json:"action" gorm:"size:16;"` - Permission string `json:"permission" gorm:"size:255;"` - ParentId int `json:"parentId" gorm:"size:11;"` - NoCache bool `json:"noCache" gorm:"size:8;"` - Breadcrumb string `json:"breadcrumb" gorm:"size:255;"` - Component string `json:"component" gorm:"size:255;"` - Sort int `json:"sort" gorm:"size:4;"` - Visible string `json:"visible" gorm:"size:1;"` - CreateBy string `json:"createBy" gorm:"size:128;"` - UpdateBy string `json:"updateBy" gorm:"size:128;"` - IsFrame string `json:"isFrame" gorm:"size:1;DEFAULT:0;"` - DataScope string `json:"dataScope" gorm:"-"` - Params string `json:"params" gorm:"-"` - RoleId int `gorm:"-"` - Children []Menu `json:"children" gorm:"-"` - IsSelect bool `json:"is_select" gorm:"-"` + MenuId int `json:"menuId" gorm:"primaryKey;autoIncrement"` + MenuName string `json:"menuName" gorm:"size:128;"` + Title string `json:"title" gorm:"size:128;"` + Icon string `json:"icon" gorm:"size:128;"` + Path string `json:"path" gorm:"size:128;"` + Paths string `json:"paths" gorm:"size:128;"` + MenuType string `json:"menuType" gorm:"size:1;"` + Action string `json:"action" gorm:"size:16;"` + Permission string `json:"permission" gorm:"size:255;"` + ParentId int `json:"parentId" gorm:"size:11;"` + NoCache bool `json:"noCache" gorm:"size:8;"` + Breadcrumb string `json:"breadcrumb" gorm:"size:255;"` + Component string `json:"component" gorm:"size:255;"` + Sort int `json:"sort" gorm:"size:4;"` + Visible string `json:"visible" gorm:"size:1;"` + CreateBy string `json:"createBy" gorm:"size:128;"` + UpdateBy string `json:"updateBy" gorm:"size:128;"` + IsFrame string `json:"isFrame" gorm:"size:1;DEFAULT:0;"` + DataScope string `json:"dataScope" gorm:"-"` + Params string `json:"params" gorm:"-"` + RoleId int `gorm:"-"` + Children []Menu `json:"children" gorm:"-"` + IsSelect bool `json:"is_select" gorm:"-"` + models.ModelTime } @@ -83,160 +82,6 @@ type MenuRole struct { type MS []Menu -//func (e *Menu) GetByMenuId() (Menu Menu, err error) { -// -// table := orm.Eloquent.Table(e.TableName()) -// table = table.Where("menu_id = ?", e.MenuId) -// if err = table.Find(&Menu).Error; err != nil { -// return -// } -// return -//} - -//func (e *Menu) SetMenu() (m []Menu, err error) { -// menulist, err := e.GetPage() -// -// m = make([]Menu, 0) -// for i := 0; i < len(menulist); i++ { -// if menulist[i].ParentId != 0 { -// continue -// } -// menusInfo := DiguiMenu(&menulist, menulist[i]) -// -// m = append(m, menusInfo) -// } -// return -//} - -//func DiguiMenu(menulist *[]Menu, menu Menu) Menu { -// list := *menulist -// -// min := make([]Menu, 0) -// for j := 0; j < len(list); j++ { -// -// if menu.MenuId != list[j].ParentId { -// continue -// } -// mi := Menu{} -// mi.MenuId = list[j].MenuId -// mi.MenuName = list[j].MenuName -// mi.Title = list[j].Title -// mi.Icon = list[j].Icon -// mi.Path = list[j].Path -// mi.MenuType = list[j].MenuType -// mi.Action = list[j].Action -// mi.Permission = list[j].Permission -// mi.ParentId = list[j].ParentId -// mi.NoCache = list[j].NoCache -// mi.Breadcrumb = list[j].Breadcrumb -// mi.Component = list[j].Component -// mi.Sort = list[j].Sort -// mi.Visible = list[j].Visible -// mi.CreatedAt = list[j].CreatedAt -// mi.Children = []Menu{} -// -// if mi.MenuType != "F" { -// ms := DiguiMenu(menulist, mi) -// min = append(min, ms) -// -// } else { -// min = append(min, mi) -// } -// -// } -// menu.Children = min -// return menu -//} - -//func (e *Menu) SetMenuLabel() (m *[]MenuLable, err error) { -// menulist, err := e.Get() -// -// ml := make([]MenuLable, 0) -// for i := 0; i < len(menulist); i++ { -// if menulist[i].ParentId != 0 { -// continue -// } -// e := MenuLable{} -// e.Id = menulist[i].MenuId -// e.Label = menulist[i].Title -// menusInfo := MenuLabelCall(&menulist, e) -// -// ml = append(ml, menusInfo) -// } -// return &ml, err -//} - -//func MenuLabelCall(menulist *[]Menu, menu MenuLable) MenuLable { -// list := *menulist -// -// min := make([]MenuLable, 0) -// for j := 0; j < len(list); j++ { -// -// if menu.Id != list[j].ParentId { -// continue -// } -// mi := MenuLable{} -// mi.Id = list[j].MenuId -// mi.Label = list[j].Title -// mi.Children = []MenuLable{} -// if list[j].MenuType != "F" { -// ms := MenuLabelCall(menulist, mi) -// min = append(min, ms) -// } else { -// min = append(min, mi) -// } -// -// } -// if len(min) > 0 { -// menu.Children = min -// } else { -// menu.Children = nil -// } -// return menu -//} - -//func (e *Menu) SetMenuRole(roleName string) (m []Menu, err error) { -// -// menus, err := e.GetByRoleName(roleName) -// -// m = make([]Menu, 0) -// for i := 0; i < len(menus); i++ { -// if menus[i].ParentId != 0 { -// continue -// } -// menusInfo := DiguiMenu(&menus, menus[i]) -// -// m = append(m, menusInfo) -// } -// return -//} - -//func (e *MenuRole) Get(tx *gorm.DB) (Menus []MenuRole, err error) { -// table := tx.Table(e.TableName()) -// if e.MenuName != "" { -// table = table.Where("menu_name = ?", e.MenuName) -// } -// if err = table.Order("sort").Find(&Menus).Error; err != nil { -// return -// } -// return -//} - -//func (e *Menu) GetByRoleName(roleName string) (Menus []Menu, err error) { -// var table *gorm.DB -// if roleName == "admin" { -// table = orm.Eloquent.Table(e.TableName()).Select("sys_menu.*") -// table = table.Where(" menu_type in ('M','C')") -// } else { -// table = orm.Eloquent.Table(e.TableName()).Select("sys_menu.*").Joins("left join sys_role_menu on sys_role_menu.menu_id=sys_menu.menu_id") -// table = table.Where("sys_role_menu.role_name=? and menu_type in ('M','C')", roleName) -// } -// if err = table.Order("sort").Find(&Menus).Error; err != nil { -// return -// } -// return -//} - func (e *Menu) Get(tx *gorm.DB) (Menus []Menu, err error) { table := tx.Table(e.TableName()) if e.MenuName != "" { @@ -274,7 +119,7 @@ func (e *Menu) GetPage(tx *gorm.DB) (Menus []Menu, err error) { } // 数据权限控制 - dataPermission := new(system.DataPermission) + dataPermission := new(DataPermission) dataPermission.UserId, _ = pkg.StringToInt(e.DataScope) table, err = dataPermission.GetDataScope("sys_menu", table) if err != nil { @@ -314,30 +159,4 @@ func InitPaths(tx *gorm.DB, menu *Menu) (err error) { } tx.Table("sys_menu").Where("menu_id = ?", menu.MenuId).Update("paths", menu.Paths) return -} - -//func (e *Menu) Update(tx *gorm.DB, id int) (update Menu, err error) { -// if err = tx.Table(e.TableName()).First(&update, id).Error; err != nil { -// return -// } -// -// //参数1:是要修改的数据 -// //参数2:是修改的数据 -// if err = tx.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil { -// return -// } -// err = InitPaths(tx, e) -// if err != nil { -// return -// } -// return -//} - -//func (e *Menu) Delete(tx *gorm.DB, id int) (success bool, err error) { -// if err = tx.Table(e.TableName()).Where("menu_id = ?", id).Delete(&Menu{}).Error; err != nil { -// success = false -// return -// } -// success = true -// return -//} +} \ No newline at end of file diff --git a/app/admin/models/role.go b/app/admin/models/role.go index ef2086d..ac0990f 100644 --- a/app/admin/models/role.go +++ b/app/admin/models/role.go @@ -1,28 +1,26 @@ package models -import "go-admin/common/models" - -type SysRole struct { - RoleId int `json:"roleId" gorm:"primaryKey;autoIncrement"` // 角色编码 - RoleName string `json:"roleName" gorm:"size:128;"` // 角色名称 - Status string `json:"status" gorm:"size:4;"` // - RoleKey string `json:"roleKey" gorm:"size:128;"` //角色代码 - RoleSort int `json:"roleSort" gorm:""` //角色排序 - Flag string `json:"flag" gorm:"size:128;"` // - Remark string `json:"remark" gorm:"size:255;"` //备注 - Admin bool `json:"admin" gorm:"size:4;"` - DataScope string `json:"dataScope" gorm:"size:128;"` - models.ModelTime - models.ControlBy - - Params string `json:"params" gorm:"-"` - MenuIds []int `json:"menuIds" gorm:"-"` - DeptIds []int `json:"deptIds" gorm:"-"` -} - -func (SysRole) TableName() string { - return "sys_role" -} +//type SysRole struct { +// RoleId int `json:"roleId" gorm:"primaryKey;autoIncrement"` // 角色编码 +// RoleName string `json:"roleName" gorm:"size:128;"` // 角色名称 +// Status string `json:"status" gorm:"size:4;"` // +// RoleKey string `json:"roleKey" gorm:"size:128;"` //角色代码 +// RoleSort int `json:"roleSort" gorm:""` //角色排序 +// Flag string `json:"flag" gorm:"size:128;"` // +// Remark string `json:"remark" gorm:"size:255;"` //备注 +// Admin bool `json:"admin" gorm:"size:4;"` +// DataScope string `json:"dataScope" gorm:"size:128;"` +// models.ModelTime +// models.ControlBy +// +// Params string `json:"params" gorm:"-"` +// MenuIds []int `json:"menuIds" gorm:"-"` +// DeptIds []int `json:"deptIds" gorm:"-"` +//} +// +//func (SysRole) TableName() string { +// return "sys_role" +//} type MenuIdList struct { MenuId int `json:"menuId"` @@ -240,4 +238,4 @@ type MenuIdList struct { // } // // return true, nil -//} +//} \ No newline at end of file diff --git a/app/admin/models/system/role_dept.go b/app/admin/models/role_dept.go similarity index 91% rename from app/admin/models/system/role_dept.go rename to app/admin/models/role_dept.go index 526f42e..3ac8eba 100644 --- a/app/admin/models/system/role_dept.go +++ b/app/admin/models/role_dept.go @@ -1,4 +1,4 @@ -package system +package models //sys_role_dept type SysRoleDept struct { @@ -8,4 +8,4 @@ type SysRoleDept struct { func (SysRoleDept) TableName() string { return "sys_role_dept" -} +} \ No newline at end of file diff --git a/app/admin/models/system/role_menu.go b/app/admin/models/role_menu.go similarity index 99% rename from app/admin/models/system/role_menu.go rename to app/admin/models/role_menu.go index ed0f033..82d4d9a 100644 --- a/app/admin/models/system/role_menu.go +++ b/app/admin/models/role_menu.go @@ -1,8 +1,7 @@ -package system +package models import ( "fmt" - "github.com/casbin/casbin/v2" "github.com/go-admin-team/go-admin-core/sdk/pkg" "gorm.io/gorm" @@ -169,4 +168,4 @@ func (rm *RoleMenu) Delete(tx *gorm.DB, RoleId string, MenuID string) (bool, err } return true, nil -} +} \ No newline at end of file diff --git a/app/admin/models/sys_api.go b/app/admin/models/sys_api.go index 5245596..20e8ae5 100644 --- a/app/admin/models/sys_api.go +++ b/app/admin/models/sys_api.go @@ -3,21 +3,19 @@ package models import ( // "gorm.io/gorm" - "errors" - "github.com/go-admin-team/go-admin-core/sdk/pkg" "go-admin/common/models" - "gorm.io/gorm" ) type SysApi struct { - Id int `json:"id" gorm:"primaryKey;autoIncrement;comment:主键编码"` - Name string `json:"name" gorm:"type:varchar(128);comment:名称"` - Title string `json:"title" gorm:"type:varchar(128);comment:标题"` - Path string `json:"path" gorm:"type:varchar(128);comment:地址"` - Paths string `json:"paths" gorm:"type:varchar(128);comment:Paths"` - Action string `json:"action" gorm:"type:varchar(16);comment:类型"` - ParentId int `json:"parentId" gorm:"type:smallint(6);comment:按钮id"` - Sort int `json:"sort" gorm:"type:tinyint(4);comment:排序"` + Id int `json:"id" gorm:"primaryKey;autoIncrement;comment:主键编码"` + Handle string `json:"handle" gorm:"type:varchar(128);comment:handle"` + Title string `json:"title" gorm:"type:varchar(128);comment:标题"` + Permission string `json:"permission" gorm:"size:255;"` + Path string `json:"path" gorm:"type:varchar(128);comment:地址"` + Paths string `json:"paths" gorm:"type:varchar(128);comment:Paths"` + Action string `json:"action" gorm:"type:varchar(16);comment:类型"` + ParentId int `json:"parentId" gorm:"comment:按钮id"` + Sort int `json:"sort" gorm:"type:tinyint(4);comment:排序"` models.ModelTime models.ControlBy } @@ -33,34 +31,4 @@ func (e *SysApi) Generate() models.ActiveRecord { func (e *SysApi) GetId() interface{} { return e.Id -} - -func (e *SysApi) Create(tx *gorm.DB) (id int, err error) { - result := tx.Table(e.TableName()).Create(&e) - if result.Error != nil { - err = result.Error - return - } - err = e.InitPaths(tx) - if err != nil { - return - } - id = e.Id - return -} - -func (e *SysApi) InitPaths(tx *gorm.DB) (err error) { - parentMenu := new(Menu) - if e.ParentId != 0 { - tx.Table("sys_api").Where("id = ?", e.ParentId).First(parentMenu) - if parentMenu.Paths == "" { - err = errors.New("父级paths异常,请尝试对当前节点父级菜单进行更新操作!") - return - } - e.Paths = parentMenu.Paths + "/" + pkg.IntToString(e.Id) - } else { - e.Paths = "/0/" + pkg.IntToString(e.Id) - } - tx.Table("sys_api").Where("id = ?", e.ParentId).Update("paths", e.Paths) - return -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_config.go b/app/admin/models/sys_config.go similarity index 97% rename from app/admin/models/system/sys_config.go rename to app/admin/models/sys_config.go index 0075b5e..6e7e3a5 100644 --- a/app/admin/models/system/sys_config.go +++ b/app/admin/models/sys_config.go @@ -1,4 +1,4 @@ -package system +package models import ( "go-admin/common/models" @@ -27,4 +27,4 @@ func (e *SysConfig) Generate() models.ActiveRecord { func (e *SysConfig) GetId() interface{} { return e.Id -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_dept.go b/app/admin/models/sys_dept.go similarity index 98% rename from app/admin/models/system/sys_dept.go rename to app/admin/models/sys_dept.go index d076031..7084be3 100644 --- a/app/admin/models/system/sys_dept.go +++ b/app/admin/models/sys_dept.go @@ -1,4 +1,4 @@ -package system +package models import "go-admin/common/models" @@ -30,4 +30,4 @@ func (e *SysDept) Generate() models.ActiveRecord { func (e *SysDept) GetId() interface{} { return e.DeptId -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_dict_data.go b/app/admin/models/sys_dict_data.go similarity index 98% rename from app/admin/models/system/sys_dict_data.go rename to app/admin/models/sys_dict_data.go index f2f20e9..70f50bb 100644 --- a/app/admin/models/system/sys_dict_data.go +++ b/app/admin/models/sys_dict_data.go @@ -1,4 +1,4 @@ -package system +package models import ( "go-admin/common/models" @@ -32,4 +32,4 @@ func (e *SysDictData) Generate() models.ActiveRecord { func (e *SysDictData) GetId() interface{} { return e.DictCode -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_dict_type.go b/app/admin/models/sys_dict_type.go similarity index 97% rename from app/admin/models/system/sys_dict_type.go rename to app/admin/models/sys_dict_type.go index dfc053d..9aaf3e4 100644 --- a/app/admin/models/system/sys_dict_type.go +++ b/app/admin/models/sys_dict_type.go @@ -1,4 +1,4 @@ -package system +package models import ( "go-admin/common/models" @@ -26,4 +26,4 @@ func (e *SysDictType) Generate() models.ActiveRecord { func (e *SysDictType) GetId() interface{} { return e.ID -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_login_log.go b/app/admin/models/sys_login_log.go similarity index 99% rename from app/admin/models/system/sys_login_log.go rename to app/admin/models/sys_login_log.go index 626428a..84154c1 100644 --- a/app/admin/models/system/sys_login_log.go +++ b/app/admin/models/sys_login_log.go @@ -1,4 +1,4 @@ -package system +package models import ( "encoding/json" @@ -69,4 +69,4 @@ func SaveLoginLog(message storage.Messager) (err error) { return err } return nil -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_menu.go b/app/admin/models/sys_menu.go similarity index 53% rename from app/admin/models/system/sys_menu.go rename to app/admin/models/sys_menu.go index dbcf803..258c713 100644 --- a/app/admin/models/system/sys_menu.go +++ b/app/admin/models/sys_menu.go @@ -1,4 +1,4 @@ -package system +package models import "go-admin/common/models" @@ -19,6 +19,8 @@ type SysMenu struct { Sort int `json:"sort" gorm:"size:4;"` Visible string `json:"visible" gorm:"size:1;"` IsFrame string `json:"isFrame" gorm:"size:1;DEFAULT:0;"` + SysApi []SysApi `json:"sysApi" gorm:"many2many:sys_menu_api_rule"` + Apis []int `json:"apis" gorm:"-"` DataScope string `json:"dataScope" gorm:"-"` Params string `json:"params" gorm:"-"` RoleId int `gorm:"-"` @@ -28,27 +30,27 @@ type SysMenu struct { models.ModelTime } -type SysMenus struct { - MenuId int `json:"menuId" gorm:"column:menu_id;primaryKey;autoIncrement;"` - MenuName string `json:"menuName" gorm:"column:menu_name"` - Title string `json:"title" gorm:"column:title"` - Icon string `json:"icon" gorm:"column:icon"` - Path string `json:"path" gorm:"column:path"` - MenuType string `json:"menuType" gorm:"column:menu_type"` - Action string `json:"action" gorm:"column:action"` - Permission string `json:"permission" gorm:"column:permission"` - ParentId int `json:"parentId" gorm:"column:parent_id"` - NoCache bool `json:"noCache" gorm:"column:no_cache"` - Breadcrumb string `json:"breadcrumb" gorm:"column:breadcrumb"` - Component string `json:"component" gorm:"column:component"` - Sort int `json:"sort" gorm:"column:sort"` - Visible string `json:"visible" gorm:"column:visible"` - Children []SysMenu `json:"children" gorm:"-"` - models.ControlBy - models.ModelTime - DataScope string `json:"dataScope" gorm:"-"` - Params string `json:"params" gorm:"-"` -} +//type SysMenus struct { +// MenuId int `json:"menuId" gorm:"column:menu_id;primaryKey;autoIncrement;"` +// MenuName string `json:"menuName" gorm:"column:menu_name"` +// Title string `json:"title" gorm:"column:title"` +// Icon string `json:"icon" gorm:"column:icon"` +// Path string `json:"path" gorm:"column:path"` +// MenuType string `json:"menuType" gorm:"column:menu_type"` +// Action string `json:"action" gorm:"column:action"` +// Permission string `json:"permission" gorm:"column:permission"` +// ParentId int `json:"parentId" gorm:"column:parent_id"` +// NoCache bool `json:"noCache" gorm:"column:no_cache"` +// Breadcrumb string `json:"breadcrumb" gorm:"column:breadcrumb"` +// Component string `json:"component" gorm:"column:component"` +// Sort int `json:"sort" gorm:"column:sort"` +// Visible string `json:"visible" gorm:"column:visible"` +// Children []SysMenu `json:"children" gorm:"-"` +// models.ControlBy +// models.ModelTime +// DataScope string `json:"dataScope" gorm:"-"` +// Params string `json:"params" gorm:"-"` +//} func (SysMenu) TableName() string { return "sys_menu" @@ -61,4 +63,4 @@ func (e *SysMenu) Generate() models.ActiveRecord { func (e *SysMenu) GetId() interface{} { return e.MenuId -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_opera_log.go b/app/admin/models/sys_opera_log.go similarity index 99% rename from app/admin/models/system/sys_opera_log.go rename to app/admin/models/sys_opera_log.go index b8a83eb..40c8aa5 100644 --- a/app/admin/models/system/sys_opera_log.go +++ b/app/admin/models/sys_opera_log.go @@ -1,4 +1,4 @@ -package system +package models import ( "encoding/json" @@ -82,4 +82,4 @@ func SaveOperaLog(message storage.Messager) (err error) { return err } return nil -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_post.go b/app/admin/models/sys_post.go similarity index 98% rename from app/admin/models/system/sys_post.go rename to app/admin/models/sys_post.go index a2dc3cd..7f1ccaa 100644 --- a/app/admin/models/system/sys_post.go +++ b/app/admin/models/sys_post.go @@ -1,4 +1,4 @@ -package system +package models import "go-admin/common/models" @@ -27,4 +27,4 @@ func (e *SysPost) Generate() models.ActiveRecord { func (e *SysPost) GetId() interface{} { return e.PostId -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_role.go b/app/admin/models/sys_role.go similarity index 98% rename from app/admin/models/system/sys_role.go rename to app/admin/models/sys_role.go index 3def8e1..777def9 100644 --- a/app/admin/models/system/sys_role.go +++ b/app/admin/models/sys_role.go @@ -1,4 +1,4 @@ -package system +package models import "go-admin/common/models" @@ -30,4 +30,4 @@ func (e *SysRole) Generate() models.ActiveRecord { func (e *SysRole) GetId() interface{} { return e.RoleId -} +} \ No newline at end of file diff --git a/app/admin/models/system/sys_user.go b/app/admin/models/sys_user.go similarity index 99% rename from app/admin/models/system/sys_user.go rename to app/admin/models/sys_user.go index f866bde..dde7576 100644 --- a/app/admin/models/system/sys_user.go +++ b/app/admin/models/sys_user.go @@ -1,4 +1,4 @@ -package system +package models import ( "go-admin/common/models" @@ -74,4 +74,4 @@ func (e *SysUser) AfterFind(_ *gorm.DB) error { e.PostIds = []int{e.PostId} e.RoleIds = []int{e.RoleId} return nil -} +} \ No newline at end of file diff --git a/app/admin/router/sys_api.go b/app/admin/router/sys_api.go index 34a877e..b7b0c33 100644 --- a/app/admin/router/sys_api.go +++ b/app/admin/router/sys_api.go @@ -3,9 +3,8 @@ package router import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/admin/models" - "go-admin/app/admin/service/dto" - "go-admin/common/actions" + + "go-admin/app/admin/apis" "go-admin/common/middleware" ) @@ -13,18 +12,15 @@ func init() { routerCheckRole = append(routerCheckRole, registerSysApiRouter) } -// 需认证的路由代码 +// registerSysApiRouter func registerSysApiRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { + api := apis.SysApi{} r := v1.Group("/sys-api").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { - model := &models.SysApi{} - r.GET("", actions.PermissionAction(), actions.IndexAction(model, new(dto.SysApiSearch), func() interface{} { - list := make([]models.SysApi, 0) - return &list - })) - r.GET("/:id", actions.PermissionAction(), actions.ViewAction(new(dto.SysApiById), nil)) - //r.POST("", actions.CreateAction(new(dto.SysApiControl))) - r.PUT("/:id", actions.PermissionAction(), actions.UpdateAction(new(dto.SysApiControl))) - //r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.SysApiById))) + r.GET("", api.GetSysApiList) + r.GET("/:id", api.GetSysApi) + //r.POST("", api.InsertSysApi) + r.PUT("/:id", api.UpdateSysApi) + //r.DELETE("", api.DeleteSysApi) } -} +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_api.go b/app/admin/service/dto/sys_api.go index 9d0187f..827d934 100644 --- a/app/admin/service/dto/sys_api.go +++ b/app/admin/service/dto/sys_api.go @@ -17,6 +17,11 @@ type SysApiSearch struct { Path string `form:"path" search:"type:exact;column:path;table:sys_api" comment:"地址"` Action string `form:"action" search:"type:exact;column:action;table:sys_api" comment:"类型"` ParentId string `form:"parentId" search:"type:exact;column:parent_id;table:sys_api" comment:"按钮id"` + SysApiOrder +} + +type SysApiOrder struct { + HandleOrder string `search:"type:order;column:handle;table:sys_api" form:"handle_order"` } func (m *SysApiSearch) GetNeedSearch() interface{} { @@ -39,7 +44,7 @@ func (m *SysApiSearch) Bind(ctx *gin.Context) error { type SysApiControl struct { Id int `uri:"id" comment:"编码"` // 编码 - Name string `json:"name" comment:"名称"` + Handle string `json:"handle" comment:"handle"` Title string `json:"title" comment:"标题"` Path string `json:"path" comment:"地址"` Paths string `json:"paths" comment:""` @@ -71,7 +76,7 @@ func (s *SysApiControl) Bind(ctx *gin.Context) error { func (s *SysApiControl) GenerateM() (common.ActiveRecord, error) { return &models.SysApi{ Id: s.Id, - Name: s.Name, + Handle: s.Handle, Title: s.Title, Path: s.Path, Paths: s.Paths, diff --git a/app/admin/service/dto/sys_config.go b/app/admin/service/dto/sys_config.go index f5bd85f..669ad31 100644 --- a/app/admin/service/dto/sys_config.go +++ b/app/admin/service/dto/sys_config.go @@ -2,12 +2,12 @@ package dto import ( "encoding/json" + "go-admin/app/admin/models" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" common "go-admin/common/models" ) @@ -68,8 +68,8 @@ func (s *SysConfigControl) Bind(ctx *gin.Context) error { } // Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysConfigControl) Generate() (*system.SysConfig, error) { - return &system.SysConfig{ +func (s *SysConfigControl) Generate() (*models.SysConfig, error) { + return &models.SysConfig{ Model: common.Model{Id: s.ID}, ConfigName: s.ConfigName, ConfigKey: s.ConfigKey, @@ -114,6 +114,6 @@ func (s *SysConfigById) Bind(ctx *gin.Context) error { return err } -func (s *SysConfigById) GenerateM() (*system.SysConfig, error) { - return &system.SysConfig{}, nil -} +func (s *SysConfigById) GenerateM() (*models.SysConfig, error) { + return &models.SysConfig{}, nil +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_dept.go b/app/admin/service/dto/sys_dept.go index f9c652e..e064520 100644 --- a/app/admin/service/dto/sys_dept.go +++ b/app/admin/service/dto/sys_dept.go @@ -2,12 +2,12 @@ package dto import ( "encoding/json" + "go-admin/app/admin/models" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" ) @@ -74,8 +74,8 @@ func (s *SysDeptControl) Bind(ctx *gin.Context) error { } // Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysDeptControl) Generate() (*system.SysDept, error) { - return &system.SysDept{ +func (s *SysDeptControl) Generate() (*models.SysDept, error) { + return &models.SysDept{ DeptId: s.DeptId, DeptName: s.DeptName, ParentId: s.ParentId, @@ -122,12 +122,12 @@ func (s *SysDeptById) Bind(ctx *gin.Context) error { return err } -func (s *SysDeptById) GenerateM() (*system.SysDept, error) { - return &system.SysDept{}, nil +func (s *SysDeptById) GenerateM() (*models.SysDept, error) { + return &models.SysDept{}, nil } type DeptLabel struct { Id int `gorm:"-" json:"id"` Label string `gorm:"-" json:"label"` Children []DeptLabel `gorm:"-" json:"children"` -} +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_dict_data.go b/app/admin/service/dto/sys_dict_data.go index 130d591..5b026d7 100644 --- a/app/admin/service/dto/sys_dict_data.go +++ b/app/admin/service/dto/sys_dict_data.go @@ -1,12 +1,12 @@ package dto import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" common "go-admin/common/models" ) @@ -72,7 +72,7 @@ func (s *SysDictDataControl) Generate() dto.Control { } func (s *SysDictDataControl) GenerateM() (common.ActiveRecord, error) { - return &system.SysDictData{ + return &models.SysDictData{ DictCode: s.Id, DictSort: s.DictSort, DictLabel: s.DictLabel, @@ -122,5 +122,5 @@ func (s *SysDictDataById) Generate() dto.Control { } func (s *SysDictDataById) GenerateM() (common.ActiveRecord, error) { - return &system.SysDictData{}, nil -} + return &models.SysDictData{}, nil +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_dict_type.go b/app/admin/service/dto/sys_dict_type.go index 377a7dd..511f779 100644 --- a/app/admin/service/dto/sys_dict_type.go +++ b/app/admin/service/dto/sys_dict_type.go @@ -2,9 +2,9 @@ package dto import ( "github.com/gin-gonic/gin" + "go-admin/app/admin/models" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" common "go-admin/common/models" ) @@ -67,7 +67,7 @@ func (s *SysDictTypeControl) Generate() dto.Control { } func (s *SysDictTypeControl) GenerateM() (common.ActiveRecord, error) { - return &system.SysDictType{ + return &models.SysDictType{ ID: s.Id, DictName: s.DictName, @@ -91,5 +91,5 @@ func (s *SysDictTypeById) Generate() dto.Control { } func (s *SysDictTypeById) GenerateM() (common.ActiveRecord, error) { - return &system.SysDictType{}, nil -} + return &models.SysDictType{}, nil +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_login_log.go b/app/admin/service/dto/sys_login_log.go index 1984713..c83d553 100644 --- a/app/admin/service/dto/sys_login_log.go +++ b/app/admin/service/dto/sys_login_log.go @@ -1,12 +1,12 @@ package dto import ( + "go-admin/app/admin/models" "time" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" common "go-admin/common/models" ) @@ -60,8 +60,8 @@ func (s *SysLoginLogControl) Bind(ctx *gin.Context) error { return err } -func (s *SysLoginLogControl) Generate() (*system.SysLoginLog, error) { - return &system.SysLoginLog{ +func (s *SysLoginLogControl) Generate() (*models.SysLoginLog, error) { + return &models.SysLoginLog{ Model: common.Model{Id: s.ID}, Username: s.Username, Status: s.Status, @@ -108,6 +108,6 @@ func (s *SysLoginLogById) Generate() *SysLoginLogById { return &cp } -func (s *SysLoginLogById) GenerateM() (*system.SysLoginLog, error) { - return &system.SysLoginLog{}, nil -} +func (s *SysLoginLogById) GenerateM() (*models.SysLoginLog, error) { + return &models.SysLoginLog{}, nil +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_menu.go b/app/admin/service/dto/sys_menu.go index dbf5756..ae62d2c 100644 --- a/app/admin/service/dto/sys_menu.go +++ b/app/admin/service/dto/sys_menu.go @@ -2,12 +2,12 @@ package dto import ( "encoding/json" - "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-admin-team/go-admin-core/sdk/api" + "go-admin/app/admin/models" + common "go-admin/common/models" - "go-admin/app/admin/models/system" "go-admin/common/dto" ) @@ -38,24 +38,35 @@ func (m *SysMenuSearch) Bind(ctx *gin.Context) error { return err } -// SysConfigControl 增、改使用的结构体 +// SysMenuControl 增、改使用的结构体 type SysMenuControl struct { - MenuId int `uri:"id" comment:"编码"` // 编码 - MenuName string `form:"menuName" comment:"菜单name"` //菜单name - Title string `form:"title" comment:"显示名称"` //显示名称 - Icon string `form:"icon" comment:"图标"` //图标 - Path string `form:"path" comment:"路径"` //路径 - Paths string `form:"paths" comment:"id路径"` //id路径 - MenuType string `form:"menuType" comment:"菜单类型"` //菜单类型 - Action string `form:"action" comment:"请求方式"` //请求方式 - Permission string `form:"permission" comment:"权限编码"` //权限编码 - ParentId int `form:"parentId" comment:"上级菜单"` //上级菜单 - NoCache bool `form:"noCache" comment:"是否缓存"` //是否缓存 - Breadcrumb string `form:"breadcrumb" comment:"是否面包屑"` //是否面包屑 - Component string `form:"component" comment:"组件"` //组件 - Sort int `form:"sort" comment:"排序"` //排序 - Visible string `form:"visible" comment:"是否显示"` //是否显示 - IsFrame string `form:"isFrame" comment:"是否frame"` //是否frame + MenuId int `uri:"id" comment:"编码"` // 编码 + MenuName string `form:"menuName" comment:"菜单name"` //菜单name + Title string `form:"title" comment:"显示名称"` //显示名称 + Icon string `form:"icon" comment:"图标"` //图标 + Path string `form:"path" comment:"路径"` //路径 + Paths string `form:"paths" comment:"id路径"` //id路径 + MenuType string `form:"menuType" comment:"菜单类型"` //菜单类型 + SysApi []models.SysApi `form:"sysApi"` + Apis []int `form:"apis"` + Action string `form:"action" comment:"请求方式"` //请求方式 + Permission string `form:"permission" comment:"权限编码"` //权限编码 + ParentId int `form:"parentId" comment:"上级菜单"` //上级菜单 + NoCache bool `form:"noCache" comment:"是否缓存"` //是否缓存 + Breadcrumb string `form:"breadcrumb" comment:"是否面包屑"` //是否面包屑 + Component string `form:"component" comment:"组件"` //组件 + Sort int `form:"sort" comment:"排序"` //排序 + Visible string `form:"visible" comment:"是否显示"` //是否显示 + IsFrame string `form:"isFrame" comment:"是否frame"` //是否frame + common.ControlBy +} + +func (s *SysMenuControl) SetCreateBy(id int) { + s.CreateBy = id +} + +func (s *SysMenuControl) SetUpdateBy(id int) { + s.UpdateBy = id } // Bind 映射上下文中的结构体数据 @@ -79,26 +90,33 @@ func (s *SysMenuControl) Bind(ctx *gin.Context) error { return err } -// Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysMenuControl) Generate() (*system.SysMenu, error) { - return &system.SysMenu{ - MenuId: s.MenuId, - MenuName: s.MenuName, - Title: s.Title, - Icon: s.Icon, - Path: s.Path, - Paths: s.Paths, - MenuType: s.MenuType, - Action: s.Action, - Permission: s.Permission, - ParentId: s.ParentId, - NoCache: s.NoCache, - Breadcrumb: s.Breadcrumb, - Component: s.Component, - Sort: s.Sort, - Visible: s.Visible, - IsFrame: s.IsFrame, - }, nil +// Generate 结构体数据转化 从 Control 至 model 对应的模型 +func (s *SysMenuControl) Generate(model *models.SysMenu) { + if s.MenuId != 0 { + model.MenuId = s.MenuId + } + model.MenuName = s.MenuName + model.Title = s.Title + model.Icon = s.Icon + model.Path = s.Path + model.Paths = s.Paths + model.MenuType = s.MenuType + model.Action = s.Action + model.SysApi = s.SysApi + model.Permission = s.Permission + model.ParentId = s.ParentId + model.NoCache = s.NoCache + model.Breadcrumb = s.Breadcrumb + model.Component = s.Component + model.Sort = s.Sort + model.Visible = s.Visible + model.IsFrame = s.IsFrame + if s.CreateBy != 0 { + model.CreateBy = s.CreateBy + } + if s.UpdateBy != 0 { + model.UpdateBy = s.UpdateBy + } } // GetId 获取数据对应的ID @@ -135,8 +153,8 @@ func (s *SysMenuById) Bind(ctx *gin.Context) error { return err } -func (s *SysMenuById) GenerateM() (*system.SysMenu, error) { - return &system.SysMenu{}, nil +func (s *SysMenuById) GenerateM() (*models.SysMenu, error) { + return &models.SysMenu{}, nil } type MenuLabel struct { @@ -146,10 +164,10 @@ type MenuLabel struct { } type MenuRole struct { - system.SysMenus + models.SysMenu IsSelect bool `json:"is_select" gorm:"-"` } type SelectRole struct { RoleId int `uri:"roleId"` -} +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_opera_log.go b/app/admin/service/dto/sys_opera_log.go index 3d1c23d..b7b05bc 100644 --- a/app/admin/service/dto/sys_opera_log.go +++ b/app/admin/service/dto/sys_opera_log.go @@ -1,12 +1,12 @@ package dto import ( + "go-admin/app/admin/models" "time" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" common "go-admin/common/models" ) @@ -70,8 +70,8 @@ func (s *SysOperaLogControl) Bind(ctx *gin.Context) error { return err } -func (s *SysOperaLogControl) Generate() (*system.SysOperaLog, error) { - return &system.SysOperaLog{ +func (s *SysOperaLogControl) Generate() (*models.SysOperaLog, error) { + return &models.SysOperaLog{ Model: common.Model{Id: s.ID}, Title: s.Title, BusinessType: s.BusinessType, @@ -127,4 +127,4 @@ func (s *SysOperaLogById) Bind(ctx *gin.Context) error { func (s *SysOperaLogById) SetUpdateBy(id int) { -} +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_post.go b/app/admin/service/dto/sys_post.go index 95cc81f..ab43c63 100644 --- a/app/admin/service/dto/sys_post.go +++ b/app/admin/service/dto/sys_post.go @@ -2,12 +2,12 @@ package dto import ( "encoding/json" + "go-admin/app/admin/models" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" ) @@ -68,8 +68,8 @@ func (s *SysPostControl) Bind(ctx *gin.Context) error { } // Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysPostControl) Generate() (*system.SysPost, error) { - return &system.SysPost{ +func (s *SysPostControl) Generate() (*models.SysPost, error) { + return &models.SysPost{ PostId: s.PostId, PostName: s.PostName, PostCode: s.PostCode, @@ -113,6 +113,6 @@ func (s *SysPostById) Bind(ctx *gin.Context) error { return err } -func (s *SysPostById) GenerateM() (*system.SysPost, error) { - return &system.SysPost{}, nil -} +func (s *SysPostById) GenerateM() (*models.SysPost, error) { + return &models.SysPost{}, nil +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_role.go b/app/admin/service/dto/sys_role.go index 0b8b98f..ff1c40f 100644 --- a/app/admin/service/dto/sys_role.go +++ b/app/admin/service/dto/sys_role.go @@ -2,12 +2,12 @@ package dto import ( "encoding/json" + "go-admin/app/admin/models" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-admin-team/go-admin-core/sdk/api" - "go-admin/app/admin/models/system" "go-admin/common/dto" ) @@ -76,8 +76,8 @@ func (s *SysRoleControl) Bind(ctx *gin.Context) error { } // Generate 结构体数据转化 从 SysConfigControl 至 system.SysConfig 对应的模型 -func (s *SysRoleControl) Generate() (*system.SysRole, error) { - return &system.SysRole{ +func (s *SysRoleControl) Generate() (*models.SysRole, error) { + return &models.SysRole{ RoleId: s.RoleId, RoleName: s.RoleName, Status: s.Status, @@ -110,8 +110,8 @@ func (s *SysRoleById) GetId() interface{} { return s.Id } -func (s *SysRoleById) GenerateM() (*system.SysRole, error) { - return &system.SysRole{}, nil +func (s *SysRoleById) GenerateM() (*models.SysRole, error) { + return &models.SysRole{}, nil } // RoleDataScopeReq 角色数据权限修改 diff --git a/app/admin/service/dto/sys_user.go b/app/admin/service/dto/sys_user.go index 97826ac..4abd426 100644 --- a/app/admin/service/dto/sys_user.go +++ b/app/admin/service/dto/sys_user.go @@ -3,8 +3,8 @@ package dto import ( "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/api" + "go-admin/app/admin/models" - "go-admin/app/admin/models/system" "go-admin/common/dto" common "go-admin/common/models" ) @@ -77,7 +77,7 @@ func (s *SysUserControl) Generate() dto.Control { } func (s *SysUserControl) GenerateM() (common.ActiveRecord, error) { - return &system.SysUser{ + return &models.SysUser{ UserId: s.UserId, Username: s.Username, Password: s.Password, @@ -108,11 +108,11 @@ func (s *SysUserById) Generate() dto.Control { } func (s *SysUserById) GenerateM() (common.ActiveRecord, error) { - return &system.SysUser{}, nil + return &models.SysUser{}, nil } // PassWord 密码 type PassWord struct { NewPassword string `json:"newPassword" binding:"required"` OldPassword string `json:"oldPassword" binding:"required"` -} +} \ No newline at end of file diff --git a/app/admin/service/sys_api.go b/app/admin/service/sys_api.go new file mode 100644 index 0000000..85df8b9 --- /dev/null +++ b/app/admin/service/sys_api.go @@ -0,0 +1,106 @@ +package service + +import ( + "errors" + "fmt" + "github.com/go-admin-team/go-admin-core/sdk/runtime" + + "gorm.io/gorm" + + "go-admin/app/admin/models" + "go-admin/app/admin/service/dto" + "go-admin/common/actions" + cDto "go-admin/common/dto" + "go-admin/common/service" +) + +type SysApi struct { + service.Service +} + +// GetSysApiPage 获取SysApi列表 +func (e *SysApi) GetSysApiPage(c *dto.SysApiSearch, p *actions.DataPermission, list *[]models.SysApi, count *int64) error { + var err error + var data models.SysApi + + err = e.Orm.Debug().Model(&data). + Scopes( + cDto.MakeCondition(c.GetNeedSearch()), + cDto.Paginate(c.GetPageSize(), c.GetPageIndex()), + actions.Permission(data.TableName(), p), + ). + Find(list).Limit(-1).Offset(-1). + Count(count).Error + if err != nil { + e.Log.Errorf("Service GetSysApiPage error:%s", err) + return err + } + return nil +} + +// GetSysApi 获取SysApi对象 +func (e *SysApi) GetSysApi(d *dto.SysApiById, p *actions.DataPermission, model *models.SysApi) error { + var data models.SysApi + + err := e.Orm.Model(&data). + Scopes( + actions.Permission(data.TableName(), p), + ). + First(model, d.GetId()).Error + if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { + err = errors.New("查看对象不存在或无权查看") + e.Log.Errorf("Service GetSysApi error:%s", err) + return err + } + if err != nil { + e.Log.Errorf("db error:%s", err) + return err + } + return nil +} + +// InsertSysApi 创建SysApi对象 +func (e *SysApi) CheckStorageSysApi(c *[]runtime.Router) error { + for _, v := range *c { + err := e.Orm.Debug().Where(models.SysApi{Path: v.RelativePath, Action: v.HttpMethod}).Attrs(models.SysApi{Handle: v.Handler}).FirstOrCreate(&models.SysApi{}).Error + if err != nil { + err := fmt.Errorf("Service CheckStorageSysApi error: %s \r\n ", err.Error()) + return err + } + } + return nil +} + +// UpdateSysApi 修改SysApi对象 +func (e *SysApi) UpdateSysApi(c *models.SysApi, p *actions.DataPermission) error { + db := e.Orm.Model(c). + Scopes( + actions.Permission(c.TableName(), p), + ).Where(c.GetId()).Updates(c) + if err := db.Error; err != nil { + e.Log.Errorf("Service UpdateSysApi error:%s", err) + return err + } + if db.RowsAffected == 0 { + return errors.New("无权更新该数据") + } + return nil +} + +// RemoveSysApi 删除SysApi +func (e *SysApi) RemoveSysApi(d *dto.SysApiById, p *actions.DataPermission) error { + var data models.SysApi + + db := e.Orm.Model(&data). + Scopes( + actions.Permission(data.TableName(), p), + ).Delete(&data, d.GetId()) + if err := db.Error; err != nil { + e.Log.Errorf("Service RemoveSysApi error:%s", err) + return err + } + if db.RowsAffected == 0 { + return errors.New("无权删除该数据") + } + return nil +} diff --git a/app/admin/service/sys_config.go b/app/admin/service/sys_config.go index 73e23e4..51ecc74 100644 --- a/app/admin/service/sys_config.go +++ b/app/admin/service/sys_config.go @@ -2,7 +2,7 @@ package service import ( "errors" - "go-admin/app/admin/models/system" + "go-admin/app/admin/models" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" "go-admin/common/service" @@ -14,9 +14,9 @@ type SysConfig struct { } // GetSysConfigPage 获取SysConfig列表 -func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysConfig, count *int64) error { +func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]models.SysConfig, count *int64) error { var err error - var data system.SysConfig + var data models.SysConfig err = e.Orm.Model(&data). Scopes( @@ -32,9 +32,9 @@ func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysC return nil } -func (e *SysConfig) GetSysConfigByKey(c *dto.SysConfigSearch, list *[]system.SysConfig) error { +func (e *SysConfig) GetSysConfigByKey(c *dto.SysConfigSearch, list *[]models.SysConfig) error { var err error - var data system.SysConfig + var data models.SysConfig err = e.Orm.Model(&data). Scopes( @@ -49,8 +49,8 @@ func (e *SysConfig) GetSysConfigByKey(c *dto.SysConfigSearch, list *[]system.Sys } // GetSysConfig 获取SysConfig对象 -func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig) error { - var data system.SysConfig +func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *models.SysConfig) error { + var data models.SysConfig err := e.Orm.Model(&data). First(model, d.GetId()).Error @@ -67,9 +67,9 @@ func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig) } // InsertSysConfig 创建SysConfig对象 -func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error { +func (e *SysConfig) InsertSysConfig(model *models.SysConfig) error { var err error - var data system.SysConfig + var data models.SysConfig err = e.Orm.Model(&data). Create(model).Error @@ -81,7 +81,7 @@ func (e *SysConfig) InsertSysConfig(model *system.SysConfig) error { } // UpdateSysConfig 修改SysConfig对象 -func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error { +func (e *SysConfig) UpdateSysConfig(c *models.SysConfig) error { var err error db := e.Orm.Model(c). @@ -99,9 +99,9 @@ func (e *SysConfig) UpdateSysConfig(c *system.SysConfig) error { } // RemoveSysConfig 删除SysConfig -func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) error { +func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *models.SysConfig) error { var err error - var data system.SysConfig + var data models.SysConfig db := e.Orm.Model(&data). Where(d.Ids).Delete(c) @@ -120,7 +120,7 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) e // GetSysConfigByKEY 根据Key获取SysConfig func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error { var err error - var data system.SysConfig + var data models.SysConfig data.ConfigKey = c.ConfigKey err = e.Orm.Table(data.TableName()).Where("config_key = ?", data.ConfigKey).First(c).Error if err != nil { @@ -129,4 +129,4 @@ func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error { } return nil -} +} \ No newline at end of file diff --git a/app/admin/service/sys_dept.go b/app/admin/service/sys_dept.go index a92335f..b1d2e63 100644 --- a/app/admin/service/sys_dept.go +++ b/app/admin/service/sys_dept.go @@ -4,10 +4,10 @@ import ( "errors" log "github.com/go-admin-team/go-admin-core/logger" "github.com/go-admin-team/go-admin-core/sdk/pkg" + "go-admin/app/admin/models" "gorm.io/gorm" - "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" "go-admin/common/service" @@ -18,9 +18,9 @@ type SysDept struct { } // GetSysDeptPage 获取SysDept列表 -func (e *SysDept) GetSysDeptPage(c *dto.SysDeptSearch, list *[]system.SysDept) error { +func (e *SysDept) GetSysDeptPage(c *dto.SysDeptSearch, list *[]models.SysDept) error { var err error - var data system.SysDept + var data models.SysDept err = e.Orm.Model(&data). Scopes( @@ -35,9 +35,9 @@ func (e *SysDept) GetSysDeptPage(c *dto.SysDeptSearch, list *[]system.SysDept) e } // GetSysDept 获取SysDept对象 -func (e *SysDept) GetSysDept(d *dto.SysDeptById, model *system.SysDept) error { +func (e *SysDept) GetSysDept(d *dto.SysDeptById, model *models.SysDept) error { var err error - var data system.SysDept + var data models.SysDept db := e.Orm.Model(&data). First(model, d.GetId()) @@ -55,9 +55,9 @@ func (e *SysDept) GetSysDept(d *dto.SysDeptById, model *system.SysDept) error { } // InsertSysDept 创建SysDept对象 -func (e *SysDept) InsertSysDept(model *system.SysDept) error { +func (e *SysDept) InsertSysDept(model *models.SysDept) error { var err error - var data system.SysDept + var data models.SysDept err = e.Orm.Model(&data). Create(model).Error @@ -67,7 +67,7 @@ func (e *SysDept) InsertSysDept(model *system.SysDept) error { } deptPath := "/" + pkg.IntToString(model.DeptId) if model.ParentId != 0 { - var deptP system.SysDept + var deptP models.SysDept e.Orm.Model(&data).First(&deptP, model.ParentId) deptPath = deptP.DeptPath + deptPath } else { @@ -83,9 +83,9 @@ func (e *SysDept) InsertSysDept(model *system.SysDept) error { } // UpdateSysDept 修改SysDept对象 -func (e *SysDept) UpdateSysDept(c *system.SysDept) error { +func (e *SysDept) UpdateSysDept(c *models.SysDept) error { var err error - var data system.SysDept + var data models.SysDept db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) @@ -106,7 +106,7 @@ func (e *SysDept) UpdateSysDept(c *system.SysDept) error { // RemoveSysDept 删除SysDept func (e *SysDept) RemoveSysDept(d *dto.SysDeptById) error { var err error - var data system.SysDept + var data models.SysDept db := e.Orm.Model(&data). Where(d.GetId()).Delete(&data) @@ -123,9 +123,9 @@ func (e *SysDept) RemoveSysDept(d *dto.SysDeptById) error { } // GetSysDeptList 获取组织数据 -func (e *SysDept) getSysDeptList(c *dto.SysDeptSearch, list *[]system.SysDept) error { +func (e *SysDept) getSysDeptList(c *dto.SysDeptSearch, list *[]models.SysDept) error { var err error - var data system.SysDept + var data models.SysDept err = e.Orm.Model(&data). Scopes( @@ -141,7 +141,7 @@ func (e *SysDept) getSysDeptList(c *dto.SysDeptSearch, list *[]system.SysDept) e // SetDeptTree 设置组织数据 func (e *SysDept) SetDeptTree(c *dto.SysDeptSearch) (m []dto.DeptLabel, err error) { - var list []system.SysDept + var list []models.SysDept err = e.getSysDeptList(c, &list) m = make([]dto.DeptLabel, 0) @@ -160,7 +160,7 @@ func (e *SysDept) SetDeptTree(c *dto.SysDeptSearch) (m []dto.DeptLabel, err erro } // Call 递归构造组织数据 -func deptTreeCall(deptlist *[]system.SysDept, dept dto.DeptLabel) dto.DeptLabel { +func deptTreeCall(deptlist *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel { list := *deptlist min := make([]dto.DeptLabel, 0) for j := 0; j < len(list); j++ { @@ -176,8 +176,8 @@ func deptTreeCall(deptlist *[]system.SysDept, dept dto.DeptLabel) dto.DeptLabel } // SetDeptPage 设置dept页面数据 -func (e *SysDept) SetDeptPage(c *dto.SysDeptSearch) (m []system.SysDept, err error) { - var list []system.SysDept +func (e *SysDept) SetDeptPage(c *dto.SysDeptSearch) (m []models.SysDept, err error) { + var list []models.SysDept err = e.getSysDeptList(c, &list) //m := make([]models.SysDept, 0) @@ -192,16 +192,16 @@ func (e *SysDept) SetDeptPage(c *dto.SysDeptSearch) (m []system.SysDept, err err return } -func (e *SysDept) deptPageCall(deptlist *[]system.SysDept, menu system.SysDept) system.SysDept { +func (e *SysDept) deptPageCall(deptlist *[]models.SysDept, menu models.SysDept) models.SysDept { list := *deptlist - min := make([]system.SysDept, 0) + min := make([]models.SysDept, 0) for j := 0; j < len(list); j++ { if menu.DeptId != list[j].ParentId { continue } - mi := system.SysDept{} + mi := models.SysDept{} mi.DeptId = list[j].DeptId mi.ParentId = list[j].ParentId mi.DeptPath = list[j].DeptPath @@ -212,7 +212,7 @@ func (e *SysDept) deptPageCall(deptlist *[]system.SysDept, menu system.SysDept) mi.Email = list[j].Email mi.Status = list[j].Status mi.CreatedAt = list[j].CreatedAt - mi.Children = []system.SysDept{} + mi.Children = []models.SysDept{} ms := e.deptPageCall(deptlist, mi) min = append(min, ms) @@ -242,7 +242,7 @@ func (e *SysDept) GetRoleDeptId(roleId int) ([]int, error) { } func (e *SysDept) SetDeptLabel() (m []dto.DeptLabel, err error) { - list := make([]system.SysDept, 0) + list := make([]models.SysDept, 0) err = e.Orm.Find(&list).Error if err != nil { log.Error("find dept list error, %s", err.Error()) @@ -266,7 +266,7 @@ func (e *SysDept) SetDeptLabel() (m []dto.DeptLabel, err error) { } // digitDeptLabel -func digitDeptLabel(deptList *[]system.SysDept, dept dto.DeptLabel) dto.DeptLabel { +func digitDeptLabel(deptList *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel { list := *deptList var mi dto.DeptLabel @@ -283,4 +283,4 @@ func digitDeptLabel(deptList *[]system.SysDept, dept dto.DeptLabel) dto.DeptLabe } dept.Children = min return dept -} +} \ No newline at end of file diff --git a/app/admin/service/sys_dict_data.go b/app/admin/service/sys_dict_data.go index 4af36da..d104773 100644 --- a/app/admin/service/sys_dict_data.go +++ b/app/admin/service/sys_dict_data.go @@ -2,10 +2,10 @@ package service import ( "errors" + "go-admin/app/admin/models" "gorm.io/gorm" - "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" "go-admin/common/service" @@ -16,9 +16,9 @@ type SysDictData struct { } // GetPage 获取列表 -func (e *SysDictData) GetPage(c *dto.SysDictDataSearch, list *[]system.SysDictData, count *int64) error { +func (e *SysDictData) GetPage(c *dto.SysDictDataSearch, list *[]models.SysDictData, count *int64) error { var err error - var data system.SysDictData + var data models.SysDictData err = e.Orm.Model(&data). Scopes( @@ -35,9 +35,9 @@ func (e *SysDictData) GetPage(c *dto.SysDictDataSearch, list *[]system.SysDictDa } // Get 获取对象 -func (e *SysDictData) Get(d *dto.SysDictDataById, model *system.SysDictData) error { +func (e *SysDictData) Get(d *dto.SysDictDataById, model *models.SysDictData) error { var err error - var data system.SysDictData + var data models.SysDictData db := e.Orm.Model(&data). First(model, d.GetId()) @@ -55,9 +55,9 @@ func (e *SysDictData) Get(d *dto.SysDictDataById, model *system.SysDictData) err } // Insert 创建对象 -func (e *SysDictData) Insert(model *system.SysDictData) error { +func (e *SysDictData) Insert(model *models.SysDictData) error { var err error - var data system.SysDictData + var data models.SysDictData err = e.Orm.Model(&data). Create(model).Error @@ -69,9 +69,9 @@ func (e *SysDictData) Insert(model *system.SysDictData) error { } // Update 修改对象 -func (e *SysDictData) Update(c *system.SysDictData) error { +func (e *SysDictData) Update(c *models.SysDictData) error { var err error - var data system.SysDictData + var data models.SysDictData db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) @@ -87,9 +87,9 @@ func (e *SysDictData) Update(c *system.SysDictData) error { } // Remove 删除 -func (e *SysDictData) Remove(d *dto.SysDictDataById, c *system.SysDictData) error { +func (e *SysDictData) Remove(d *dto.SysDictDataById, c *models.SysDictData) error { var err error - var data system.SysDictData + var data models.SysDictData db := e.Orm.Model(&data). Where(d.GetId()).Delete(c) @@ -106,9 +106,9 @@ func (e *SysDictData) Remove(d *dto.SysDictDataById, c *system.SysDictData) erro } // GetAll 获取所有 -func (e *SysDictData) GetAll(c *dto.SysDictDataSearch, list *[]system.SysDictData) error { +func (e *SysDictData) GetAll(c *dto.SysDictDataSearch, list *[]models.SysDictData) error { var err error - var data system.SysDictData + var data models.SysDictData err = e.Orm.Model(&data). Scopes( @@ -120,4 +120,4 @@ func (e *SysDictData) GetAll(c *dto.SysDictDataSearch, list *[]system.SysDictDat return err } return nil -} +} \ No newline at end of file diff --git a/app/admin/service/sys_dict_type.go b/app/admin/service/sys_dict_type.go index c242df2..4a8a76a 100644 --- a/app/admin/service/sys_dict_type.go +++ b/app/admin/service/sys_dict_type.go @@ -2,10 +2,10 @@ package service import ( "errors" + "go-admin/app/admin/models" "gorm.io/gorm" - "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" "go-admin/common/service" @@ -16,9 +16,9 @@ type SysDictType struct { } // GetPage 获取列表 -func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]system.SysDictType, count *int64) error { +func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]models.SysDictType, count *int64) error { var err error - var data system.SysDictType + var data models.SysDictType err = e.Orm.Model(&data). Scopes( @@ -35,9 +35,9 @@ func (e *SysDictType) GetPage(c *dto.SysDictTypeSearch, list *[]system.SysDictTy } // Get 获取对象 -func (e *SysDictType) Get(d *dto.SysDictTypeById, model *system.SysDictType) error { +func (e *SysDictType) Get(d *dto.SysDictTypeById, model *models.SysDictType) error { var err error - var data system.SysDictType + var data models.SysDictType db := e.Orm.Model(&data). First(model, d.GetId()) @@ -55,9 +55,9 @@ func (e *SysDictType) Get(d *dto.SysDictTypeById, model *system.SysDictType) err } // Insert 创建对象 -func (e *SysDictType) Insert(model *system.SysDictType) error { +func (e *SysDictType) Insert(model *models.SysDictType) error { var err error - var data system.SysDictType + var data models.SysDictType err = e.Orm.Model(&data). Create(model).Error @@ -69,9 +69,9 @@ func (e *SysDictType) Insert(model *system.SysDictType) error { } // Update 修改对象 -func (e *SysDictType) Update(c *system.SysDictType) error { +func (e *SysDictType) Update(c *models.SysDictType) error { var err error - var data system.SysDictType + var data models.SysDictType db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) @@ -87,9 +87,9 @@ func (e *SysDictType) Update(c *system.SysDictType) error { } // Remove 删除 -func (e *SysDictType) Remove(d *dto.SysDictTypeById, c *system.SysDictType) error { +func (e *SysDictType) Remove(d *dto.SysDictTypeById, c *models.SysDictType) error { var err error - var data system.SysDictType + var data models.SysDictType db := e.Orm.Model(&data). Where(d.GetId()).Delete(c) @@ -106,9 +106,9 @@ func (e *SysDictType) Remove(d *dto.SysDictTypeById, c *system.SysDictType) erro } // GetAll 获取所有 -func (e *SysDictType) GetAll(c *dto.SysDictTypeSearch, list *[]system.SysDictType) error { +func (e *SysDictType) GetAll(c *dto.SysDictTypeSearch, list *[]models.SysDictType) error { var err error - var data system.SysDictType + var data models.SysDictType err = e.Orm.Model(&data). Scopes( @@ -120,4 +120,4 @@ func (e *SysDictType) GetAll(c *dto.SysDictTypeSearch, list *[]system.SysDictTyp return err } return nil -} +} \ No newline at end of file diff --git a/app/admin/service/sys_login_log.go b/app/admin/service/sys_login_log.go index 800a1f1..a4194ac 100644 --- a/app/admin/service/sys_login_log.go +++ b/app/admin/service/sys_login_log.go @@ -2,10 +2,10 @@ package service import ( "errors" + "go-admin/app/admin/models" "gorm.io/gorm" - "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" common "go-admin/common/models" @@ -17,9 +17,9 @@ type SysLoginLog struct { } // GetSysLoginLogPage 获取SysLoginLog列表 -func (e *SysLoginLog) GetSysLoginLogPage(c *dto.SysLoginLogSearch, list *[]system.SysLoginLog, count *int64) error { +func (e *SysLoginLog) GetSysLoginLogPage(c *dto.SysLoginLogSearch, list *[]models.SysLoginLog, count *int64) error { var err error - var data system.SysLoginLog + var data models.SysLoginLog err = e.Orm.Model(&data). Scopes( @@ -36,9 +36,9 @@ func (e *SysLoginLog) GetSysLoginLogPage(c *dto.SysLoginLogSearch, list *[]syste } // GetSysLoginLog 获取SysLoginLog对象 -func (e *SysLoginLog) GetSysLoginLog(d *dto.SysLoginLogById, model *system.SysLoginLog) error { +func (e *SysLoginLog) GetSysLoginLog(d *dto.SysLoginLogById, model *models.SysLoginLog) error { var err error - var data system.SysLoginLog + var data models.SysLoginLog db := e.Orm.Model(&data). First(model, d.GetId()) @@ -58,7 +58,7 @@ func (e *SysLoginLog) GetSysLoginLog(d *dto.SysLoginLogById, model *system.SysLo // InsertSysLoginLog 创建SysLoginLog对象 func (e *SysLoginLog) InsertSysLoginLog(model common.ActiveRecord) error { var err error - var data system.SysLoginLog + var data models.SysLoginLog err = e.Orm.Model(&data). Create(model).Error @@ -72,7 +72,7 @@ func (e *SysLoginLog) InsertSysLoginLog(model common.ActiveRecord) error { // UpdateSysLoginLog 修改SysLoginLog对象 func (e *SysLoginLog) UpdateSysLoginLog(c common.ActiveRecord) error { var err error - var data system.SysLoginLog + var data models.SysLoginLog db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) @@ -90,7 +90,7 @@ func (e *SysLoginLog) UpdateSysLoginLog(c common.ActiveRecord) error { // RemoveSysLoginLog 删除SysLoginLog func (e *SysLoginLog) RemoveSysLoginLog(d *dto.SysLoginLogById, c common.ActiveRecord) error { var err error - var data system.SysLoginLog + var data models.SysLoginLog db := e.Orm.Model(&data). Where(d.Ids).Delete(c) @@ -104,4 +104,4 @@ func (e *SysLoginLog) RemoveSysLoginLog(d *dto.SysLoginLogById, c common.ActiveR return err } return nil -} +} \ No newline at end of file diff --git a/app/admin/service/sys_menu.go b/app/admin/service/sys_menu.go index 40422de..e300753 100644 --- a/app/admin/service/sys_menu.go +++ b/app/admin/service/sys_menu.go @@ -2,23 +2,38 @@ package service import ( "errors" + "github.com/go-admin-team/go-admin-core/sdk/pkg" - "go-admin/app/admin/models/system" + "github.com/go-admin-team/go-admin-core/sdk/pkg/logger" + "gorm.io/gorm" + + "go-admin/app/admin/models" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" "go-admin/common/service" - "gorm.io/gorm" ) type SysMenu struct { service.Service } +// MakeOrm 设置ORM +func (e *SysMenu) MakeOrm(orm *gorm.DB) *SysMenu { + e.Orm = orm + return e +} + +// MakeLog 设置Log +func (e *SysMenu) MakeLog(l *logger.Logger) *SysMenu { + e.Log = l + return e +} + // GetSysMenuPage 获取SysMenu列表 -func (e *SysMenu) GetSysMenuPage(c *dto.SysMenuSearch) (*[]system.SysMenu, error) { - var m = make([]system.SysMenu, 0) +func (e *SysMenu) GetSysMenuPage(c *dto.SysMenuSearch) (*[]models.SysMenu, error) { + var m = make([]models.SysMenu, 0) var err error - var menu = make([]system.SysMenu, 0) + var menu = make([]models.SysMenu, 0) err = e.getSysMenuPage(c, &menu) for i := 0; i < len(menu); i++ { if menu[i].ParentId != 0 { @@ -32,11 +47,11 @@ func (e *SysMenu) GetSysMenuPage(c *dto.SysMenuSearch) (*[]system.SysMenu, error } // getSysMenuPage 菜单列表 -func (e *SysMenu) getSysMenuPage(c *dto.SysMenuSearch, list *[]system.SysMenu) error { +func (e *SysMenu) getSysMenuPage(c *dto.SysMenuSearch, list *[]models.SysMenu) error { var err error - var data system.SysMenu + var data models.SysMenu - err = e.Orm.Model(&data). + err = e.Orm.Model(&data).Preload("SysApi"). Scopes( cDto.OrderDest("sort", false), cDto.MakeCondition(c.GetNeedSearch()), @@ -50,11 +65,11 @@ func (e *SysMenu) getSysMenuPage(c *dto.SysMenuSearch, list *[]system.SysMenu) e } // GetSysMenu 获取SysMenu对象 -func (e *SysMenu) GetSysMenu(d *dto.SysMenuById, model *system.SysMenu) error { +func (e *SysMenu) GetSysMenu(d *dto.SysMenuById, model *models.SysMenu) error { var err error - var data system.SysMenu + var data models.SysMenu - db := e.Orm.Model(&data). + db := e.Orm.Model(&data).Preload("SysApi"). First(model, d.GetId()) err = db.Error if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { @@ -66,27 +81,31 @@ func (e *SysMenu) GetSysMenu(d *dto.SysMenuById, model *system.SysMenu) error { e.Log.Errorf("db error:%s", err) return err } + apis := make([]int, 0) + for _, v := range model.SysApi { + apis = append(model.Apis, v.Id) + } + model.Apis = apis return nil } // InsertSysMenu 创建SysMenu对象 -func (e *SysMenu) InsertSysMenu(model *system.SysMenu) error { +func (e *SysMenu) InsertSysMenu(c *dto.SysMenuControl) *SysMenu { var err error - var data system.SysMenu - - err = e.Orm.Model(&data). - Create(model).Error + var data models.SysMenu + c.Generate(&data) + err = e.Orm.Create(&data).Error if err != nil { e.Log.Errorf("db error:%s", err) - return err + _ = e.AddError(err) } - return nil + return e } -func (e *SysMenu) initPaths(menu *system.SysMenu) error { +func (e *SysMenu) initPaths(menu *models.SysMenu) error { var err error - var data system.SysMenu - parentMenu := new(system.SysMenu) + var data models.SysMenu + parentMenu := new(models.SysMenu) if menu.ParentId != 0 { e.Orm.Model(&data).First(parentMenu, menu.ParentId) if parentMenu.Paths == "" { @@ -102,30 +121,31 @@ func (e *SysMenu) initPaths(menu *system.SysMenu) error { } // UpdateSysMenu 修改SysMenu对象 -func (e *SysMenu) UpdateSysMenu(c *system.SysMenu) error { +func (e *SysMenu) UpdateSysMenu(c *dto.SysMenuControl) *SysMenu { var err error - var data system.SysMenu - - db := e.Orm.Model(&data). - Where(c.GetId()).Updates(c) + var model = models.SysMenu{} + e.Orm.First(&model, c.GetId()) + c.Generate(&model) + db := e.Orm.Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(&model) if db.Error != nil { e.Log.Errorf("db error:%s", err) - return err + _ = e.AddError(err) + return e } if db.RowsAffected == 0 { - return errors.New("无权更新该数据") - + _ = e.AddError(errors.New("无权更新该数据")) + return e } - return nil + return e } // RemoveSysMenu 删除SysMenu func (e *SysMenu) RemoveSysMenu(d *dto.SysMenuById) error { var err error - var data system.SysMenu + var data models.SysMenu db := e.Orm.Model(&data). - Where(d.GetId()).Delete(&data) + Where(d.Ids).Delete(&data) if db.Error != nil { err = db.Error e.Log.Errorf("Delete error: %s", err) @@ -139,9 +159,9 @@ func (e *SysMenu) RemoveSysMenu(d *dto.SysMenuById) error { } // GetSysMenuList 获取菜单数据 -func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]system.SysMenu) error { +func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]models.SysMenu) error { var err error - var data system.SysMenu + var data models.SysMenu err = e.Orm.Model(&data). Scopes( @@ -157,7 +177,7 @@ func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]system.SysMenu) e // SetSysMenuTree 设置菜单数据 func (e *SysMenu) SetSysMenuLabel() (m []dto.MenuLabel, err error) { - var list []system.SysMenu + var list []models.SysMenu err = e.GetSysMenuList(&dto.SysMenuSearch{}, &list) m = make([]dto.MenuLabel, 0) @@ -176,9 +196,9 @@ func (e *SysMenu) SetSysMenuLabel() (m []dto.MenuLabel, err error) { } // 左侧菜单 -func (e *SysMenu) GetSysMenuByRoleName(roleName string) (Menus []system.SysMenu, err error) { +func (e *SysMenu) GetSysMenuByRoleName(roleName string) (Menus []models.SysMenu, err error) { var table *gorm.DB - var data system.SysMenu + var data models.SysMenu if roleName == "admin" { table = e.Orm.Model(&data).Select("sys_menu.*") @@ -198,7 +218,7 @@ func (e *SysMenu) GetSysMenuByRoleName(roleName string) (Menus []system.SysMenu, } // menuLabelCall 递归构造组织数据 -func menuLabelCall(elist *[]system.SysMenu, dept dto.MenuLabel) dto.MenuLabel { +func menuLabelCall(elist *[]models.SysMenu, dept dto.MenuLabel) dto.MenuLabel { list := *elist min := make([]dto.MenuLabel, 0) @@ -226,16 +246,16 @@ func menuLabelCall(elist *[]system.SysMenu, dept dto.MenuLabel) dto.MenuLabel { return dept } -func menuCall(menulist *[]system.SysMenu, menu system.SysMenu) system.SysMenu { +func menuCall(menulist *[]models.SysMenu, menu models.SysMenu) models.SysMenu { list := *menulist - min := make([]system.SysMenu, 0) + min := make([]models.SysMenu, 0) for j := 0; j < len(list); j++ { if menu.MenuId != list[j].ParentId { continue } - mi := system.SysMenu{} + mi := models.SysMenu{} mi.MenuId = list[j].MenuId mi.MenuName = list[j].MenuName mi.Title = list[j].Title @@ -251,7 +271,7 @@ func menuCall(menulist *[]system.SysMenu, menu system.SysMenu) system.SysMenu { mi.Sort = list[j].Sort mi.Visible = list[j].Visible mi.CreatedAt = list[j].CreatedAt - mi.Children = []system.SysMenu{} + mi.Children = []models.SysMenu{} if mi.MenuType != "F" { ms := menuCall(menulist, mi) @@ -266,11 +286,11 @@ func menuCall(menulist *[]system.SysMenu, menu system.SysMenu) system.SysMenu { return menu } -func (e *SysMenu) SetMenuRole(roleName string) (m []system.SysMenu, err error) { +func (e *SysMenu) SetMenuRole(roleName string) (m []models.SysMenu, err error) { menus, err := e.getByRoleName(roleName) - m = make([]system.SysMenu, 0) + m = make([]models.SysMenu, 0) for i := 0; i < len(menus); i++ { if menus[i].ParentId != 0 { continue @@ -282,8 +302,8 @@ func (e *SysMenu) SetMenuRole(roleName string) (m []system.SysMenu, err error) { return } -func (e *SysMenu) getByRoleName(roleName string) (Menus []system.SysMenu, err error) { - var data system.SysMenu +func (e *SysMenu) getByRoleName(roleName string) (Menus []models.SysMenu, err error) { + var data models.SysMenu var table *gorm.DB if roleName == "admin" { @@ -302,4 +322,4 @@ func (e *SysMenu) getByRoleName(roleName string) (Menus []system.SysMenu, err er return } return -} +} \ No newline at end of file diff --git a/app/admin/service/sys_opera_log.go b/app/admin/service/sys_opera_log.go index cb81586..fa70c67 100644 --- a/app/admin/service/sys_opera_log.go +++ b/app/admin/service/sys_opera_log.go @@ -2,7 +2,7 @@ package service import ( "errors" - "go-admin/app/admin/models/system" + "go-admin/app/admin/models" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" "go-admin/common/service" @@ -14,9 +14,9 @@ type SysOperaLog struct { } // GetSysOperaLogPage 获取SysOperaLog列表 -func (e *SysOperaLog) GetSysOperaLogPage(c *dto.SysOperaLogSearch, list *[]system.SysOperaLog, count *int64) error { +func (e *SysOperaLog) GetSysOperaLogPage(c *dto.SysOperaLogSearch, list *[]models.SysOperaLog, count *int64) error { var err error - var data system.SysOperaLog + var data models.SysOperaLog err = e.Orm.Model(&data). Scopes( @@ -33,8 +33,8 @@ func (e *SysOperaLog) GetSysOperaLogPage(c *dto.SysOperaLogSearch, list *[]syste } // GetSysOperaLog 获取SysOperaLog对象 -func (e *SysOperaLog) GetSysOperaLog(d *dto.SysOperaLogById, model *system.SysOperaLog) error { - var data system.SysOperaLog +func (e *SysOperaLog) GetSysOperaLog(d *dto.SysOperaLogById, model *models.SysOperaLog) error { + var data models.SysOperaLog err := e.Orm.Model(&data). First(model, d.GetId()).Error @@ -51,9 +51,9 @@ func (e *SysOperaLog) GetSysOperaLog(d *dto.SysOperaLogById, model *system.SysOp } // InsertSysOperaLog 创建SysOperaLog对象 -func (e *SysOperaLog) InsertSysOperaLog(model *system.SysOperaLog) error { +func (e *SysOperaLog) InsertSysOperaLog(model *models.SysOperaLog) error { var err error - var data system.SysOperaLog + var data models.SysOperaLog err = e.Orm.Model(&data). Create(model).Error @@ -65,7 +65,7 @@ func (e *SysOperaLog) InsertSysOperaLog(model *system.SysOperaLog) error { } // UpdateSysOperaLog 修改SysOperaLog对象 -func (e *SysOperaLog) UpdateSysOperaLog(c *system.SysOperaLog) error { +func (e *SysOperaLog) UpdateSysOperaLog(c *models.SysOperaLog) error { var err error db := e.Orm.Model(c). @@ -84,7 +84,7 @@ func (e *SysOperaLog) UpdateSysOperaLog(c *system.SysOperaLog) error { // RemoveSysOperaLog 删除SysOperaLog func (e *SysOperaLog) RemoveSysOperaLog(d *dto.SysOperaLogById) error { var err error - var data system.SysOperaLog + var data models.SysOperaLog db := e.Orm.Model(&data).Where(d.Ids).Delete(&data) if err = db.Error; err != nil { diff --git a/app/admin/service/sys_post.go b/app/admin/service/sys_post.go index 7d3fe28..d5d983a 100644 --- a/app/admin/service/sys_post.go +++ b/app/admin/service/sys_post.go @@ -2,10 +2,10 @@ package service import ( "errors" + "go-admin/app/admin/models" "gorm.io/gorm" - "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" "go-admin/common/service" @@ -16,9 +16,9 @@ type SysPost struct { } // GetSysPostPage 获取SysPost列表 -func (e *SysPost) GetSysPostPage(c *dto.SysPostSearch, list *[]system.SysPost, count *int64) error { +func (e *SysPost) GetSysPostPage(c *dto.SysPostSearch, list *[]models.SysPost, count *int64) error { var err error - var data system.SysPost + var data models.SysPost err = e.Orm.Model(&data). Scopes( @@ -35,9 +35,9 @@ func (e *SysPost) GetSysPostPage(c *dto.SysPostSearch, list *[]system.SysPost, c } // GetSysPost 获取SysPost对象 -func (e *SysPost) GetSysPost(d *dto.SysPostById, model *system.SysPost) error { +func (e *SysPost) GetSysPost(d *dto.SysPostById, model *models.SysPost) error { var err error - var data system.SysPost + var data models.SysPost db := e.Orm.Model(&data). First(model, d.GetId()) @@ -55,9 +55,9 @@ func (e *SysPost) GetSysPost(d *dto.SysPostById, model *system.SysPost) error { } // InsertSysPost 创建SysPost对象 -func (e *SysPost) InsertSysPost(model *system.SysPost) error { +func (e *SysPost) InsertSysPost(model *models.SysPost) error { var err error - var data system.SysPost + var data models.SysPost err = e.Orm.Model(&data). Create(model).Error @@ -69,9 +69,9 @@ func (e *SysPost) InsertSysPost(model *system.SysPost) error { } // UpdateSysPost 修改SysPost对象 -func (e *SysPost) UpdateSysPost(c *system.SysPost) error { +func (e *SysPost) UpdateSysPost(c *models.SysPost) error { var err error - var data system.SysPost + var data models.SysPost db := e.Orm.Model(&data). Where(c.GetId()).Updates(c) @@ -89,7 +89,7 @@ func (e *SysPost) UpdateSysPost(c *system.SysPost) error { // RemoveSysPost 删除SysPost func (e *SysPost) RemoveSysPost(d *dto.SysPostById) error { var err error - var data system.SysPost + var data models.SysPost db := e.Orm.Model(&data).Delete(&data, d.GetId()) if db.Error != nil { @@ -102,4 +102,4 @@ func (e *SysPost) RemoveSysPost(d *dto.SysPostById) error { return err } return nil -} +} \ No newline at end of file diff --git a/app/admin/service/sys_role.go b/app/admin/service/sys_role.go index fedff99..1f76a22 100644 --- a/app/admin/service/sys_role.go +++ b/app/admin/service/sys_role.go @@ -6,7 +6,6 @@ import ( "gorm.io/gorm" "go-admin/app/admin/models" - "go-admin/app/admin/models/system" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" "go-admin/common/service" @@ -17,9 +16,9 @@ type SysRole struct { } // GetSysRolePage 获取SysRole列表 -func (e *SysRole) GetSysRolePage(c *dto.SysRoleSearch, list *[]system.SysRole, count *int64) error { +func (e *SysRole) GetSysRolePage(c *dto.SysRoleSearch, list *[]models.SysRole, count *int64) error { var err error - var data system.SysRole + var data models.SysRole err = e.Orm.Model(&data). Scopes( @@ -36,7 +35,7 @@ func (e *SysRole) GetSysRolePage(c *dto.SysRoleSearch, list *[]system.SysRole, c } // GetSysRole 获取SysRole对象 -func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *system.SysRole) error { +func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *models.SysRole) error { var err error db := e.Orm.First(model, d.GetId()) @@ -59,9 +58,9 @@ func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *system.SysRole) error { } // InsertSysRole 创建SysRole对象 -func (e *SysRole) InsertSysRole(c *system.SysRole) error { +func (e *SysRole) InsertSysRole(c *models.SysRole) error { var err error - var data system.SysRole + var data models.SysRole tx := e.Orm.Begin() defer func() { @@ -92,7 +91,7 @@ func (e *SysRole) InsertSysRole(c *system.SysRole) error { } // UpdateSysRole 修改SysRole对象 -func (e *SysRole) UpdateSysRole(c *system.SysRole) error { +func (e *SysRole) UpdateSysRole(c *models.SysRole) error { var err error tx := e.Orm.Debug().Begin() @@ -113,7 +112,7 @@ func (e *SysRole) UpdateSysRole(c *system.SysRole) error { return errors.New("无权更新该数据") } - var t system.RoleMenu + var t models.RoleMenu err = t.DeleteRoleMenu(tx, c.RoleId) if err != nil { e.Log.Errorf("delete role menu error, %", err.Error()) @@ -135,7 +134,7 @@ func (e *SysRole) UpdateSysRole(c *system.SysRole) error { // RemoveSysRole 删除SysRole func (e *SysRole) RemoveSysRole(d *dto.SysRoleById) error { var err error - var data system.SysRole + var data models.SysRole tx := e.Orm.Begin() defer func() { @@ -188,7 +187,7 @@ func (e *SysRole) GetRoleMenuId(tx *gorm.DB, roleId int) ([]int, error) { return menuIds, nil } -func (e *SysRole) UpdateDataScope(c *system.SysRole) (err error) { +func (e *SysRole) UpdateDataScope(c *models.SysRole) (err error) { tx := e.Orm.Begin() defer func() { if err != nil { @@ -197,20 +196,20 @@ func (e *SysRole) UpdateDataScope(c *system.SysRole) (err error) { tx.Commit() } }() - err = tx.Model(&system.SysRole{}).Where("role_id = ?", c.RoleId).Select("data_scope", "update_by").Updates(c).Error + err = tx.Model(&models.SysRole{}).Where("role_id = ?", c.RoleId).Select("data_scope", "update_by").Updates(c).Error if err != nil { return err } - err = tx.Where("role_id = ?", c.RoleId).Delete(&system.SysRoleDept{}).Error + err = tx.Where("role_id = ?", c.RoleId).Delete(&models.SysRoleDept{}).Error if err != nil { return err } if c.DataScope == "2" { - deptRoles := make([]system.SysRoleDept, len(c.DeptIds)) + deptRoles := make([]models.SysRoleDept, len(c.DeptIds)) for i := range c.DeptIds { - deptRoles[i] = system.SysRoleDept{ + deptRoles[i] = models.SysRoleDept{ RoleId: c.RoleId, DeptId: c.DeptIds[i], } diff --git a/app/admin/service/sys_role_menu.go b/app/admin/service/sys_role_menu.go index 0f271c9..bcc4bca 100644 --- a/app/admin/service/sys_role_menu.go +++ b/app/admin/service/sys_role_menu.go @@ -3,7 +3,6 @@ package service import ( log "github.com/go-admin-team/go-admin-core/logger" "go-admin/app/admin/models" - "go-admin/app/admin/models/system" "go-admin/common/service" "gorm.io/gorm" ) @@ -13,13 +12,13 @@ type SysRoleMenu struct { } func (e *SysRoleMenu) ReloadRule(tx *gorm.DB, roleId int, menuId []int) (err error) { - var role system.SysRole + var role models.SysRole msgID := e.MsgID menu := make([]models.Menu, 0) - roleMenu := make([]system.RoleMenu, len(menuId)) - casbinRule := make([]system.CasbinRule, 0) + roleMenu := make([]models.RoleMenu, len(menuId)) + casbinRule := make([]models.CasbinRule, 0) //先删除所有的 err = e.DeleteRoleMenu(tx, roleId) if err != nil { @@ -40,13 +39,13 @@ func (e *SysRoleMenu) ReloadRule(tx *gorm.DB, roleId int, menuId []int) (err err return } for i := range menu { - roleMenu[i] = system.RoleMenu{ + roleMenu[i] = models.RoleMenu{ RoleId: role.RoleId, MenuId: menu[i].MenuId, RoleName: role.RoleKey, } if menu[i].MenuType == "A" { - casbinRule = append(casbinRule, system.CasbinRule{ + casbinRule = append(casbinRule, models.CasbinRule{ PType: "p", V0: role.RoleKey, V1: menu[i].Path, @@ -73,18 +72,18 @@ func (e *SysRoleMenu) ReloadRule(tx *gorm.DB, roleId int, menuId []int) (err err func (e *SysRoleMenu) DeleteRoleMenu(tx *gorm.DB, roleId int) (err error) { msgID := e.MsgID err = tx.Where("role_id = ?", roleId). - Delete(&system.SysRoleDept{}).Error + Delete(&models.SysRoleDept{}).Error if err != nil { log.Errorf("msgID[%s] delete role's dept error, %s", msgID, err.Error()) return } err = tx.Where("role_id = ?", roleId). - Delete(&system.RoleMenu{}).Error + Delete(&models.RoleMenu{}).Error if err != nil { log.Errorf("msgID[%s] delete role's menu error, %s", msgID, err.Error()) return } - var role system.SysRole + var role models.SysRole err = tx.Where("role_id = ?", roleId). First(&role).Error if err != nil { @@ -92,7 +91,7 @@ func (e *SysRoleMenu) DeleteRoleMenu(tx *gorm.DB, roleId int) (err error) { return } err = tx.Where("v0 = ?", role.RoleKey). - Delete(&system.CasbinRule{}).Error + Delete(&models.CasbinRule{}).Error if err != nil { log.Errorf("msgID[%s] delete casbin rule error, %s", msgID, err.Error()) return @@ -100,8 +99,8 @@ func (e *SysRoleMenu) DeleteRoleMenu(tx *gorm.DB, roleId int) (err error) { return } -func (e *SysRoleMenu) GetIDS(tx *gorm.DB, roleName string) ([]system.MenuPath, error) { - var r []system.MenuPath +func (e *SysRoleMenu) GetIDS(tx *gorm.DB, roleName string) ([]models.MenuPath, error) { + var r []models.MenuPath table := tx.Select("sys_menu.path").Table("sys_role_menu") table = table.Joins("left join sys_role on sys_role.role_id=sys_role_menu.role_id") table = table.Joins("left join sys_menu on sys_menu.id=sys_role_menu.menu_id") @@ -110,4 +109,4 @@ func (e *SysRoleMenu) GetIDS(tx *gorm.DB, roleName string) ([]system.MenuPath, e return nil, err } return r, nil -} +} \ No newline at end of file diff --git a/app/admin/service/sys_user.go b/app/admin/service/sys_user.go index 2962f1a..d02dd3d 100644 --- a/app/admin/service/sys_user.go +++ b/app/admin/service/sys_user.go @@ -2,12 +2,12 @@ package service import ( "errors" + "go-admin/app/admin/models" log "github.com/go-admin-team/go-admin-core/logger" "github.com/go-admin-team/go-admin-core/sdk/pkg" "gorm.io/gorm" - "go-admin/app/admin/models/system" "go-admin/common/actions" cDto "go-admin/common/dto" common "go-admin/common/models" @@ -19,9 +19,9 @@ type SysUser struct { } // GetSysUserPage 获取SysUser列表 -func (e *SysUser) GetSysUserPage(c cDto.Index, p *actions.DataPermission, list *[]system.SysUser, count *int64) error { +func (e *SysUser) GetSysUserPage(c cDto.Index, p *actions.DataPermission, list *[]models.SysUser, count *int64) error { var err error - var data system.SysUser + var data models.SysUser err = e.Orm.Model(&data). Scopes( @@ -40,8 +40,8 @@ func (e *SysUser) GetSysUserPage(c cDto.Index, p *actions.DataPermission, list * } // GetSysUser 获取SysUser对象 -func (e *SysUser) GetSysUser(d cDto.Control, p *actions.DataPermission, model *system.SysUser) error { - var data system.SysUser +func (e *SysUser) GetSysUser(d cDto.Control, p *actions.DataPermission, model *models.SysUser) error { + var data models.SysUser err := e.Orm.Model(&data). Scopes( @@ -63,7 +63,7 @@ func (e *SysUser) GetSysUser(d cDto.Control, p *actions.DataPermission, model *s // InsertSysUser 创建SysUser对象 func (e *SysUser) InsertSysUser(model common.ActiveRecord) error { var err error - var data system.SysUser + var data models.SysUser err = e.Orm.Model(&data). Create(model).Error @@ -96,7 +96,7 @@ func (e *SysUser) UpdateSysUser(c common.ActiveRecord, p *actions.DataPermission // RemoveSysUser 删除SysUser func (e *SysUser) RemoveSysUser(d cDto.Control, c common.ActiveRecord, p *actions.DataPermission) error { var err error - var data system.SysUser + var data models.SysUser db := e.Orm.Model(&data). Scopes( @@ -119,7 +119,7 @@ func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *a if newPassword == "" { return nil } - c := &system.SysUser{} + c := &models.SysUser{} err = e.Orm.Model(c). Scopes( @@ -157,7 +157,7 @@ func (e *SysUser) UpdateSysUserPwd(id int, oldPassword, newPassword string, p *a return nil } -func (e *SysUser) GetSysUserProfile(id int, user *system.SysUser, roles *[]system.SysRole, posts *[]system.SysPost) error { +func (e *SysUser) GetSysUserProfile(id int, user *models.SysUser, roles *[]models.SysRole, posts *[]models.SysPost) error { err := e.Orm.Preload("Dept").First(user, "user_id = ?", id).Error if err != nil { return err @@ -172,4 +172,4 @@ func (e *SysUser) GetSysUserProfile(id int, user *system.SysUser, roles *[]syste } return nil -} +} \ No newline at end of file diff --git a/app/jobs/apis/sys_job.go b/app/jobs/apis/sys_job.go index 6f22db3..6069905 100644 --- a/app/jobs/apis/sys_job.go +++ b/app/jobs/apis/sys_job.go @@ -46,7 +46,7 @@ func (e SysJob) RemoveJobForService(c *gin.Context) { // StartJobForService 启动job service实现 func (e SysJob) StartJobForService(c *gin.Context) { - e.SetContext(c) + e.MakeContext(c) log := e.GetLogger() db, err := e.GetOrm() if err != nil { @@ -71,4 +71,4 @@ func (e SysJob) StartJobForService(c *gin.Context) { return } e.OK(nil, s.Msg) -} +} \ No newline at end of file diff --git a/app/other/apis/file.go b/app/other/apis/file.go index 76e40e2..3848964 100644 --- a/app/other/apis/file.go +++ b/app/other/apis/file.go @@ -41,7 +41,7 @@ type File struct { // @Success 200 {string} string "{"code": -1, "message": "添加失败"}" // @Router /api/v1/public/uploadFile [post] func (e File) UploadFile(c *gin.Context) { - e.SetContext(c) + e.MakeContext(c) tag, _ := c.GetPostForm("type") urlPrefix := fmt.Sprintf("http://%s/", c.Request.Host) var fileResponse FileResponse @@ -195,4 +195,4 @@ func ossUpload(name string, path string) error { func qiniuUpload(name string, path string) error { oss := file_store.ALiYunOSS{} return oss.UpLoad(name, path) -} +} \ No newline at end of file diff --git a/app/other/apis/sys_china_area_data.go b/app/other/apis/sys_china_area_data.go index eb56e61..6df8461 100644 --- a/app/other/apis/sys_china_area_data.go +++ b/app/other/apis/sys_china_area_data.go @@ -18,7 +18,7 @@ type SysChinaAreaData struct { } func (e SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) { - e.SetContext(c) + e.MakeContext(c) log := e.GetLogger() d := new(dto2.SysChinaAreaDataSearch) db, err := e.GetOrm() @@ -52,7 +52,7 @@ func (e SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) { } func (e SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) { - e.SetContext(c) + e.MakeContext(c) log := e.GetLogger() control := new(dto2.SysChinaAreaDataById) db, err := e.GetOrm() @@ -85,7 +85,7 @@ func (e SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) { } func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) { - e.SetContext(c) + e.MakeContext(c) log := e.GetLogger() control := new(dto2.SysChinaAreaDataControl) db, err := e.GetOrm() @@ -122,7 +122,7 @@ func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) { } func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) { - e.SetContext(c) + e.MakeContext(c) log := e.GetLogger() control := new(dto2.SysChinaAreaDataControl) db, err := e.GetOrm() @@ -159,7 +159,7 @@ func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) { } func (e SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) { - e.SetContext(c) + e.MakeContext(c) log := e.GetLogger() control := new(dto2.SysChinaAreaDataById) db, err := e.GetOrm() diff --git a/cmd/api/server.go b/cmd/api/server.go index 58cd32f..9b40d88 100644 --- a/cmd/api/server.go +++ b/cmd/api/server.go @@ -3,6 +3,9 @@ package api import ( "context" "fmt" + "github.com/go-admin-team/go-admin-core/sdk/runtime" + "go-admin/app/admin/models" + "go-admin/app/admin/service" router2 "go-admin/app/other/router" "log" "net/http" @@ -19,7 +22,6 @@ import ( "github.com/go-admin-team/go-admin-core/sdk/pkg/logger" "github.com/spf13/cobra" - "go-admin/app/admin/models/system" "go-admin/app/admin/router" "go-admin/app/jobs" "go-admin/common/database" @@ -67,6 +69,9 @@ func setup() { config.LoggerConfig.Stdout)) //3. 初始化数据库链接 database.Setup() + + //list := sdk.Runtime.GetDb() + //list["*"] //4. 设置缓存 cacheAdapter, err := config.CacheConfig.Setup() if err != nil { @@ -98,8 +103,8 @@ func setup() { log.Println(usageStr) //注册监听函数 queue := sdk.Runtime.GetMemoryQueue("") - queue.Register(global.LoginLog, system.SaveLoginLog) - queue.Register(global.OperateLog, system.SaveOperaLog) + queue.Register(global.LoginLog, models.SaveLoginLog) + queue.Register(global.OperateLog, models.SaveOperaLog) go queue.Run() } @@ -133,6 +138,11 @@ func run() error { }() + serviceApi := service.SysApi{} + serviceApi.Orm = sdk.Runtime.GetDb()["*"] + var routers = sdk.Runtime.GetRouter() + serviceApi.CheckStorageSysApi(&routers) + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() @@ -171,7 +181,9 @@ func run() error { return nil } +var Router runtime.Router + func tip() { usageStr := `欢迎使用 ` + pkg.Green(`go-admin `+global.Version) + ` 可以使用 ` + pkg.Red(`-h`) + ` 查看命令` fmt.Printf("%s \n\n", usageStr) -} +} \ No newline at end of file diff --git a/cmd/migrate/migration/models/sys_api.go b/cmd/migrate/migration/models/sys_api.go new file mode 100644 index 0000000..aef97eb --- /dev/null +++ b/cmd/migrate/migration/models/sys_api.go @@ -0,0 +1,30 @@ +package models + +import "go-admin/common/models" + +type SysApi struct { + Id int `json:"id" gorm:"primaryKey;autoIncrement;comment:主键编码"` + Handle string `json:"handle" gorm:"type:varchar(128);comment:handle"` + Title string `json:"title" gorm:"type:varchar(128);comment:标题"` + Permission string `json:"permission" gorm:"size:255;"` + Path string `json:"path" gorm:"type:varchar(128);comment:地址"` + Paths string `json:"paths" gorm:"type:varchar(128);comment:Paths"` + Action string `json:"action" gorm:"type:varchar(16);comment:类型"` + ParentId int `json:"parentId" gorm:"comment:按钮id"` + Sort int `json:"sort" gorm:"type:tinyint(4);comment:排序"` + models.ModelTime + models.ControlBy +} + +func (SysApi) TableName() string { + return "sys_api" +} + +func (e *SysApi) Generate() models.ActiveRecord { + o := *e + return &o +} + +func (e *SysApi) GetId() interface{} { + return e.Id +} \ No newline at end of file diff --git a/cmd/migrate/migration/models/sys_menu.go b/cmd/migrate/migration/models/sys_menu.go index c0f8848..501ba3d 100644 --- a/cmd/migrate/migration/models/sys_menu.go +++ b/cmd/migrate/migration/models/sys_menu.go @@ -1,28 +1,29 @@ package models type SysMenu struct { - MenuId int `json:"menuId" gorm:"primaryKey;autoIncrement"` - MenuName string `json:"menuName" gorm:"size:128;"` - Title string `json:"title" gorm:"size:128;"` - Icon string `json:"icon" gorm:"size:128;"` - Path string `json:"path" gorm:"size:128;"` - Paths string `json:"paths" gorm:"size:128;"` - MenuType string `json:"menuType" gorm:"size:1;"` - Action string `json:"action" gorm:"size:16;"` - Permission string `json:"permission" gorm:"size:255;"` - ParentId int `json:"parentId" gorm:"size:11;"` - NoCache bool `json:"noCache" gorm:"size:8;"` - Breadcrumb string `json:"breadcrumb" gorm:"size:255;"` - Component string `json:"component" gorm:"size:255;"` - Sort int `json:"sort" gorm:"size:4;"` - Visible string `json:"visible" gorm:"size:1;"` - IsFrame string `json:"isFrame" gorm:"size:1;DEFAULT:0;"` - DataScope string `json:"dataScope" gorm:"-"` - Params string `json:"params" gorm:"-"` + MenuId int `json:"menuId" gorm:"primaryKey;autoIncrement"` + MenuName string `json:"menuName" gorm:"size:128;"` + Title string `json:"title" gorm:"size:128;"` + Icon string `json:"icon" gorm:"size:128;"` + Path string `json:"path" gorm:"size:128;"` + Paths string `json:"paths" gorm:"size:128;"` + MenuType string `json:"menuType" gorm:"size:1;"` + Action string `json:"action" gorm:"size:16;"` + Permission string `json:"permission" gorm:"size:255;"` + ParentId int `json:"parentId" gorm:"size:11;"` + NoCache bool `json:"noCache" gorm:"size:8;"` + Breadcrumb string `json:"breadcrumb" gorm:"size:255;"` + Component string `json:"component" gorm:"size:255;"` + Sort int `json:"sort" gorm:"size:4;"` + Visible string `json:"visible" gorm:"size:1;"` + IsFrame string `json:"isFrame" gorm:"size:1;DEFAULT:0;"` + SysApi []SysApi `gorm:"many2many:sys_menu_api_rule"` + DataScope string `json:"dataScope" gorm:"-"` + Params string `json:"params" gorm:"-"` ControlBy ModelTime } func (SysMenu) TableName() string { return "sys_menu" -} +} \ No newline at end of file diff --git a/cmd/migrate/migration/version-local/1614270163879_migrate.go b/cmd/migrate/migration/version-local/1614270163879_migrate.go new file mode 100644 index 0000000..89e297d --- /dev/null +++ b/cmd/migrate/migration/version-local/1614270163879_migrate.go @@ -0,0 +1,4632 @@ +package version_local + +import ( + "encoding/json" + "fmt" + "gorm.io/gorm" + "runtime" + "time" + + "go-admin/app/other/models" + "go-admin/cmd/migrate/migration" + common "go-admin/common/models" + + "github.com/go-admin-team/go-admin-core/sdk/pkg" +) + +func init() { + _, fileName, _, _ := runtime.Caller(0) + migration.Migrate.SetVersion(migration.GetFilename(fileName), _1614270163879Test) +} + +func _1614270163879Test(db *gorm.DB, version string) error { + data := []byte(`{ + "86": { + "110000": "北京市", + "120000": "天津市", + "130000": "河北省", + "140000": "山西省", + "150000": "内蒙古自治区", + "210000": "辽宁省", + "220000": "吉林省", + "230000": "黑龙江省", + "310000": "上海市", + "320000": "江苏省", + "330000": "浙江省", + "340000": "安徽省", + "350000": "福建省", + "360000": "江西省", + "370000": "山东省", + "410000": "河南省", + "420000": "湖北省", + "430000": "湖南省", + "440000": "广东省", + "450000": "广西壮族自治区", + "460000": "海南省", + "500000": "重庆市", + "510000": "四川省", + "520000": "贵州省", + "530000": "云南省", + "540000": "西藏自治区", + "610000": "陕西省", + "620000": "甘肃省", + "630000": "青海省", + "640000": "宁夏回族自治区", + "650000": "新疆维吾尔自治区", + "710000": "台湾省", + "810000": "香港特别行政区", + "820000": "澳门特别行政区" + }, + "110000": { + "110100": "市辖区" + }, + "110100": { + "110101": "东城区", + "110102": "西城区", + "110105": "朝阳区", + "110106": "丰台区", + "110107": "石景山区", + "110108": "海淀区", + "110109": "门头沟区", + "110111": "房山区", + "110112": "通州区", + "110113": "顺义区", + "110114": "昌平区", + "110115": "大兴区", + "110116": "怀柔区", + "110117": "平谷区", + "110118": "密云区", + "110119": "延庆区" + }, + "120000": { + "120100": "市辖区" + }, + "120100": { + "120101": "和平区", + "120102": "河东区", + "120103": "河西区", + "120104": "南开区", + "120105": "河北区", + "120106": "红桥区", + "120110": "东丽区", + "120111": "西青区", + "120112": "津南区", + "120113": "北辰区", + "120114": "武清区", + "120115": "宝坻区", + "120116": "滨海新区", + "120117": "宁河区", + "120118": "静海区", + "120119": "蓟州区" + }, + "130000": { + "130100": "石家庄市", + "130200": "唐山市", + "130300": "秦皇岛市", + "130400": "邯郸市", + "130500": "邢台市", + "130600": "保定市", + "130700": "张家口市", + "130800": "承德市", + "130900": "沧州市", + "131000": "廊坊市", + "131100": "衡水市" + }, + "130100": { + "130101": "市辖区", + "130102": "长安区", + "130104": "桥西区", + "130105": "新华区", + "130107": "井陉矿区", + "130108": "裕华区", + "130109": "藁城区", + "130110": "鹿泉区", + "130111": "栾城区", + "130121": "井陉县", + "130123": "正定县", + "130125": "行唐县", + "130126": "灵寿县", + "130127": "高邑县", + "130128": "深泽县", + "130129": "赞皇县", + "130130": "无极县", + "130131": "平山县", + "130132": "元氏县", + "130133": "赵县", + "130171": "石家庄高新技术产业开发区", + "130172": "石家庄循环化工园区", + "130181": "辛集市", + "130183": "晋州市", + "130184": "新乐市" + }, + "130200": { + "130201": "市辖区", + "130202": "路南区", + "130203": "路北区", + "130204": "古冶区", + "130205": "开平区", + "130207": "丰南区", + "130208": "丰润区", + "130209": "曹妃甸区", + "130224": "滦南县", + "130225": "乐亭县", + "130227": "迁西县", + "130229": "玉田县", + "130271": "河北唐山芦台经济开发区", + "130272": "唐山市汉沽管理区", + "130273": "唐山高新技术产业开发区", + "130274": "河北唐山海港经济开发区", + "130281": "遵化市", + "130283": "迁安市", + "130284": "滦州市" + }, + "130300": { + "130301": "市辖区", + "130302": "海港区", + "130303": "山海关区", + "130304": "北戴河区", + "130306": "抚宁区", + "130321": "青龙满族自治县", + "130322": "昌黎县", + "130324": "卢龙县", + "130371": "秦皇岛市经济技术开发区", + "130372": "北戴河新区" + }, + "130400": { + "130401": "市辖区", + "130402": "邯山区", + "130403": "丛台区", + "130404": "复兴区", + "130406": "峰峰矿区", + "130407": "肥乡区", + "130408": "永年区", + "130423": "临漳县", + "130424": "成安县", + "130425": "大名县", + "130426": "涉县", + "130427": "磁县", + "130430": "邱县", + "130431": "鸡泽县", + "130432": "广平县", + "130433": "馆陶县", + "130434": "魏县", + "130435": "曲周县", + "130471": "邯郸经济技术开发区", + "130473": "邯郸冀南新区", + "130481": "武安市" + }, + "130500": { + "130501": "市辖区", + "130502": "桥东区", + "130503": "桥西区", + "130521": "邢台县", + "130522": "临城县", + "130523": "内丘县", + "130524": "柏乡县", + "130525": "隆尧县", + "130526": "任县", + "130527": "南和县", + "130528": "宁晋县", + "130529": "巨鹿县", + "130530": "新河县", + "130531": "广宗县", + "130532": "平乡县", + "130533": "威县", + "130534": "清河县", + "130535": "临西县", + "130571": "河北邢台经济开发区", + "130581": "南宫市", + "130582": "沙河市" + }, + "130600": { + "130601": "市辖区", + "130602": "竞秀区", + "130606": "莲池区", + "130607": "满城区", + "130608": "清苑区", + "130609": "徐水区", + "130623": "涞水县", + "130624": "阜平县", + "130626": "定兴县", + "130627": "唐县", + "130628": "高阳县", + "130629": "容城县", + "130630": "涞源县", + "130631": "望都县", + "130632": "安新县", + "130633": "易县", + "130634": "曲阳县", + "130635": "蠡县", + "130636": "顺平县", + "130637": "博野县", + "130638": "雄县", + "130671": "保定高新技术产业开发区", + "130672": "保定白沟新城", + "130681": "涿州市", + "130682": "定州市", + "130683": "安国市", + "130684": "高碑店市" + }, + "130700": { + "130701": "市辖区", + "130702": "桥东区", + "130703": "桥西区", + "130705": "宣化区", + "130706": "下花园区", + "130708": "万全区", + "130709": "崇礼区", + "130722": "张北县", + "130723": "康保县", + "130724": "沽源县", + "130725": "尚义县", + "130726": "蔚县", + "130727": "阳原县", + "130728": "怀安县", + "130730": "怀来县", + "130731": "涿鹿县", + "130732": "赤城县", + "130771": "张家口经济开发区", + "130772": "张家口市察北管理区", + "130773": "张家口市塞北管理区" + }, + "130800": { + "130801": "市辖区", + "130802": "双桥区", + "130803": "双滦区", + "130804": "鹰手营子矿区", + "130821": "承德县", + "130822": "兴隆县", + "130824": "滦平县", + "130825": "隆化县", + "130826": "丰宁满族自治县", + "130827": "宽城满族自治县", + "130828": "围场满族蒙古族自治县", + "130871": "承德高新技术产业开发区", + "130881": "平泉市" + }, + "130900": { + "130901": "市辖区", + "130902": "新华区", + "130903": "运河区", + "130921": "沧县", + "130922": "青县", + "130923": "东光县", + "130924": "海兴县", + "130925": "盐山县", + "130926": "肃宁县", + "130927": "南皮县", + "130928": "吴桥县", + "130929": "献县", + "130930": "孟村回族自治县", + "130971": "河北沧州经济开发区", + "130972": "沧州高新技术产业开发区", + "130973": "沧州渤海新区", + "130981": "泊头市", + "130982": "任丘市", + "130983": "黄骅市", + "130984": "河间市" + }, + "131000": { + "131001": "市辖区", + "131002": "安次区", + "131003": "广阳区", + "131022": "固安县", + "131023": "永清县", + "131024": "香河县", + "131025": "大城县", + "131026": "文安县", + "131028": "大厂回族自治县", + "131071": "廊坊经济技术开发区", + "131081": "霸州市", + "131082": "三河市" + }, + "131100": { + "131101": "市辖区", + "131102": "桃城区", + "131103": "冀州区", + "131121": "枣强县", + "131122": "武邑县", + "131123": "武强县", + "131124": "饶阳县", + "131125": "安平县", + "131126": "故城县", + "131127": "景县", + "131128": "阜城县", + "131171": "河北衡水高新技术产业开发区", + "131172": "衡水滨湖新区", + "131182": "深州市" + }, + "140000": { + "140100": "太原市", + "140200": "大同市", + "140300": "阳泉市", + "140400": "长治市", + "140500": "晋城市", + "140600": "朔州市", + "140700": "晋中市", + "140800": "运城市", + "140900": "忻州市", + "141000": "临汾市", + "141100": "吕梁市" + }, + "140100": { + "140101": "市辖区", + "140105": "小店区", + "140106": "迎泽区", + "140107": "杏花岭区", + "140108": "尖草坪区", + "140109": "万柏林区", + "140110": "晋源区", + "140121": "清徐县", + "140122": "阳曲县", + "140123": "娄烦县", + "140171": "山西转型综合改革示范区", + "140181": "古交市" + }, + "140200": { + "140201": "市辖区", + "140212": "新荣区", + "140213": "平城区", + "140214": "云冈区", + "140215": "云州区", + "140221": "阳高县", + "140222": "天镇县", + "140223": "广灵县", + "140224": "灵丘县", + "140225": "浑源县", + "140226": "左云县", + "140271": "山西大同经济开发区" + }, + "140300": { + "140301": "市辖区", + "140302": "城区", + "140303": "矿区", + "140311": "郊区", + "140321": "平定县", + "140322": "盂县" + }, + "140400": { + "140401": "市辖区", + "140403": "潞州区", + "140404": "上党区", + "140405": "屯留区", + "140406": "潞城区", + "140423": "襄垣县", + "140425": "平顺县", + "140426": "黎城县", + "140427": "壶关县", + "140428": "长子县", + "140429": "武乡县", + "140430": "沁县", + "140431": "沁源县", + "140471": "山西长治高新技术产业园区" + }, + "140500": { + "140501": "市辖区", + "140502": "城区", + "140521": "沁水县", + "140522": "阳城县", + "140524": "陵川县", + "140525": "泽州县", + "140581": "高平市" + }, + "140600": { + "140601": "市辖区", + "140602": "朔城区", + "140603": "平鲁区", + "140621": "山阴县", + "140622": "应县", + "140623": "右玉县", + "140671": "山西朔州经济开发区", + "140681": "怀仁市" + }, + "140700": { + "140701": "市辖区", + "140702": "榆次区", + "140721": "榆社县", + "140722": "左权县", + "140723": "和顺县", + "140724": "昔阳县", + "140725": "寿阳县", + "140726": "太谷县", + "140727": "祁县", + "140728": "平遥县", + "140729": "灵石县", + "140781": "介休市" + }, + "140800": { + "140801": "市辖区", + "140802": "盐湖区", + "140821": "临猗县", + "140822": "万荣县", + "140823": "闻喜县", + "140824": "稷山县", + "140825": "新绛县", + "140826": "绛县", + "140827": "垣曲县", + "140828": "夏县", + "140829": "平陆县", + "140830": "芮城县", + "140881": "永济市", + "140882": "河津市" + }, + "140900": { + "140901": "市辖区", + "140902": "忻府区", + "140921": "定襄县", + "140922": "五台县", + "140923": "代县", + "140924": "繁峙县", + "140925": "宁武县", + "140926": "静乐县", + "140927": "神池县", + "140928": "五寨县", + "140929": "岢岚县", + "140930": "河曲县", + "140931": "保德县", + "140932": "偏关县", + "140971": "五台山风景名胜区", + "140981": "原平市" + }, + "141000": { + "141001": "市辖区", + "141002": "尧都区", + "141021": "曲沃县", + "141022": "翼城县", + "141023": "襄汾县", + "141024": "洪洞县", + "141025": "古县", + "141026": "安泽县", + "141027": "浮山县", + "141028": "吉县", + "141029": "乡宁县", + "141030": "大宁县", + "141031": "隰县", + "141032": "永和县", + "141033": "蒲县", + "141034": "汾西县", + "141081": "侯马市", + "141082": "霍州市" + }, + "141100": { + "141101": "市辖区", + "141102": "离石区", + "141121": "文水县", + "141122": "交城县", + "141123": "兴县", + "141124": "临县", + "141125": "柳林县", + "141126": "石楼县", + "141127": "岚县", + "141128": "方山县", + "141129": "中阳县", + "141130": "交口县", + "141181": "孝义市", + "141182": "汾阳市" + }, + "150000": { + "150100": "呼和浩特市", + "150200": "包头市", + "150300": "乌海市", + "150400": "赤峰市", + "150500": "通辽市", + "150600": "鄂尔多斯市", + "150700": "呼伦贝尔市", + "150800": "巴彦淖尔市", + "150900": "乌兰察布市", + "152200": "兴安盟", + "152500": "锡林郭勒盟", + "152900": "阿拉善盟" + }, + "150100": { + "150101": "市辖区", + "150102": "新城区", + "150103": "回民区", + "150104": "玉泉区", + "150105": "赛罕区", + "150121": "土默特左旗", + "150122": "托克托县", + "150123": "和林格尔县", + "150124": "清水河县", + "150125": "武川县", + "150171": "呼和浩特金海工业园区", + "150172": "呼和浩特经济技术开发区" + }, + "150200": { + "150201": "市辖区", + "150202": "东河区", + "150203": "昆都仑区", + "150204": "青山区", + "150205": "石拐区", + "150206": "白云鄂博矿区", + "150207": "九原区", + "150221": "土默特右旗", + "150222": "固阳县", + "150223": "达尔罕茂明安联合旗", + "150271": "包头稀土高新技术产业开发区" + }, + "150300": { + "150301": "市辖区", + "150302": "海勃湾区", + "150303": "海南区", + "150304": "乌达区" + }, + "150400": { + "150401": "市辖区", + "150402": "红山区", + "150403": "元宝山区", + "150404": "松山区", + "150421": "阿鲁科尔沁旗", + "150422": "巴林左旗", + "150423": "巴林右旗", + "150424": "林西县", + "150425": "克什克腾旗", + "150426": "翁牛特旗", + "150428": "喀喇沁旗", + "150429": "宁城县", + "150430": "敖汉旗" + }, + "150500": { + "150501": "市辖区", + "150502": "科尔沁区", + "150521": "科尔沁左翼中旗", + "150522": "科尔沁左翼后旗", + "150523": "开鲁县", + "150524": "库伦旗", + "150525": "奈曼旗", + "150526": "扎鲁特旗", + "150571": "通辽经济技术开发区", + "150581": "霍林郭勒市" + }, + "150600": { + "150601": "市辖区", + "150602": "东胜区", + "150603": "康巴什区", + "150621": "达拉特旗", + "150622": "准格尔旗", + "150623": "鄂托克前旗", + "150624": "鄂托克旗", + "150625": "杭锦旗", + "150626": "乌审旗", + "150627": "伊金霍洛旗" + }, + "150700": { + "150701": "市辖区", + "150702": "海拉尔区", + "150703": "扎赉诺尔区", + "150721": "阿荣旗", + "150722": "莫力达瓦达斡尔族自治旗", + "150723": "鄂伦春自治旗", + "150724": "鄂温克族自治旗", + "150725": "陈巴尔虎旗", + "150726": "新巴尔虎左旗", + "150727": "新巴尔虎右旗", + "150781": "满洲里市", + "150782": "牙克石市", + "150783": "扎兰屯市", + "150784": "额尔古纳市", + "150785": "根河市" + }, + "150800": { + "150801": "市辖区", + "150802": "临河区", + "150821": "五原县", + "150822": "磴口县", + "150823": "乌拉特前旗", + "150824": "乌拉特中旗", + "150825": "乌拉特后旗", + "150826": "杭锦后旗" + }, + "150900": { + "150901": "市辖区", + "150902": "集宁区", + "150921": "卓资县", + "150922": "化德县", + "150923": "商都县", + "150924": "兴和县", + "150925": "凉城县", + "150926": "察哈尔右翼前旗", + "150927": "察哈尔右翼中旗", + "150928": "察哈尔右翼后旗", + "150929": "四子王旗", + "150981": "丰镇市" + }, + "152200": { + "152201": "乌兰浩特市", + "152202": "阿尔山市", + "152221": "科尔沁右翼前旗", + "152222": "科尔沁右翼中旗", + "152223": "扎赉特旗", + "152224": "突泉县" + }, + "152500": { + "152501": "二连浩特市", + "152502": "锡林浩特市", + "152522": "阿巴嘎旗", + "152523": "苏尼特左旗", + "152524": "苏尼特右旗", + "152525": "东乌珠穆沁旗", + "152526": "西乌珠穆沁旗", + "152527": "太仆寺旗", + "152528": "镶黄旗", + "152529": "正镶白旗", + "152530": "正蓝旗", + "152531": "多伦县", + "152571": "乌拉盖管委会" + }, + "152900": { + "152921": "阿拉善左旗", + "152922": "阿拉善右旗", + "152923": "额济纳旗", + "152971": "内蒙古阿拉善经济开发区" + }, + "210000": { + "210100": "沈阳市", + "210200": "大连市", + "210300": "鞍山市", + "210400": "抚顺市", + "210500": "本溪市", + "210600": "丹东市", + "210700": "锦州市", + "210800": "营口市", + "210900": "阜新市", + "211000": "辽阳市", + "211100": "盘锦市", + "211200": "铁岭市", + "211300": "朝阳市", + "211400": "葫芦岛市" + }, + "210100": { + "210101": "市辖区", + "210102": "和平区", + "210103": "沈河区", + "210104": "大东区", + "210105": "皇姑区", + "210106": "铁西区", + "210111": "苏家屯区", + "210112": "浑南区", + "210113": "沈北新区", + "210114": "于洪区", + "210115": "辽中区", + "210123": "康平县", + "210124": "法库县", + "210181": "新民市" + }, + "210200": { + "210201": "市辖区", + "210202": "中山区", + "210203": "西岗区", + "210204": "沙河口区", + "210211": "甘井子区", + "210212": "旅顺口区", + "210213": "金州区", + "210214": "普兰店区", + "210224": "长海县", + "210281": "瓦房店市", + "210283": "庄河市" + }, + "210300": { + "210301": "市辖区", + "210302": "铁东区", + "210303": "铁西区", + "210304": "立山区", + "210311": "千山区", + "210321": "台安县", + "210323": "岫岩满族自治县", + "210381": "海城市" + }, + "210400": { + "210401": "市辖区", + "210402": "新抚区", + "210403": "东洲区", + "210404": "望花区", + "210411": "顺城区", + "210421": "抚顺县", + "210422": "新宾满族自治县", + "210423": "清原满族自治县" + }, + "210500": { + "210501": "市辖区", + "210502": "平山区", + "210503": "溪湖区", + "210504": "明山区", + "210505": "南芬区", + "210521": "本溪满族自治县", + "210522": "桓仁满族自治县" + }, + "210600": { + "210601": "市辖区", + "210602": "元宝区", + "210603": "振兴区", + "210604": "振安区", + "210624": "宽甸满族自治县", + "210681": "东港市", + "210682": "凤城市" + }, + "210700": { + "210701": "市辖区", + "210702": "古塔区", + "210703": "凌河区", + "210711": "太和区", + "210726": "黑山县", + "210727": "义县", + "210781": "凌海市", + "210782": "北镇市" + }, + "210800": { + "210801": "市辖区", + "210802": "站前区", + "210803": "西市区", + "210804": "鲅鱼圈区", + "210811": "老边区", + "210881": "盖州市", + "210882": "大石桥市" + }, + "210900": { + "210901": "市辖区", + "210902": "海州区", + "210903": "新邱区", + "210904": "太平区", + "210905": "清河门区", + "210911": "细河区", + "210921": "阜新蒙古族自治县", + "210922": "彰武县" + }, + "211000": { + "211001": "市辖区", + "211002": "白塔区", + "211003": "文圣区", + "211004": "宏伟区", + "211005": "弓长岭区", + "211011": "太子河区", + "211021": "辽阳县", + "211081": "灯塔市" + }, + "211100": { + "211101": "市辖区", + "211102": "双台子区", + "211103": "兴隆台区", + "211104": "大洼区", + "211122": "盘山县" + }, + "211200": { + "211201": "市辖区", + "211202": "银州区", + "211204": "清河区", + "211221": "铁岭县", + "211223": "西丰县", + "211224": "昌图县", + "211281": "调兵山市", + "211282": "开原市" + }, + "211300": { + "211301": "市辖区", + "211302": "双塔区", + "211303": "龙城区", + "211321": "朝阳县", + "211322": "建平县", + "211324": "喀喇沁左翼蒙古族自治县", + "211381": "北票市", + "211382": "凌源市" + }, + "211400": { + "211401": "市辖区", + "211402": "连山区", + "211403": "龙港区", + "211404": "南票区", + "211421": "绥中县", + "211422": "建昌县", + "211481": "兴城市" + }, + "220000": { + "220100": "长春市", + "220200": "吉林市", + "220300": "四平市", + "220400": "辽源市", + "220500": "通化市", + "220600": "白山市", + "220700": "松原市", + "220800": "白城市", + "222400": "延边朝鲜族自治州" + }, + "220100": { + "220101": "市辖区", + "220102": "南关区", + "220103": "宽城区", + "220104": "朝阳区", + "220105": "二道区", + "220106": "绿园区", + "220112": "双阳区", + "220113": "九台区", + "220122": "农安县", + "220171": "长春经济技术开发区", + "220172": "长春净月高新技术产业开发区", + "220173": "长春高新技术产业开发区", + "220174": "长春汽车经济技术开发区", + "220182": "榆树市", + "220183": "德惠市" + }, + "220200": { + "220201": "市辖区", + "220202": "昌邑区", + "220203": "龙潭区", + "220204": "船营区", + "220211": "丰满区", + "220221": "永吉县", + "220271": "吉林经济开发区", + "220272": "吉林高新技术产业开发区", + "220273": "吉林中国新加坡食品区", + "220281": "蛟河市", + "220282": "桦甸市", + "220283": "舒兰市", + "220284": "磐石市" + }, + "220300": { + "220301": "市辖区", + "220302": "铁西区", + "220303": "铁东区", + "220322": "梨树县", + "220323": "伊通满族自治县", + "220381": "公主岭市", + "220382": "双辽市" + }, + "220400": { + "220401": "市辖区", + "220402": "龙山区", + "220403": "西安区", + "220421": "东丰县", + "220422": "东辽县" + }, + "220500": { + "220501": "市辖区", + "220502": "东昌区", + "220503": "二道江区", + "220521": "通化县", + "220523": "辉南县", + "220524": "柳河县", + "220581": "梅河口市", + "220582": "集安市" + }, + "220600": { + "220601": "市辖区", + "220602": "浑江区", + "220605": "江源区", + "220621": "抚松县", + "220622": "靖宇县", + "220623": "长白朝鲜族自治县", + "220681": "临江市" + }, + "220700": { + "220701": "市辖区", + "220702": "宁江区", + "220721": "前郭尔罗斯蒙古族自治县", + "220722": "长岭县", + "220723": "乾安县", + "220771": "吉林松原经济开发区", + "220781": "扶余市" + }, + "220800": { + "220801": "市辖区", + "220802": "洮北区", + "220821": "镇赉县", + "220822": "通榆县", + "220871": "吉林白城经济开发区", + "220881": "洮南市", + "220882": "大安市" + }, + "222400": { + "222401": "延吉市", + "222402": "图们市", + "222403": "敦化市", + "222404": "珲春市", + "222405": "龙井市", + "222406": "和龙市", + "222424": "汪清县", + "222426": "安图县" + }, + "230000": { + "230100": "哈尔滨市", + "230200": "齐齐哈尔市", + "230300": "鸡西市", + "230400": "鹤岗市", + "230500": "双鸭山市", + "230600": "大庆市", + "230700": "伊春市", + "230800": "佳木斯市", + "230900": "七台河市", + "231000": "牡丹江市", + "231100": "黑河市", + "231200": "绥化市", + "232700": "大兴安岭地区" + }, + "230100": { + "230101": "市辖区", + "230102": "道里区", + "230103": "南岗区", + "230104": "道外区", + "230108": "平房区", + "230109": "松北区", + "230110": "香坊区", + "230111": "呼兰区", + "230112": "阿城区", + "230113": "双城区", + "230123": "依兰县", + "230124": "方正县", + "230125": "宾县", + "230126": "巴彦县", + "230127": "木兰县", + "230128": "通河县", + "230129": "延寿县", + "230183": "尚志市", + "230184": "五常市" + }, + "230200": { + "230201": "市辖区", + "230202": "龙沙区", + "230203": "建华区", + "230204": "铁锋区", + "230205": "昂昂溪区", + "230206": "富拉尔基区", + "230207": "碾子山区", + "230208": "梅里斯达斡尔族区", + "230221": "龙江县", + "230223": "依安县", + "230224": "泰来县", + "230225": "甘南县", + "230227": "富裕县", + "230229": "克山县", + "230230": "克东县", + "230231": "拜泉县", + "230281": "讷河市" + }, + "230300": { + "230301": "市辖区", + "230302": "鸡冠区", + "230303": "恒山区", + "230304": "滴道区", + "230305": "梨树区", + "230306": "城子河区", + "230307": "麻山区", + "230321": "鸡东县", + "230381": "虎林市", + "230382": "密山市" + }, + "230400": { + "230401": "市辖区", + "230402": "向阳区", + "230403": "工农区", + "230404": "南山区", + "230405": "兴安区", + "230406": "东山区", + "230407": "兴山区", + "230421": "萝北县", + "230422": "绥滨县" + }, + "230500": { + "230501": "市辖区", + "230502": "尖山区", + "230503": "岭东区", + "230505": "四方台区", + "230506": "宝山区", + "230521": "集贤县", + "230522": "友谊县", + "230523": "宝清县", + "230524": "饶河县" + }, + "230600": { + "230601": "市辖区", + "230602": "萨尔图区", + "230603": "龙凤区", + "230604": "让胡路区", + "230605": "红岗区", + "230606": "大同区", + "230621": "肇州县", + "230622": "肇源县", + "230623": "林甸县", + "230624": "杜尔伯特蒙古族自治县", + "230671": "大庆高新技术产业开发区" + }, + "230700": { + "230701": "市辖区", + "230717": "伊美区", + "230718": "乌翠区", + "230719": "友好区", + "230722": "嘉荫县", + "230723": "汤旺县", + "230724": "丰林县", + "230725": "大箐山县", + "230726": "南岔县", + "230751": "金林区", + "230781": "铁力市" + }, + "230800": { + "230801": "市辖区", + "230803": "向阳区", + "230804": "前进区", + "230805": "东风区", + "230811": "郊区", + "230822": "桦南县", + "230826": "桦川县", + "230828": "汤原县", + "230881": "同江市", + "230882": "富锦市", + "230883": "抚远市" + }, + "230900": { + "230901": "市辖区", + "230902": "新兴区", + "230903": "桃山区", + "230904": "茄子河区", + "230921": "勃利县" + }, + "231000": { + "231001": "市辖区", + "231002": "东安区", + "231003": "阳明区", + "231004": "爱民区", + "231005": "西安区", + "231025": "林口县", + "231071": "牡丹江经济技术开发区", + "231081": "绥芬河市", + "231083": "海林市", + "231084": "宁安市", + "231085": "穆棱市", + "231086": "东宁市" + }, + "231100": { + "231101": "市辖区", + "231102": "爱辉区", + "231123": "逊克县", + "231124": "孙吴县", + "231181": "北安市", + "231182": "五大连池市", + "231183": "嫩江市" + }, + "231200": { + "231201": "市辖区", + "231202": "北林区", + "231221": "望奎县", + "231222": "兰西县", + "231223": "青冈县", + "231224": "庆安县", + "231225": "明水县", + "231226": "绥棱县", + "231281": "安达市", + "231282": "肇东市", + "231283": "海伦市" + }, + "232700": { + "232701": "漠河市", + "232721": "呼玛县", + "232722": "塔河县", + "232761": "加格达奇区", + "232762": "松岭区", + "232763": "新林区", + "232764": "呼中区" + }, + "310000": { + "310100": "市辖区" + }, + "310100": { + "310101": "黄浦区", + "310104": "徐汇区", + "310105": "长宁区", + "310106": "静安区", + "310107": "普陀区", + "310109": "虹口区", + "310110": "杨浦区", + "310112": "闵行区", + "310113": "宝山区", + "310114": "嘉定区", + "310115": "浦东新区", + "310116": "金山区", + "310117": "松江区", + "310118": "青浦区", + "310120": "奉贤区", + "310151": "崇明区" + }, + "320000": { + "320100": "南京市", + "320200": "无锡市", + "320300": "徐州市", + "320400": "常州市", + "320500": "苏州市", + "320600": "南通市", + "320700": "连云港市", + "320800": "淮安市", + "320900": "盐城市", + "321000": "扬州市", + "321100": "镇江市", + "321200": "泰州市", + "321300": "宿迁市" + }, + "320100": { + "320101": "市辖区", + "320102": "玄武区", + "320104": "秦淮区", + "320105": "建邺区", + "320106": "鼓楼区", + "320111": "浦口区", + "320113": "栖霞区", + "320114": "雨花台区", + "320115": "江宁区", + "320116": "六合区", + "320117": "溧水区", + "320118": "高淳区" + }, + "320200": { + "320201": "市辖区", + "320205": "锡山区", + "320206": "惠山区", + "320211": "滨湖区", + "320213": "梁溪区", + "320214": "新吴区", + "320281": "江阴市", + "320282": "宜兴市" + }, + "320300": { + "320301": "市辖区", + "320302": "鼓楼区", + "320303": "云龙区", + "320305": "贾汪区", + "320311": "泉山区", + "320312": "铜山区", + "320321": "丰县", + "320322": "沛县", + "320324": "睢宁县", + "320371": "徐州经济技术开发区", + "320381": "新沂市", + "320382": "邳州市" + }, + "320400": { + "320401": "市辖区", + "320402": "天宁区", + "320404": "钟楼区", + "320411": "新北区", + "320412": "武进区", + "320413": "金坛区", + "320481": "溧阳市" + }, + "320500": { + "320501": "市辖区", + "320505": "虎丘区", + "320506": "吴中区", + "320507": "相城区", + "320508": "姑苏区", + "320509": "吴江区", + "320571": "苏州工业园区", + "320581": "常熟市", + "320582": "张家港市", + "320583": "昆山市", + "320585": "太仓市" + }, + "320600": { + "320601": "市辖区", + "320602": "崇川区", + "320611": "港闸区", + "320612": "通州区", + "320623": "如东县", + "320671": "南通经济技术开发区", + "320681": "启东市", + "320682": "如皋市", + "320684": "海门市", + "320685": "海安市" + }, + "320700": { + "320701": "市辖区", + "320703": "连云区", + "320706": "海州区", + "320707": "赣榆区", + "320722": "东海县", + "320723": "灌云县", + "320724": "灌南县", + "320771": "连云港经济技术开发区", + "320772": "连云港高新技术产业开发区" + }, + "320800": { + "320801": "市辖区", + "320803": "淮安区", + "320804": "淮阴区", + "320812": "清江浦区", + "320813": "洪泽区", + "320826": "涟水县", + "320830": "盱眙县", + "320831": "金湖县", + "320871": "淮安经济技术开发区" + }, + "320900": { + "320901": "市辖区", + "320902": "亭湖区", + "320903": "盐都区", + "320904": "大丰区", + "320921": "响水县", + "320922": "滨海县", + "320923": "阜宁县", + "320924": "射阳县", + "320925": "建湖县", + "320971": "盐城经济技术开发区", + "320981": "东台市" + }, + "321000": { + "321001": "市辖区", + "321002": "广陵区", + "321003": "邗江区", + "321012": "江都区", + "321023": "宝应县", + "321071": "扬州经济技术开发区", + "321081": "仪征市", + "321084": "高邮市" + }, + "321100": { + "321101": "市辖区", + "321102": "京口区", + "321111": "润州区", + "321112": "丹徒区", + "321171": "镇江新区", + "321181": "丹阳市", + "321182": "扬中市", + "321183": "句容市" + }, + "321200": { + "321201": "市辖区", + "321202": "海陵区", + "321203": "高港区", + "321204": "姜堰区", + "321271": "泰州医药高新技术产业开发区", + "321281": "兴化市", + "321282": "靖江市", + "321283": "泰兴市" + }, + "321300": { + "321301": "市辖区", + "321302": "宿城区", + "321311": "宿豫区", + "321322": "沭阳县", + "321323": "泗阳县", + "321324": "泗洪县", + "321371": "宿迁经济技术开发区" + }, + "330000": { + "330100": "杭州市", + "330200": "宁波市", + "330300": "温州市", + "330400": "嘉兴市", + "330500": "湖州市", + "330600": "绍兴市", + "330700": "金华市", + "330800": "衢州市", + "330900": "舟山市", + "331000": "台州市", + "331100": "丽水市" + }, + "330100": { + "330101": "市辖区", + "330102": "上城区", + "330103": "下城区", + "330104": "江干区", + "330105": "拱墅区", + "330106": "西湖区", + "330108": "滨江区", + "330109": "萧山区", + "330110": "余杭区", + "330111": "富阳区", + "330112": "临安区", + "330122": "桐庐县", + "330127": "淳安县", + "330182": "建德市" + }, + "330200": { + "330201": "市辖区", + "330203": "海曙区", + "330205": "江北区", + "330206": "北仑区", + "330211": "镇海区", + "330212": "鄞州区", + "330213": "奉化区", + "330225": "象山县", + "330226": "宁海县", + "330281": "余姚市", + "330282": "慈溪市" + }, + "330300": { + "330301": "市辖区", + "330302": "鹿城区", + "330303": "龙湾区", + "330304": "瓯海区", + "330305": "洞头区", + "330324": "永嘉县", + "330326": "平阳县", + "330327": "苍南县", + "330328": "文成县", + "330329": "泰顺县", + "330371": "温州经济技术开发区", + "330381": "瑞安市", + "330382": "乐清市", + "330383": "龙港市" + }, + "330400": { + "330401": "市辖区", + "330402": "南湖区", + "330411": "秀洲区", + "330421": "嘉善县", + "330424": "海盐县", + "330481": "海宁市", + "330482": "平湖市", + "330483": "桐乡市" + }, + "330500": { + "330501": "市辖区", + "330502": "吴兴区", + "330503": "南浔区", + "330521": "德清县", + "330522": "长兴县", + "330523": "安吉县" + }, + "330600": { + "330601": "市辖区", + "330602": "越城区", + "330603": "柯桥区", + "330604": "上虞区", + "330624": "新昌县", + "330681": "诸暨市", + "330683": "嵊州市" + }, + "330700": { + "330701": "市辖区", + "330702": "婺城区", + "330703": "金东区", + "330723": "武义县", + "330726": "浦江县", + "330727": "磐安县", + "330781": "兰溪市", + "330782": "义乌市", + "330783": "东阳市", + "330784": "永康市" + }, + "330800": { + "330801": "市辖区", + "330802": "柯城区", + "330803": "衢江区", + "330822": "常山县", + "330824": "开化县", + "330825": "龙游县", + "330881": "江山市" + }, + "330900": { + "330901": "市辖区", + "330902": "定海区", + "330903": "普陀区", + "330921": "岱山县", + "330922": "嵊泗县" + }, + "331000": { + "331001": "市辖区", + "331002": "椒江区", + "331003": "黄岩区", + "331004": "路桥区", + "331022": "三门县", + "331023": "天台县", + "331024": "仙居县", + "331081": "温岭市", + "331082": "临海市", + "331083": "玉环市" + }, + "331100": { + "331101": "市辖区", + "331102": "莲都区", + "331121": "青田县", + "331122": "缙云县", + "331123": "遂昌县", + "331124": "松阳县", + "331125": "云和县", + "331126": "庆元县", + "331127": "景宁畲族自治县", + "331181": "龙泉市" + }, + "340000": { + "340100": "合肥市", + "340200": "芜湖市", + "340300": "蚌埠市", + "340400": "淮南市", + "340500": "马鞍山市", + "340600": "淮北市", + "340700": "铜陵市", + "340800": "安庆市", + "341000": "黄山市", + "341100": "滁州市", + "341200": "阜阳市", + "341300": "宿州市", + "341500": "六安市", + "341600": "亳州市", + "341700": "池州市", + "341800": "宣城市" + }, + "340100": { + "340101": "市辖区", + "340102": "瑶海区", + "340103": "庐阳区", + "340104": "蜀山区", + "340111": "包河区", + "340121": "长丰县", + "340122": "肥东县", + "340123": "肥西县", + "340124": "庐江县", + "340171": "合肥高新技术产业开发区", + "340172": "合肥经济技术开发区", + "340173": "合肥新站高新技术产业开发区", + "340181": "巢湖市" + }, + "340200": { + "340201": "市辖区", + "340202": "镜湖区", + "340203": "弋江区", + "340207": "鸠江区", + "340208": "三山区", + "340221": "芜湖县", + "340222": "繁昌县", + "340223": "南陵县", + "340225": "无为县", + "340271": "芜湖经济技术开发区", + "340272": "安徽芜湖长江大桥经济开发区" + }, + "340300": { + "340301": "市辖区", + "340302": "龙子湖区", + "340303": "蚌山区", + "340304": "禹会区", + "340311": "淮上区", + "340321": "怀远县", + "340322": "五河县", + "340323": "固镇县", + "340371": "蚌埠市高新技术开发区", + "340372": "蚌埠市经济开发区" + }, + "340400": { + "340401": "市辖区", + "340402": "大通区", + "340403": "田家庵区", + "340404": "谢家集区", + "340405": "八公山区", + "340406": "潘集区", + "340421": "凤台县", + "340422": "寿县" + }, + "340500": { + "340501": "市辖区", + "340503": "花山区", + "340504": "雨山区", + "340506": "博望区", + "340521": "当涂县", + "340522": "含山县", + "340523": "和县" + }, + "340600": { + "340601": "市辖区", + "340602": "杜集区", + "340603": "相山区", + "340604": "烈山区", + "340621": "濉溪县" + }, + "340700": { + "340701": "市辖区", + "340705": "铜官区", + "340706": "义安区", + "340711": "郊区", + "340722": "枞阳县" + }, + "340800": { + "340801": "市辖区", + "340802": "迎江区", + "340803": "大观区", + "340811": "宜秀区", + "340822": "怀宁县", + "340825": "太湖县", + "340826": "宿松县", + "340827": "望江县", + "340828": "岳西县", + "340871": "安徽安庆经济开发区", + "340881": "桐城市", + "340882": "潜山市" + }, + "341000": { + "341001": "市辖区", + "341002": "屯溪区", + "341003": "黄山区", + "341004": "徽州区", + "341021": "歙县", + "341022": "休宁县", + "341023": "黟县", + "341024": "祁门县" + }, + "341100": { + "341101": "市辖区", + "341102": "琅琊区", + "341103": "南谯区", + "341122": "来安县", + "341124": "全椒县", + "341125": "定远县", + "341126": "凤阳县", + "341171": "苏滁现代产业园", + "341172": "滁州经济技术开发区", + "341181": "天长市", + "341182": "明光市" + }, + "341200": { + "341201": "市辖区", + "341202": "颍州区", + "341203": "颍东区", + "341204": "颍泉区", + "341221": "临泉县", + "341222": "太和县", + "341225": "阜南县", + "341226": "颍上县", + "341271": "阜阳合肥现代产业园区", + "341272": "阜阳经济技术开发区", + "341282": "界首市" + }, + "341300": { + "341301": "市辖区", + "341302": "埇桥区", + "341321": "砀山县", + "341322": "萧县", + "341323": "灵璧县", + "341324": "泗县", + "341371": "宿州马鞍山现代产业园区", + "341372": "宿州经济技术开发区" + }, + "341500": { + "341501": "市辖区", + "341502": "金安区", + "341503": "裕安区", + "341504": "叶集区", + "341522": "霍邱县", + "341523": "舒城县", + "341524": "金寨县", + "341525": "霍山县" + }, + "341600": { + "341601": "市辖区", + "341602": "谯城区", + "341621": "涡阳县", + "341622": "蒙城县", + "341623": "利辛县" + }, + "341700": { + "341701": "市辖区", + "341702": "贵池区", + "341721": "东至县", + "341722": "石台县", + "341723": "青阳县" + }, + "341800": { + "341801": "市辖区", + "341802": "宣州区", + "341821": "郎溪县", + "341823": "泾县", + "341824": "绩溪县", + "341825": "旌德县", + "341871": "宣城市经济开发区", + "341881": "宁国市", + "341882": "广德市" + }, + "350000": { + "350100": "福州市", + "350200": "厦门市", + "350300": "莆田市", + "350400": "三明市", + "350500": "泉州市", + "350600": "漳州市", + "350700": "南平市", + "350800": "龙岩市", + "350900": "宁德市" + }, + "350100": { + "350101": "市辖区", + "350102": "鼓楼区", + "350103": "台江区", + "350104": "仓山区", + "350105": "马尾区", + "350111": "晋安区", + "350112": "长乐区", + "350121": "闽侯县", + "350122": "连江县", + "350123": "罗源县", + "350124": "闽清县", + "350125": "永泰县", + "350128": "平潭县", + "350181": "福清市" + }, + "350200": { + "350201": "市辖区", + "350203": "思明区", + "350205": "海沧区", + "350206": "湖里区", + "350211": "集美区", + "350212": "同安区", + "350213": "翔安区" + }, + "350300": { + "350301": "市辖区", + "350302": "城厢区", + "350303": "涵江区", + "350304": "荔城区", + "350305": "秀屿区", + "350322": "仙游县" + }, + "350400": { + "350401": "市辖区", + "350402": "梅列区", + "350403": "三元区", + "350421": "明溪县", + "350423": "清流县", + "350424": "宁化县", + "350425": "大田县", + "350426": "尤溪县", + "350427": "沙县", + "350428": "将乐县", + "350429": "泰宁县", + "350430": "建宁县", + "350481": "永安市" + }, + "350500": { + "350501": "市辖区", + "350502": "鲤城区", + "350503": "丰泽区", + "350504": "洛江区", + "350505": "泉港区", + "350521": "惠安县", + "350524": "安溪县", + "350525": "永春县", + "350526": "德化县", + "350527": "金门县", + "350581": "石狮市", + "350582": "晋江市", + "350583": "南安市" + }, + "350600": { + "350601": "市辖区", + "350602": "芗城区", + "350603": "龙文区", + "350622": "云霄县", + "350623": "漳浦县", + "350624": "诏安县", + "350625": "长泰县", + "350626": "东山县", + "350627": "南靖县", + "350628": "平和县", + "350629": "华安县", + "350681": "龙海市" + }, + "350700": { + "350701": "市辖区", + "350702": "延平区", + "350703": "建阳区", + "350721": "顺昌县", + "350722": "浦城县", + "350723": "光泽县", + "350724": "松溪县", + "350725": "政和县", + "350781": "邵武市", + "350782": "武夷山市", + "350783": "建瓯市" + }, + "350800": { + "350801": "市辖区", + "350802": "新罗区", + "350803": "永定区", + "350821": "长汀县", + "350823": "上杭县", + "350824": "武平县", + "350825": "连城县", + "350881": "漳平市" + }, + "350900": { + "350901": "市辖区", + "350902": "蕉城区", + "350921": "霞浦县", + "350922": "古田县", + "350923": "屏南县", + "350924": "寿宁县", + "350925": "周宁县", + "350926": "柘荣县", + "350981": "福安市", + "350982": "福鼎市" + }, + "360000": { + "360100": "南昌市", + "360200": "景德镇市", + "360300": "萍乡市", + "360400": "九江市", + "360500": "新余市", + "360600": "鹰潭市", + "360700": "赣州市", + "360800": "吉安市", + "360900": "宜春市", + "361000": "抚州市", + "361100": "上饶市" + }, + "360100": { + "360101": "市辖区", + "360102": "东湖区", + "360103": "西湖区", + "360104": "青云谱区", + "360105": "湾里区", + "360111": "青山湖区", + "360112": "新建区", + "360121": "南昌县", + "360123": "安义县", + "360124": "进贤县" + }, + "360200": { + "360201": "市辖区", + "360202": "昌江区", + "360203": "珠山区", + "360222": "浮梁县", + "360281": "乐平市" + }, + "360300": { + "360301": "市辖区", + "360302": "安源区", + "360313": "湘东区", + "360321": "莲花县", + "360322": "上栗县", + "360323": "芦溪县" + }, + "360400": { + "360401": "市辖区", + "360402": "濂溪区", + "360403": "浔阳区", + "360404": "柴桑区", + "360423": "武宁县", + "360424": "修水县", + "360425": "永修县", + "360426": "德安县", + "360428": "都昌县", + "360429": "湖口县", + "360430": "彭泽县", + "360481": "瑞昌市", + "360482": "共青城市", + "360483": "庐山市" + }, + "360500": { + "360501": "市辖区", + "360502": "渝水区", + "360521": "分宜县" + }, + "360600": { + "360601": "市辖区", + "360602": "月湖区", + "360603": "余江区", + "360681": "贵溪市" + }, + "360700": { + "360701": "市辖区", + "360702": "章贡区", + "360703": "南康区", + "360704": "赣县区", + "360722": "信丰县", + "360723": "大余县", + "360724": "上犹县", + "360725": "崇义县", + "360726": "安远县", + "360727": "龙南县", + "360728": "定南县", + "360729": "全南县", + "360730": "宁都县", + "360731": "于都县", + "360732": "兴国县", + "360733": "会昌县", + "360734": "寻乌县", + "360735": "石城县", + "360781": "瑞金市" + }, + "360800": { + "360801": "市辖区", + "360802": "吉州区", + "360803": "青原区", + "360821": "吉安县", + "360822": "吉水县", + "360823": "峡江县", + "360824": "新干县", + "360825": "永丰县", + "360826": "泰和县", + "360827": "遂川县", + "360828": "万安县", + "360829": "安福县", + "360830": "永新县", + "360881": "井冈山市" + }, + "360900": { + "360901": "市辖区", + "360902": "袁州区", + "360921": "奉新县", + "360922": "万载县", + "360923": "上高县", + "360924": "宜丰县", + "360925": "靖安县", + "360926": "铜鼓县", + "360981": "丰城市", + "360982": "樟树市", + "360983": "高安市" + }, + "361000": { + "361001": "市辖区", + "361002": "临川区", + "361003": "东乡区", + "361021": "南城县", + "361022": "黎川县", + "361023": "南丰县", + "361024": "崇仁县", + "361025": "乐安县", + "361026": "宜黄县", + "361027": "金溪县", + "361028": "资溪县", + "361030": "广昌县" + }, + "361100": { + "361101": "市辖区", + "361102": "信州区", + "361103": "广丰区", + "361104": "广信区", + "361123": "玉山县", + "361124": "铅山县", + "361125": "横峰县", + "361126": "弋阳县", + "361127": "余干县", + "361128": "鄱阳县", + "361129": "万年县", + "361130": "婺源县", + "361181": "德兴市" + }, + "370000": { + "370100": "济南市", + "370200": "青岛市", + "370300": "淄博市", + "370400": "枣庄市", + "370500": "东营市", + "370600": "烟台市", + "370700": "潍坊市", + "370800": "济宁市", + "370900": "泰安市", + "371000": "威海市", + "371100": "日照市", + "371300": "临沂市", + "371400": "德州市", + "371500": "聊城市", + "371600": "滨州市", + "371700": "菏泽市" + }, + "370100": { + "370101": "市辖区", + "370102": "历下区", + "370103": "市中区", + "370104": "槐荫区", + "370105": "天桥区", + "370112": "历城区", + "370113": "长清区", + "370114": "章丘区", + "370115": "济阳区", + "370116": "莱芜区", + "370117": "钢城区", + "370124": "平阴县", + "370126": "商河县", + "370171": "济南高新技术产业开发区" + }, + "370200": { + "370201": "市辖区", + "370202": "市南区", + "370203": "市北区", + "370211": "黄岛区", + "370212": "崂山区", + "370213": "李沧区", + "370214": "城阳区", + "370215": "即墨区", + "370271": "青岛高新技术产业开发区", + "370281": "胶州市", + "370283": "平度市", + "370285": "莱西市" + }, + "370300": { + "370301": "市辖区", + "370302": "淄川区", + "370303": "张店区", + "370304": "博山区", + "370305": "临淄区", + "370306": "周村区", + "370321": "桓台县", + "370322": "高青县", + "370323": "沂源县" + }, + "370400": { + "370401": "市辖区", + "370402": "市中区", + "370403": "薛城区", + "370404": "峄城区", + "370405": "台儿庄区", + "370406": "山亭区", + "370481": "滕州市" + }, + "370500": { + "370501": "市辖区", + "370502": "东营区", + "370503": "河口区", + "370505": "垦利区", + "370522": "利津县", + "370523": "广饶县", + "370571": "东营经济技术开发区", + "370572": "东营港经济开发区" + }, + "370600": { + "370601": "市辖区", + "370602": "芝罘区", + "370611": "福山区", + "370612": "牟平区", + "370613": "莱山区", + "370634": "长岛县", + "370671": "烟台高新技术产业开发区", + "370672": "烟台经济技术开发区", + "370681": "龙口市", + "370682": "莱阳市", + "370683": "莱州市", + "370684": "蓬莱市", + "370685": "招远市", + "370686": "栖霞市", + "370687": "海阳市" + }, + "370700": { + "370701": "市辖区", + "370702": "潍城区", + "370703": "寒亭区", + "370704": "坊子区", + "370705": "奎文区", + "370724": "临朐县", + "370725": "昌乐县", + "370772": "潍坊滨海经济技术开发区", + "370781": "青州市", + "370782": "诸城市", + "370783": "寿光市", + "370784": "安丘市", + "370785": "高密市", + "370786": "昌邑市" + }, + "370800": { + "370801": "市辖区", + "370811": "任城区", + "370812": "兖州区", + "370826": "微山县", + "370827": "鱼台县", + "370828": "金乡县", + "370829": "嘉祥县", + "370830": "汶上县", + "370831": "泗水县", + "370832": "梁山县", + "370871": "济宁高新技术产业开发区", + "370881": "曲阜市", + "370883": "邹城市" + }, + "370900": { + "370901": "市辖区", + "370902": "泰山区", + "370911": "岱岳区", + "370921": "宁阳县", + "370923": "东平县", + "370982": "新泰市", + "370983": "肥城市" + }, + "371000": { + "371001": "市辖区", + "371002": "环翠区", + "371003": "文登区", + "371071": "威海火炬高技术产业开发区", + "371072": "威海经济技术开发区", + "371073": "威海临港经济技术开发区", + "371082": "荣成市", + "371083": "乳山市" + }, + "371100": { + "371101": "市辖区", + "371102": "东港区", + "371103": "岚山区", + "371121": "五莲县", + "371122": "莒县", + "371171": "日照经济技术开发区" + }, + "371300": { + "371301": "市辖区", + "371302": "兰山区", + "371311": "罗庄区", + "371312": "河东区", + "371321": "沂南县", + "371322": "郯城县", + "371323": "沂水县", + "371324": "兰陵县", + "371325": "费县", + "371326": "平邑县", + "371327": "莒南县", + "371328": "蒙阴县", + "371329": "临沭县", + "371371": "临沂高新技术产业开发区", + "371372": "临沂经济技术开发区", + "371373": "临沂临港经济开发区" + }, + "371400": { + "371401": "市辖区", + "371402": "德城区", + "371403": "陵城区", + "371422": "宁津县", + "371423": "庆云县", + "371424": "临邑县", + "371425": "齐河县", + "371426": "平原县", + "371427": "夏津县", + "371428": "武城县", + "371471": "德州经济技术开发区", + "371472": "德州运河经济开发区", + "371481": "乐陵市", + "371482": "禹城市" + }, + "371500": { + "371501": "市辖区", + "371502": "东昌府区", + "371503": "茌平区", + "371521": "阳谷县", + "371522": "莘县", + "371524": "东阿县", + "371525": "冠县", + "371526": "高唐县", + "371581": "临清市" + }, + "371600": { + "371601": "市辖区", + "371602": "滨城区", + "371603": "沾化区", + "371621": "惠民县", + "371622": "阳信县", + "371623": "无棣县", + "371625": "博兴县", + "371681": "邹平市" + }, + "371700": { + "371701": "市辖区", + "371702": "牡丹区", + "371703": "定陶区", + "371721": "曹县", + "371722": "单县", + "371723": "成武县", + "371724": "巨野县", + "371725": "郓城县", + "371726": "鄄城县", + "371728": "东明县", + "371771": "菏泽经济技术开发区", + "371772": "菏泽高新技术开发区" + }, + "410000": { + "410100": "郑州市", + "410200": "开封市", + "410300": "洛阳市", + "410400": "平顶山市", + "410500": "安阳市", + "410600": "鹤壁市", + "410700": "新乡市", + "410800": "焦作市", + "410900": "濮阳市", + "411000": "许昌市", + "411100": "漯河市", + "411200": "三门峡市", + "411300": "南阳市", + "411400": "商丘市", + "411500": "信阳市", + "411600": "周口市", + "411700": "驻马店市", + "419000": "省直辖县级行政区划" + }, + "410100": { + "410101": "市辖区", + "410102": "中原区", + "410103": "二七区", + "410104": "管城回族区", + "410105": "金水区", + "410106": "上街区", + "410108": "惠济区", + "410122": "中牟县", + "410171": "郑州经济技术开发区", + "410172": "郑州高新技术产业开发区", + "410173": "郑州航空港经济综合实验区", + "410181": "巩义市", + "410182": "荥阳市", + "410183": "新密市", + "410184": "新郑市", + "410185": "登封市" + }, + "410200": { + "410201": "市辖区", + "410202": "龙亭区", + "410203": "顺河回族区", + "410204": "鼓楼区", + "410205": "禹王台区", + "410212": "祥符区", + "410221": "杞县", + "410222": "通许县", + "410223": "尉氏县", + "410225": "兰考县" + }, + "410300": { + "410301": "市辖区", + "410302": "老城区", + "410303": "西工区", + "410304": "瀍河回族区", + "410305": "涧西区", + "410306": "吉利区", + "410311": "洛龙区", + "410322": "孟津县", + "410323": "新安县", + "410324": "栾川县", + "410325": "嵩县", + "410326": "汝阳县", + "410327": "宜阳县", + "410328": "洛宁县", + "410329": "伊川县", + "410371": "洛阳高新技术产业开发区", + "410381": "偃师市" + }, + "410400": { + "410401": "市辖区", + "410402": "新华区", + "410403": "卫东区", + "410404": "石龙区", + "410411": "湛河区", + "410421": "宝丰县", + "410422": "叶县", + "410423": "鲁山县", + "410425": "郏县", + "410471": "平顶山高新技术产业开发区", + "410472": "平顶山市城乡一体化示范区", + "410481": "舞钢市", + "410482": "汝州市" + }, + "410500": { + "410501": "市辖区", + "410502": "文峰区", + "410503": "北关区", + "410505": "殷都区", + "410506": "龙安区", + "410522": "安阳县", + "410523": "汤阴县", + "410526": "滑县", + "410527": "内黄县", + "410571": "安阳高新技术产业开发区", + "410581": "林州市" + }, + "410600": { + "410601": "市辖区", + "410602": "鹤山区", + "410603": "山城区", + "410611": "淇滨区", + "410621": "浚县", + "410622": "淇县", + "410671": "鹤壁经济技术开发区" + }, + "410700": { + "410701": "市辖区", + "410702": "红旗区", + "410703": "卫滨区", + "410704": "凤泉区", + "410711": "牧野区", + "410721": "新乡县", + "410724": "获嘉县", + "410725": "原阳县", + "410726": "延津县", + "410727": "封丘县", + "410771": "新乡高新技术产业开发区", + "410772": "新乡经济技术开发区", + "410773": "新乡市平原城乡一体化示范区", + "410781": "卫辉市", + "410782": "辉县市", + "410783": "长垣市" + }, + "410800": { + "410801": "市辖区", + "410802": "解放区", + "410803": "中站区", + "410804": "马村区", + "410811": "山阳区", + "410821": "修武县", + "410822": "博爱县", + "410823": "武陟县", + "410825": "温县", + "410871": "焦作城乡一体化示范区", + "410882": "沁阳市", + "410883": "孟州市" + }, + "410900": { + "410901": "市辖区", + "410902": "华龙区", + "410922": "清丰县", + "410923": "南乐县", + "410926": "范县", + "410927": "台前县", + "410928": "濮阳县", + "410971": "河南濮阳工业园区", + "410972": "濮阳经济技术开发区" + }, + "411000": { + "411001": "市辖区", + "411002": "魏都区", + "411003": "建安区", + "411024": "鄢陵县", + "411025": "襄城县", + "411071": "许昌经济技术开发区", + "411081": "禹州市", + "411082": "长葛市" + }, + "411100": { + "411101": "市辖区", + "411102": "源汇区", + "411103": "郾城区", + "411104": "召陵区", + "411121": "舞阳县", + "411122": "临颍县", + "411171": "漯河经济技术开发区" + }, + "411200": { + "411201": "市辖区", + "411202": "湖滨区", + "411203": "陕州区", + "411221": "渑池县", + "411224": "卢氏县", + "411271": "河南三门峡经济开发区", + "411281": "义马市", + "411282": "灵宝市" + }, + "411300": { + "411301": "市辖区", + "411302": "宛城区", + "411303": "卧龙区", + "411321": "南召县", + "411322": "方城县", + "411323": "西峡县", + "411324": "镇平县", + "411325": "内乡县", + "411326": "淅川县", + "411327": "社旗县", + "411328": "唐河县", + "411329": "新野县", + "411330": "桐柏县", + "411371": "南阳高新技术产业开发区", + "411372": "南阳市城乡一体化示范区", + "411381": "邓州市" + }, + "411400": { + "411401": "市辖区", + "411402": "梁园区", + "411403": "睢阳区", + "411421": "民权县", + "411422": "睢县", + "411423": "宁陵县", + "411424": "柘城县", + "411425": "虞城县", + "411426": "夏邑县", + "411471": "豫东综合物流产业聚集区", + "411472": "河南商丘经济开发区", + "411481": "永城市" + }, + "411500": { + "411501": "市辖区", + "411502": "浉河区", + "411503": "平桥区", + "411521": "罗山县", + "411522": "光山县", + "411523": "新县", + "411524": "商城县", + "411525": "固始县", + "411526": "潢川县", + "411527": "淮滨县", + "411528": "息县", + "411571": "信阳高新技术产业开发区" + }, + "411600": { + "411601": "市辖区", + "411602": "川汇区", + "411603": "淮阳区", + "411621": "扶沟县", + "411622": "西华县", + "411623": "商水县", + "411624": "沈丘县", + "411625": "郸城县", + "411627": "太康县", + "411628": "鹿邑县", + "411671": "河南周口经济开发区", + "411681": "项城市" + }, + "411700": { + "411701": "市辖区", + "411702": "驿城区", + "411721": "西平县", + "411722": "上蔡县", + "411723": "平舆县", + "411724": "正阳县", + "411725": "确山县", + "411726": "泌阳县", + "411727": "汝南县", + "411728": "遂平县", + "411729": "新蔡县", + "411771": "河南驻马店经济开发区" + }, + "419000": { + "419001": "济源市" + }, + "420000": { + "420100": "武汉市", + "420200": "黄石市", + "420300": "十堰市", + "420500": "宜昌市", + "420600": "襄阳市", + "420700": "鄂州市", + "420800": "荆门市", + "420900": "孝感市", + "421000": "荆州市", + "421100": "黄冈市", + "421200": "咸宁市", + "421300": "随州市", + "422800": "恩施土家族苗族自治州", + "429000": "省直辖县级行政区划" + }, + "420100": { + "420101": "市辖区", + "420102": "江岸区", + "420103": "江汉区", + "420104": "硚口区", + "420105": "汉阳区", + "420106": "武昌区", + "420107": "青山区", + "420111": "洪山区", + "420112": "东西湖区", + "420113": "汉南区", + "420114": "蔡甸区", + "420115": "江夏区", + "420116": "黄陂区", + "420117": "新洲区" + }, + "420200": { + "420201": "市辖区", + "420202": "黄石港区", + "420203": "西塞山区", + "420204": "下陆区", + "420205": "铁山区", + "420222": "阳新县", + "420281": "大冶市" + }, + "420300": { + "420301": "市辖区", + "420302": "茅箭区", + "420303": "张湾区", + "420304": "郧阳区", + "420322": "郧西县", + "420323": "竹山县", + "420324": "竹溪县", + "420325": "房县", + "420381": "丹江口市" + }, + "420500": { + "420501": "市辖区", + "420502": "西陵区", + "420503": "伍家岗区", + "420504": "点军区", + "420505": "猇亭区", + "420506": "夷陵区", + "420525": "远安县", + "420526": "兴山县", + "420527": "秭归县", + "420528": "长阳土家族自治县", + "420529": "五峰土家族自治县", + "420581": "宜都市", + "420582": "当阳市", + "420583": "枝江市" + }, + "420600": { + "420601": "市辖区", + "420602": "襄城区", + "420606": "樊城区", + "420607": "襄州区", + "420624": "南漳县", + "420625": "谷城县", + "420626": "保康县", + "420682": "老河口市", + "420683": "枣阳市", + "420684": "宜城市" + }, + "420700": { + "420701": "市辖区", + "420702": "梁子湖区", + "420703": "华容区", + "420704": "鄂城区" + }, + "420800": { + "420801": "市辖区", + "420802": "东宝区", + "420804": "掇刀区", + "420822": "沙洋县", + "420881": "钟祥市", + "420882": "京山市" + }, + "420900": { + "420901": "市辖区", + "420902": "孝南区", + "420921": "孝昌县", + "420922": "大悟县", + "420923": "云梦县", + "420981": "应城市", + "420982": "安陆市", + "420984": "汉川市" + }, + "421000": { + "421001": "市辖区", + "421002": "沙市区", + "421003": "荆州区", + "421022": "公安县", + "421023": "监利县", + "421024": "江陵县", + "421071": "荆州经济技术开发区", + "421081": "石首市", + "421083": "洪湖市", + "421087": "松滋市" + }, + "421100": { + "421101": "市辖区", + "421102": "黄州区", + "421121": "团风县", + "421122": "红安县", + "421123": "罗田县", + "421124": "英山县", + "421125": "浠水县", + "421126": "蕲春县", + "421127": "黄梅县", + "421171": "龙感湖管理区", + "421181": "麻城市", + "421182": "武穴市" + }, + "421200": { + "421201": "市辖区", + "421202": "咸安区", + "421221": "嘉鱼县", + "421222": "通城县", + "421223": "崇阳县", + "421224": "通山县", + "421281": "赤壁市" + }, + "421300": { + "421301": "市辖区", + "421303": "曾都区", + "421321": "随县", + "421381": "广水市" + }, + "422800": { + "422801": "恩施市", + "422802": "利川市", + "422822": "建始县", + "422823": "巴东县", + "422825": "宣恩县", + "422826": "咸丰县", + "422827": "来凤县", + "422828": "鹤峰县" + }, + "429000": { + "429004": "仙桃市", + "429005": "潜江市", + "429006": "天门市", + "429021": "神农架林区" + }, + "430000": { + "430100": "长沙市", + "430200": "株洲市", + "430300": "湘潭市", + "430400": "衡阳市", + "430500": "邵阳市", + "430600": "岳阳市", + "430700": "常德市", + "430800": "张家界市", + "430900": "益阳市", + "431000": "郴州市", + "431100": "永州市", + "431200": "怀化市", + "431300": "娄底市", + "433100": "湘西土家族苗族自治州" + }, + "430100": { + "430101": "市辖区", + "430102": "芙蓉区", + "430103": "天心区", + "430104": "岳麓区", + "430105": "开福区", + "430111": "雨花区", + "430112": "望城区", + "430121": "长沙县", + "430181": "浏阳市", + "430182": "宁乡市" + }, + "430200": { + "430201": "市辖区", + "430202": "荷塘区", + "430203": "芦淞区", + "430204": "石峰区", + "430211": "天元区", + "430212": "渌口区", + "430223": "攸县", + "430224": "茶陵县", + "430225": "炎陵县", + "430271": "云龙示范区", + "430281": "醴陵市" + }, + "430300": { + "430301": "市辖区", + "430302": "雨湖区", + "430304": "岳塘区", + "430321": "湘潭县", + "430371": "湖南湘潭高新技术产业园区", + "430372": "湘潭昭山示范区", + "430373": "湘潭九华示范区", + "430381": "湘乡市", + "430382": "韶山市" + }, + "430400": { + "430401": "市辖区", + "430405": "珠晖区", + "430406": "雁峰区", + "430407": "石鼓区", + "430408": "蒸湘区", + "430412": "南岳区", + "430421": "衡阳县", + "430422": "衡南县", + "430423": "衡山县", + "430424": "衡东县", + "430426": "祁东县", + "430471": "衡阳综合保税区", + "430472": "湖南衡阳高新技术产业园区", + "430473": "湖南衡阳松木经济开发区", + "430481": "耒阳市", + "430482": "常宁市" + }, + "430500": { + "430501": "市辖区", + "430502": "双清区", + "430503": "大祥区", + "430511": "北塔区", + "430522": "新邵县", + "430523": "邵阳县", + "430524": "隆回县", + "430525": "洞口县", + "430527": "绥宁县", + "430528": "新宁县", + "430529": "城步苗族自治县", + "430581": "武冈市", + "430582": "邵东市" + }, + "430600": { + "430601": "市辖区", + "430602": "岳阳楼区", + "430603": "云溪区", + "430611": "君山区", + "430621": "岳阳县", + "430623": "华容县", + "430624": "湘阴县", + "430626": "平江县", + "430671": "岳阳市屈原管理区", + "430681": "汨罗市", + "430682": "临湘市" + }, + "430700": { + "430701": "市辖区", + "430702": "武陵区", + "430703": "鼎城区", + "430721": "安乡县", + "430722": "汉寿县", + "430723": "澧县", + "430724": "临澧县", + "430725": "桃源县", + "430726": "石门县", + "430771": "常德市西洞庭管理区", + "430781": "津市市" + }, + "430800": { + "430801": "市辖区", + "430802": "永定区", + "430811": "武陵源区", + "430821": "慈利县", + "430822": "桑植县" + }, + "430900": { + "430901": "市辖区", + "430902": "资阳区", + "430903": "赫山区", + "430921": "南县", + "430922": "桃江县", + "430923": "安化县", + "430971": "益阳市大通湖管理区", + "430972": "湖南益阳高新技术产业园区", + "430981": "沅江市" + }, + "431000": { + "431001": "市辖区", + "431002": "北湖区", + "431003": "苏仙区", + "431021": "桂阳县", + "431022": "宜章县", + "431023": "永兴县", + "431024": "嘉禾县", + "431025": "临武县", + "431026": "汝城县", + "431027": "桂东县", + "431028": "安仁县", + "431081": "资兴市" + }, + "431100": { + "431101": "市辖区", + "431102": "零陵区", + "431103": "冷水滩区", + "431121": "祁阳县", + "431122": "东安县", + "431123": "双牌县", + "431124": "道县", + "431125": "江永县", + "431126": "宁远县", + "431127": "蓝山县", + "431128": "新田县", + "431129": "江华瑶族自治县", + "431171": "永州经济技术开发区", + "431172": "永州市金洞管理区", + "431173": "永州市回龙圩管理区" + }, + "431200": { + "431201": "市辖区", + "431202": "鹤城区", + "431221": "中方县", + "431222": "沅陵县", + "431223": "辰溪县", + "431224": "溆浦县", + "431225": "会同县", + "431226": "麻阳苗族自治县", + "431227": "新晃侗族自治县", + "431228": "芷江侗族自治县", + "431229": "靖州苗族侗族自治县", + "431230": "通道侗族自治县", + "431271": "怀化市洪江管理区", + "431281": "洪江市" + }, + "431300": { + "431301": "市辖区", + "431302": "娄星区", + "431321": "双峰县", + "431322": "新化县", + "431381": "冷水江市", + "431382": "涟源市" + }, + "433100": { + "433101": "吉首市", + "433122": "泸溪县", + "433123": "凤凰县", + "433124": "花垣县", + "433125": "保靖县", + "433126": "古丈县", + "433127": "永顺县", + "433130": "龙山县", + "433173": "湖南永顺经济开发区" + }, + "440000": { + "440100": "广州市", + "440200": "韶关市", + "440300": "深圳市", + "440400": "珠海市", + "440500": "汕头市", + "440600": "佛山市", + "440700": "江门市", + "440800": "湛江市", + "440900": "茂名市", + "441200": "肇庆市", + "441300": "惠州市", + "441400": "梅州市", + "441500": "汕尾市", + "441600": "河源市", + "441700": "阳江市", + "441800": "清远市", + "441900": "东莞市", + "442000": "中山市", + "445100": "潮州市", + "445200": "揭阳市", + "445300": "云浮市" + }, + "440100": { + "440101": "市辖区", + "440103": "荔湾区", + "440104": "越秀区", + "440105": "海珠区", + "440106": "天河区", + "440111": "白云区", + "440112": "黄埔区", + "440113": "番禺区", + "440114": "花都区", + "440115": "南沙区", + "440117": "从化区", + "440118": "增城区" + }, + "440200": { + "440201": "市辖区", + "440203": "武江区", + "440204": "浈江区", + "440205": "曲江区", + "440222": "始兴县", + "440224": "仁化县", + "440229": "翁源县", + "440232": "乳源瑶族自治县", + "440233": "新丰县", + "440281": "乐昌市", + "440282": "南雄市" + }, + "440300": { + "440301": "市辖区", + "440303": "罗湖区", + "440304": "福田区", + "440305": "南山区", + "440306": "宝安区", + "440307": "龙岗区", + "440308": "盐田区", + "440309": "龙华区", + "440310": "坪山区", + "440311": "光明区" + }, + "440400": { + "440401": "市辖区", + "440402": "香洲区", + "440403": "斗门区", + "440404": "金湾区" + }, + "440500": { + "440501": "市辖区", + "440507": "龙湖区", + "440511": "金平区", + "440512": "濠江区", + "440513": "潮阳区", + "440514": "潮南区", + "440515": "澄海区", + "440523": "南澳县" + }, + "440600": { + "440601": "市辖区", + "440604": "禅城区", + "440605": "南海区", + "440606": "顺德区", + "440607": "三水区", + "440608": "高明区" + }, + "440700": { + "440701": "市辖区", + "440703": "蓬江区", + "440704": "江海区", + "440705": "新会区", + "440781": "台山市", + "440783": "开平市", + "440784": "鹤山市", + "440785": "恩平市" + }, + "440800": { + "440801": "市辖区", + "440802": "赤坎区", + "440803": "霞山区", + "440804": "坡头区", + "440811": "麻章区", + "440823": "遂溪县", + "440825": "徐闻县", + "440881": "廉江市", + "440882": "雷州市", + "440883": "吴川市" + }, + "440900": { + "440901": "市辖区", + "440902": "茂南区", + "440904": "电白区", + "440981": "高州市", + "440982": "化州市", + "440983": "信宜市" + }, + "441200": { + "441201": "市辖区", + "441202": "端州区", + "441203": "鼎湖区", + "441204": "高要区", + "441223": "广宁县", + "441224": "怀集县", + "441225": "封开县", + "441226": "德庆县", + "441284": "四会市" + }, + "441300": { + "441301": "市辖区", + "441302": "惠城区", + "441303": "惠阳区", + "441322": "博罗县", + "441323": "惠东县", + "441324": "龙门县" + }, + "441400": { + "441401": "市辖区", + "441402": "梅江区", + "441403": "梅县区", + "441422": "大埔县", + "441423": "丰顺县", + "441424": "五华县", + "441426": "平远县", + "441427": "蕉岭县", + "441481": "兴宁市" + }, + "441500": { + "441501": "市辖区", + "441502": "城区", + "441521": "海丰县", + "441523": "陆河县", + "441581": "陆丰市" + }, + "441600": { + "441601": "市辖区", + "441602": "源城区", + "441621": "紫金县", + "441622": "龙川县", + "441623": "连平县", + "441624": "和平县", + "441625": "东源县" + }, + "441700": { + "441701": "市辖区", + "441702": "江城区", + "441704": "阳东区", + "441721": "阳西县", + "441781": "阳春市" + }, + "441800": { + "441801": "市辖区", + "441802": "清城区", + "441803": "清新区", + "441821": "佛冈县", + "441823": "阳山县", + "441825": "连山壮族瑶族自治县", + "441826": "连南瑶族自治县", + "441881": "英德市", + "441882": "连州市" + }, + "441900": { + "441900003": "东城街道", + "441900004": "南城街道", + "441900005": "万江街道", + "441900006": "莞城街道", + "441900101": "石碣镇", + "441900102": "石龙镇", + "441900103": "茶山镇", + "441900104": "石排镇", + "441900105": "企石镇", + "441900106": "横沥镇", + "441900107": "桥头镇", + "441900108": "谢岗镇", + "441900109": "东坑镇", + "441900110": "常平镇", + "441900111": "寮步镇", + "441900112": "樟木头镇", + "441900113": "大朗镇", + "441900114": "黄江镇", + "441900115": "清溪镇", + "441900116": "塘厦镇", + "441900117": "凤岗镇", + "441900118": "大岭山镇", + "441900119": "长安镇", + "441900121": "虎门镇", + "441900122": "厚街镇", + "441900123": "沙田镇", + "441900124": "道滘镇", + "441900125": "洪梅镇", + "441900126": "麻涌镇", + "441900127": "望牛墩镇", + "441900128": "中堂镇", + "441900129": "高埗镇", + "441900401": "松山湖", + "441900402": "东莞港", + "441900403": "东莞生态园" + }, + "442000": { + "442000001": "石岐街道", + "442000002": "东区街道", + "442000003": "中山港街道", + "442000004": "西区街道", + "442000005": "南区街道", + "442000006": "五桂山街道", + "442000100": "小榄镇", + "442000101": "黄圃镇", + "442000102": "民众镇", + "442000103": "东凤镇", + "442000104": "东升镇", + "442000105": "古镇镇", + "442000106": "沙溪镇", + "442000107": "坦洲镇", + "442000108": "港口镇", + "442000109": "三角镇", + "442000110": "横栏镇", + "442000111": "南头镇", + "442000112": "阜沙镇", + "442000113": "南朗镇", + "442000114": "三乡镇", + "442000115": "板芙镇", + "442000116": "大涌镇", + "442000117": "神湾镇" + }, + "445100": { + "445101": "市辖区", + "445102": "湘桥区", + "445103": "潮安区", + "445122": "饶平县" + }, + "445200": { + "445201": "市辖区", + "445202": "榕城区", + "445203": "揭东区", + "445222": "揭西县", + "445224": "惠来县", + "445281": "普宁市" + }, + "445300": { + "445301": "市辖区", + "445302": "云城区", + "445303": "云安区", + "445321": "新兴县", + "445322": "郁南县", + "445381": "罗定市" + }, + "450000": { + "450100": "南宁市", + "450200": "柳州市", + "450300": "桂林市", + "450400": "梧州市", + "450500": "北海市", + "450600": "防城港市", + "450700": "钦州市", + "450800": "贵港市", + "450900": "玉林市", + "451000": "百色市", + "451100": "贺州市", + "451200": "河池市", + "451300": "来宾市", + "451400": "崇左市" + }, + "450100": { + "450101": "市辖区", + "450102": "兴宁区", + "450103": "青秀区", + "450105": "江南区", + "450107": "西乡塘区", + "450108": "良庆区", + "450109": "邕宁区", + "450110": "武鸣区", + "450123": "隆安县", + "450124": "马山县", + "450125": "上林县", + "450126": "宾阳县", + "450127": "横县" + }, + "450200": { + "450201": "市辖区", + "450202": "城中区", + "450203": "鱼峰区", + "450204": "柳南区", + "450205": "柳北区", + "450206": "柳江区", + "450222": "柳城县", + "450223": "鹿寨县", + "450224": "融安县", + "450225": "融水苗族自治县", + "450226": "三江侗族自治县" + }, + "450300": { + "450301": "市辖区", + "450302": "秀峰区", + "450303": "叠彩区", + "450304": "象山区", + "450305": "七星区", + "450311": "雁山区", + "450312": "临桂区", + "450321": "阳朔县", + "450323": "灵川县", + "450324": "全州县", + "450325": "兴安县", + "450326": "永福县", + "450327": "灌阳县", + "450328": "龙胜各族自治县", + "450329": "资源县", + "450330": "平乐县", + "450332": "恭城瑶族自治县", + "450381": "荔浦市" + }, + "450400": { + "450401": "市辖区", + "450403": "万秀区", + "450405": "长洲区", + "450406": "龙圩区", + "450421": "苍梧县", + "450422": "藤县", + "450423": "蒙山县", + "450481": "岑溪市" + }, + "450500": { + "450501": "市辖区", + "450502": "海城区", + "450503": "银海区", + "450512": "铁山港区", + "450521": "合浦县" + }, + "450600": { + "450601": "市辖区", + "450602": "港口区", + "450603": "防城区", + "450621": "上思县", + "450681": "东兴市" + }, + "450700": { + "450701": "市辖区", + "450702": "钦南区", + "450703": "钦北区", + "450721": "灵山县", + "450722": "浦北县" + }, + "450800": { + "450801": "市辖区", + "450802": "港北区", + "450803": "港南区", + "450804": "覃塘区", + "450821": "平南县", + "450881": "桂平市" + }, + "450900": { + "450901": "市辖区", + "450902": "玉州区", + "450903": "福绵区", + "450921": "容县", + "450922": "陆川县", + "450923": "博白县", + "450924": "兴业县", + "450981": "北流市" + }, + "451000": { + "451001": "市辖区", + "451002": "右江区", + "451003": "田阳区", + "451022": "田东县", + "451023": "平果县", + "451024": "德保县", + "451026": "那坡县", + "451027": "凌云县", + "451028": "乐业县", + "451029": "田林县", + "451030": "西林县", + "451031": "隆林各族自治县", + "451081": "靖西市" + }, + "451100": { + "451101": "市辖区", + "451102": "八步区", + "451103": "平桂区", + "451121": "昭平县", + "451122": "钟山县", + "451123": "富川瑶族自治县" + }, + "451200": { + "451201": "市辖区", + "451202": "金城江区", + "451203": "宜州区", + "451221": "南丹县", + "451222": "天峨县", + "451223": "凤山县", + "451224": "东兰县", + "451225": "罗城仫佬族自治县", + "451226": "环江毛南族自治县", + "451227": "巴马瑶族自治县", + "451228": "都安瑶族自治县", + "451229": "大化瑶族自治县" + }, + "451300": { + "451301": "市辖区", + "451302": "兴宾区", + "451321": "忻城县", + "451322": "象州县", + "451323": "武宣县", + "451324": "金秀瑶族自治县", + "451381": "合山市" + }, + "451400": { + "451401": "市辖区", + "451402": "江州区", + "451421": "扶绥县", + "451422": "宁明县", + "451423": "龙州县", + "451424": "大新县", + "451425": "天等县", + "451481": "凭祥市" + }, + "460000": { + "460100": "海口市", + "460200": "三亚市", + "460300": "三沙市", + "460400": "儋州市", + "469000": "省直辖县级行政区划" + }, + "460100": { + "460101": "市辖区", + "460105": "秀英区", + "460106": "龙华区", + "460107": "琼山区", + "460108": "美兰区" + }, + "460200": { + "460201": "市辖区", + "460202": "海棠区", + "460203": "吉阳区", + "460204": "天涯区", + "460205": "崖州区" + }, + "460300": { + "460321": "西沙群岛", + "460322": "南沙群岛", + "460323": "中沙群岛的岛礁及其海域" + }, + "460400": { + "460400100": "那大镇", + "460400101": "和庆镇", + "460400102": "南丰镇", + "460400103": "大成镇", + "460400104": "雅星镇", + "460400105": "兰洋镇", + "460400106": "光村镇", + "460400107": "木棠镇", + "460400108": "海头镇", + "460400109": "峨蔓镇", + "460400111": "王五镇", + "460400112": "白马井镇", + "460400113": "中和镇", + "460400114": "排浦镇", + "460400115": "东成镇", + "460400116": "新州镇", + "460400499": "洋浦经济开发区", + "460400500": "华南热作学院" + }, + "469000": { + "469001": "五指山市", + "469002": "琼海市", + "469005": "文昌市", + "469006": "万宁市", + "469007": "东方市", + "469021": "定安县", + "469022": "屯昌县", + "469023": "澄迈县", + "469024": "临高县", + "469025": "白沙黎族自治县", + "469026": "昌江黎族自治县", + "469027": "乐东黎族自治县", + "469028": "陵水黎族自治县", + "469029": "保亭黎族苗族自治县", + "469030": "琼中黎族苗族自治县" + }, + "500000": { + "500100": "市辖区", + "500200": "县" + }, + "500100": { + "500101": "万州区", + "500102": "涪陵区", + "500103": "渝中区", + "500104": "大渡口区", + "500105": "江北区", + "500106": "沙坪坝区", + "500107": "九龙坡区", + "500108": "南岸区", + "500109": "北碚区", + "500110": "綦江区", + "500111": "大足区", + "500112": "渝北区", + "500113": "巴南区", + "500114": "黔江区", + "500115": "长寿区", + "500116": "江津区", + "500117": "合川区", + "500118": "永川区", + "500119": "南川区", + "500120": "璧山区", + "500151": "铜梁区", + "500152": "潼南区", + "500153": "荣昌区", + "500154": "开州区", + "500155": "梁平区", + "500156": "武隆区" + }, + "500200": { + "500229": "城口县", + "500230": "丰都县", + "500231": "垫江县", + "500233": "忠县", + "500235": "云阳县", + "500236": "奉节县", + "500237": "巫山县", + "500238": "巫溪县", + "500240": "石柱土家族自治县", + "500241": "秀山土家族苗族自治县", + "500242": "酉阳土家族苗族自治县", + "500243": "彭水苗族土家族自治县" + }, + "510000": { + "510100": "成都市", + "510300": "自贡市", + "510400": "攀枝花市", + "510500": "泸州市", + "510600": "德阳市", + "510700": "绵阳市", + "510800": "广元市", + "510900": "遂宁市", + "511000": "内江市", + "511100": "乐山市", + "511300": "南充市", + "511400": "眉山市", + "511500": "宜宾市", + "511600": "广安市", + "511700": "达州市", + "511800": "雅安市", + "511900": "巴中市", + "512000": "资阳市", + "513200": "阿坝藏族羌族自治州", + "513300": "甘孜藏族自治州", + "513400": "凉山彝族自治州" + }, + "510100": { + "510101": "市辖区", + "510104": "锦江区", + "510105": "青羊区", + "510106": "金牛区", + "510107": "武侯区", + "510108": "成华区", + "510112": "龙泉驿区", + "510113": "青白江区", + "510114": "新都区", + "510115": "温江区", + "510116": "双流区", + "510117": "郫都区", + "510121": "金堂县", + "510129": "大邑县", + "510131": "蒲江县", + "510132": "新津县", + "510181": "都江堰市", + "510182": "彭州市", + "510183": "邛崃市", + "510184": "崇州市", + "510185": "简阳市" + }, + "510300": { + "510301": "市辖区", + "510302": "自流井区", + "510303": "贡井区", + "510304": "大安区", + "510311": "沿滩区", + "510321": "荣县", + "510322": "富顺县" + }, + "510400": { + "510401": "市辖区", + "510402": "东区", + "510403": "西区", + "510411": "仁和区", + "510421": "米易县", + "510422": "盐边县" + }, + "510500": { + "510501": "市辖区", + "510502": "江阳区", + "510503": "纳溪区", + "510504": "龙马潭区", + "510521": "泸县", + "510522": "合江县", + "510524": "叙永县", + "510525": "古蔺县" + }, + "510600": { + "510601": "市辖区", + "510603": "旌阳区", + "510604": "罗江区", + "510623": "中江县", + "510681": "广汉市", + "510682": "什邡市", + "510683": "绵竹市" + }, + "510700": { + "510701": "市辖区", + "510703": "涪城区", + "510704": "游仙区", + "510705": "安州区", + "510722": "三台县", + "510723": "盐亭县", + "510725": "梓潼县", + "510726": "北川羌族自治县", + "510727": "平武县", + "510781": "江油市" + }, + "510800": { + "510801": "市辖区", + "510802": "利州区", + "510811": "昭化区", + "510812": "朝天区", + "510821": "旺苍县", + "510822": "青川县", + "510823": "剑阁县", + "510824": "苍溪县" + }, + "510900": { + "510901": "市辖区", + "510903": "船山区", + "510904": "安居区", + "510921": "蓬溪县", + "510923": "大英县", + "510981": "射洪市" + }, + "511000": { + "511001": "市辖区", + "511002": "市中区", + "511011": "东兴区", + "511024": "威远县", + "511025": "资中县", + "511071": "内江经济开发区", + "511083": "隆昌市" + }, + "511100": { + "511101": "市辖区", + "511102": "市中区", + "511111": "沙湾区", + "511112": "五通桥区", + "511113": "金口河区", + "511123": "犍为县", + "511124": "井研县", + "511126": "夹江县", + "511129": "沐川县", + "511132": "峨边彝族自治县", + "511133": "马边彝族自治县", + "511181": "峨眉山市" + }, + "511300": { + "511301": "市辖区", + "511302": "顺庆区", + "511303": "高坪区", + "511304": "嘉陵区", + "511321": "南部县", + "511322": "营山县", + "511323": "蓬安县", + "511324": "仪陇县", + "511325": "西充县", + "511381": "阆中市" + }, + "511400": { + "511401": "市辖区", + "511402": "东坡区", + "511403": "彭山区", + "511421": "仁寿县", + "511423": "洪雅县", + "511424": "丹棱县", + "511425": "青神县" + }, + "511500": { + "511501": "市辖区", + "511502": "翠屏区", + "511503": "南溪区", + "511504": "叙州区", + "511523": "江安县", + "511524": "长宁县", + "511525": "高县", + "511526": "珙县", + "511527": "筠连县", + "511528": "兴文县", + "511529": "屏山县" + }, + "511600": { + "511601": "市辖区", + "511602": "广安区", + "511603": "前锋区", + "511621": "岳池县", + "511622": "武胜县", + "511623": "邻水县", + "511681": "华蓥市" + }, + "511700": { + "511701": "市辖区", + "511702": "通川区", + "511703": "达川区", + "511722": "宣汉县", + "511723": "开江县", + "511724": "大竹县", + "511725": "渠县", + "511771": "达州经济开发区", + "511781": "万源市" + }, + "511800": { + "511801": "市辖区", + "511802": "雨城区", + "511803": "名山区", + "511822": "荥经县", + "511823": "汉源县", + "511824": "石棉县", + "511825": "天全县", + "511826": "芦山县", + "511827": "宝兴县" + }, + "511900": { + "511901": "市辖区", + "511902": "巴州区", + "511903": "恩阳区", + "511921": "通江县", + "511922": "南江县", + "511923": "平昌县", + "511971": "巴中经济开发区" + }, + "512000": { + "512001": "市辖区", + "512002": "雁江区", + "512021": "安岳县", + "512022": "乐至县" + }, + "513200": { + "513201": "马尔康市", + "513221": "汶川县", + "513222": "理县", + "513223": "茂县", + "513224": "松潘县", + "513225": "九寨沟县", + "513226": "金川县", + "513227": "小金县", + "513228": "黑水县", + "513230": "壤塘县", + "513231": "阿坝县", + "513232": "若尔盖县", + "513233": "红原县" + }, + "513300": { + "513301": "康定市", + "513322": "泸定县", + "513323": "丹巴县", + "513324": "九龙县", + "513325": "雅江县", + "513326": "道孚县", + "513327": "炉霍县", + "513328": "甘孜县", + "513329": "新龙县", + "513330": "德格县", + "513331": "白玉县", + "513332": "石渠县", + "513333": "色达县", + "513334": "理塘县", + "513335": "巴塘县", + "513336": "乡城县", + "513337": "稻城县", + "513338": "得荣县" + }, + "513400": { + "513401": "西昌市", + "513422": "木里藏族自治县", + "513423": "盐源县", + "513424": "德昌县", + "513425": "会理县", + "513426": "会东县", + "513427": "宁南县", + "513428": "普格县", + "513429": "布拖县", + "513430": "金阳县", + "513431": "昭觉县", + "513432": "喜德县", + "513433": "冕宁县", + "513434": "越西县", + "513435": "甘洛县", + "513436": "美姑县", + "513437": "雷波县" + }, + "520000": { + "520100": "贵阳市", + "520200": "六盘水市", + "520300": "遵义市", + "520400": "安顺市", + "520500": "毕节市", + "520600": "铜仁市", + "522300": "黔西南布依族苗族自治州", + "522600": "黔东南苗族侗族自治州", + "522700": "黔南布依族苗族自治州" + }, + "520100": { + "520101": "市辖区", + "520102": "南明区", + "520103": "云岩区", + "520111": "花溪区", + "520112": "乌当区", + "520113": "白云区", + "520115": "观山湖区", + "520121": "开阳县", + "520122": "息烽县", + "520123": "修文县", + "520181": "清镇市" + }, + "520200": { + "520201": "钟山区", + "520203": "六枝特区", + "520221": "水城县", + "520281": "盘州市" + }, + "520300": { + "520301": "市辖区", + "520302": "红花岗区", + "520303": "汇川区", + "520304": "播州区", + "520322": "桐梓县", + "520323": "绥阳县", + "520324": "正安县", + "520325": "道真仡佬族苗族自治县", + "520326": "务川仡佬族苗族自治县", + "520327": "凤冈县", + "520328": "湄潭县", + "520329": "余庆县", + "520330": "习水县", + "520381": "赤水市", + "520382": "仁怀市" + }, + "520400": { + "520401": "市辖区", + "520402": "西秀区", + "520403": "平坝区", + "520422": "普定县", + "520423": "镇宁布依族苗族自治县", + "520424": "关岭布依族苗族自治县", + "520425": "紫云苗族布依族自治县" + }, + "520500": { + "520501": "市辖区", + "520502": "七星关区", + "520521": "大方县", + "520522": "黔西县", + "520523": "金沙县", + "520524": "织金县", + "520525": "纳雍县", + "520526": "威宁彝族回族苗族自治县", + "520527": "赫章县" + }, + "520600": { + "520601": "市辖区", + "520602": "碧江区", + "520603": "万山区", + "520621": "江口县", + "520622": "玉屏侗族自治县", + "520623": "石阡县", + "520624": "思南县", + "520625": "印江土家族苗族自治县", + "520626": "德江县", + "520627": "沿河土家族自治县", + "520628": "松桃苗族自治县" + }, + "522300": { + "522301": "兴义市", + "522302": "兴仁市", + "522323": "普安县", + "522324": "晴隆县", + "522325": "贞丰县", + "522326": "望谟县", + "522327": "册亨县", + "522328": "安龙县" + }, + "522600": { + "522601": "凯里市", + "522622": "黄平县", + "522623": "施秉县", + "522624": "三穗县", + "522625": "镇远县", + "522626": "岑巩县", + "522627": "天柱县", + "522628": "锦屏县", + "522629": "剑河县", + "522630": "台江县", + "522631": "黎平县", + "522632": "榕江县", + "522633": "从江县", + "522634": "雷山县", + "522635": "麻江县", + "522636": "丹寨县" + }, + "522700": { + "522701": "都匀市", + "522702": "福泉市", + "522722": "荔波县", + "522723": "贵定县", + "522725": "瓮安县", + "522726": "独山县", + "522727": "平塘县", + "522728": "罗甸县", + "522729": "长顺县", + "522730": "龙里县", + "522731": "惠水县", + "522732": "三都水族自治县" + }, + "530000": { + "530100": "昆明市", + "530300": "曲靖市", + "530400": "玉溪市", + "530500": "保山市", + "530600": "昭通市", + "530700": "丽江市", + "530800": "普洱市", + "530900": "临沧市", + "532300": "楚雄彝族自治州", + "532500": "红河哈尼族彝族自治州", + "532600": "文山壮族苗族自治州", + "532800": "西双版纳傣族自治州", + "532900": "大理白族自治州", + "533100": "德宏傣族景颇族自治州", + "533300": "怒江傈僳族自治州", + "533400": "迪庆藏族自治州" + }, + "530100": { + "530101": "市辖区", + "530102": "五华区", + "530103": "盘龙区", + "530111": "官渡区", + "530112": "西山区", + "530113": "东川区", + "530114": "呈贡区", + "530115": "晋宁区", + "530124": "富民县", + "530125": "宜良县", + "530126": "石林彝族自治县", + "530127": "嵩明县", + "530128": "禄劝彝族苗族自治县", + "530129": "寻甸回族彝族自治县", + "530181": "安宁市" + }, + "530300": { + "530301": "市辖区", + "530302": "麒麟区", + "530303": "沾益区", + "530304": "马龙区", + "530322": "陆良县", + "530323": "师宗县", + "530324": "罗平县", + "530325": "富源县", + "530326": "会泽县", + "530381": "宣威市" + }, + "530400": { + "530401": "市辖区", + "530402": "红塔区", + "530403": "江川区", + "530422": "澄江县", + "530423": "通海县", + "530424": "华宁县", + "530425": "易门县", + "530426": "峨山彝族自治县", + "530427": "新平彝族傣族自治县", + "530428": "元江哈尼族彝族傣族自治县" + }, + "530500": { + "530501": "市辖区", + "530502": "隆阳区", + "530521": "施甸县", + "530523": "龙陵县", + "530524": "昌宁县", + "530581": "腾冲市" + }, + "530600": { + "530601": "市辖区", + "530602": "昭阳区", + "530621": "鲁甸县", + "530622": "巧家县", + "530623": "盐津县", + "530624": "大关县", + "530625": "永善县", + "530626": "绥江县", + "530627": "镇雄县", + "530628": "彝良县", + "530629": "威信县", + "530681": "水富市" + }, + "530700": { + "530701": "市辖区", + "530702": "古城区", + "530721": "玉龙纳西族自治县", + "530722": "永胜县", + "530723": "华坪县", + "530724": "宁蒗彝族自治县" + }, + "530800": { + "530801": "市辖区", + "530802": "思茅区", + "530821": "宁洱哈尼族彝族自治县", + "530822": "墨江哈尼族自治县", + "530823": "景东彝族自治县", + "530824": "景谷傣族彝族自治县", + "530825": "镇沅彝族哈尼族拉祜族自治县", + "530826": "江城哈尼族彝族自治县", + "530827": "孟连傣族拉祜族佤族自治县", + "530828": "澜沧拉祜族自治县", + "530829": "西盟佤族自治县" + }, + "530900": { + "530901": "市辖区", + "530902": "临翔区", + "530921": "凤庆县", + "530922": "云县", + "530923": "永德县", + "530924": "镇康县", + "530925": "双江拉祜族佤族布朗族傣族自治县", + "530926": "耿马傣族佤族自治县", + "530927": "沧源佤族自治县" + }, + "532300": { + "532301": "楚雄市", + "532322": "双柏县", + "532323": "牟定县", + "532324": "南华县", + "532325": "姚安县", + "532326": "大姚县", + "532327": "永仁县", + "532328": "元谋县", + "532329": "武定县", + "532331": "禄丰县" + }, + "532500": { + "532501": "个旧市", + "532502": "开远市", + "532503": "蒙自市", + "532504": "弥勒市", + "532523": "屏边苗族自治县", + "532524": "建水县", + "532525": "石屏县", + "532527": "泸西县", + "532528": "元阳县", + "532529": "红河县", + "532530": "金平苗族瑶族傣族自治县", + "532531": "绿春县", + "532532": "河口瑶族自治县" + }, + "532600": { + "532601": "文山市", + "532622": "砚山县", + "532623": "西畴县", + "532624": "麻栗坡县", + "532625": "马关县", + "532626": "丘北县", + "532627": "广南县", + "532628": "富宁县" + }, + "532800": { + "532801": "景洪市", + "532822": "勐海县", + "532823": "勐腊县" + }, + "532900": { + "532901": "大理市", + "532922": "漾濞彝族自治县", + "532923": "祥云县", + "532924": "宾川县", + "532925": "弥渡县", + "532926": "南涧彝族自治县", + "532927": "巍山彝族回族自治县", + "532928": "永平县", + "532929": "云龙县", + "532930": "洱源县", + "532931": "剑川县", + "532932": "鹤庆县" + }, + "533100": { + "533102": "瑞丽市", + "533103": "芒市", + "533122": "梁河县", + "533123": "盈江县", + "533124": "陇川县" + }, + "533300": { + "533301": "泸水市", + "533323": "福贡县", + "533324": "贡山独龙族怒族自治县", + "533325": "兰坪白族普米族自治县" + }, + "533400": { + "533401": "香格里拉市", + "533422": "德钦县", + "533423": "维西傈僳族自治县" + }, + "540000": { + "540100": "拉萨市", + "540200": "日喀则市", + "540300": "昌都市", + "540400": "林芝市", + "540500": "山南市", + "540600": "那曲市", + "542500": "阿里地区" + }, + "540100": { + "540101": "市辖区", + "540102": "城关区", + "540103": "堆龙德庆区", + "540104": "达孜区", + "540121": "林周县", + "540122": "当雄县", + "540123": "尼木县", + "540124": "曲水县", + "540127": "墨竹工卡县", + "540171": "格尔木藏青工业园区", + "540172": "拉萨经济技术开发区", + "540173": "西藏文化旅游创意园区", + "540174": "达孜工业园区" + }, + "540200": { + "540202": "桑珠孜区", + "540221": "南木林县", + "540222": "江孜县", + "540223": "定日县", + "540224": "萨迦县", + "540225": "拉孜县", + "540226": "昂仁县", + "540227": "谢通门县", + "540228": "白朗县", + "540229": "仁布县", + "540230": "康马县", + "540231": "定结县", + "540232": "仲巴县", + "540233": "亚东县", + "540234": "吉隆县", + "540235": "聂拉木县", + "540236": "萨嘎县", + "540237": "岗巴县" + }, + "540300": { + "540302": "卡若区", + "540321": "江达县", + "540322": "贡觉县", + "540323": "类乌齐县", + "540324": "丁青县", + "540325": "察雅县", + "540326": "八宿县", + "540327": "左贡县", + "540328": "芒康县", + "540329": "洛隆县", + "540330": "边坝县" + }, + "540400": { + "540402": "巴宜区", + "540421": "工布江达县", + "540422": "米林县", + "540423": "墨脱县", + "540424": "波密县", + "540425": "察隅县", + "540426": "朗县" + }, + "540500": { + "540501": "市辖区", + "540502": "乃东区", + "540521": "扎囊县", + "540522": "贡嘎县", + "540523": "桑日县", + "540524": "琼结县", + "540525": "曲松县", + "540526": "措美县", + "540527": "洛扎县", + "540528": "加查县", + "540529": "隆子县", + "540530": "错那县", + "540531": "浪卡子县" + }, + "540600": { + "540602": "色尼区", + "540621": "嘉黎县", + "540622": "比如县", + "540623": "聂荣县", + "540624": "安多县", + "540625": "申扎县", + "540626": "索县", + "540627": "班戈县", + "540628": "巴青县", + "540629": "尼玛县", + "540630": "双湖县" + }, + "542500": { + "542521": "普兰县", + "542522": "札达县", + "542523": "噶尔县", + "542524": "日土县", + "542525": "革吉县", + "542526": "改则县", + "542527": "措勤县" + }, + "610000": { + "610100": "西安市", + "610200": "铜川市", + "610300": "宝鸡市", + "610400": "咸阳市", + "610500": "渭南市", + "610600": "延安市", + "610700": "汉中市", + "610800": "榆林市", + "610900": "安康市", + "611000": "商洛市" + }, + "610100": { + "610101": "市辖区", + "610102": "新城区", + "610103": "碑林区", + "610104": "莲湖区", + "610111": "灞桥区", + "610112": "未央区", + "610113": "雁塔区", + "610114": "阎良区", + "610115": "临潼区", + "610116": "长安区", + "610117": "高陵区", + "610118": "鄠邑区", + "610122": "蓝田县", + "610124": "周至县" + }, + "610200": { + "610201": "市辖区", + "610202": "王益区", + "610203": "印台区", + "610204": "耀州区", + "610222": "宜君县" + }, + "610300": { + "610301": "市辖区", + "610302": "渭滨区", + "610303": "金台区", + "610304": "陈仓区", + "610322": "凤翔县", + "610323": "岐山县", + "610324": "扶风县", + "610326": "眉县", + "610327": "陇县", + "610328": "千阳县", + "610329": "麟游县", + "610330": "凤县", + "610331": "太白县" + }, + "610400": { + "610401": "市辖区", + "610402": "秦都区", + "610403": "杨陵区", + "610404": "渭城区", + "610422": "三原县", + "610423": "泾阳县", + "610424": "乾县", + "610425": "礼泉县", + "610426": "永寿县", + "610428": "长武县", + "610429": "旬邑县", + "610430": "淳化县", + "610431": "武功县", + "610481": "兴平市", + "610482": "彬州市" + }, + "610500": { + "610501": "市辖区", + "610502": "临渭区", + "610503": "华州区", + "610522": "潼关县", + "610523": "大荔县", + "610524": "合阳县", + "610525": "澄城县", + "610526": "蒲城县", + "610527": "白水县", + "610528": "富平县", + "610581": "韩城市", + "610582": "华阴市" + }, + "610600": { + "610601": "市辖区", + "610602": "宝塔区", + "610603": "安塞区", + "610621": "延长县", + "610622": "延川县", + "610625": "志丹县", + "610626": "吴起县", + "610627": "甘泉县", + "610628": "富县", + "610629": "洛川县", + "610630": "宜川县", + "610631": "黄龙县", + "610632": "黄陵县", + "610681": "子长市" + }, + "610700": { + "610701": "市辖区", + "610702": "汉台区", + "610703": "南郑区", + "610722": "城固县", + "610723": "洋县", + "610724": "西乡县", + "610725": "勉县", + "610726": "宁强县", + "610727": "略阳县", + "610728": "镇巴县", + "610729": "留坝县", + "610730": "佛坪县" + }, + "610800": { + "610801": "市辖区", + "610802": "榆阳区", + "610803": "横山区", + "610822": "府谷县", + "610824": "靖边县", + "610825": "定边县", + "610826": "绥德县", + "610827": "米脂县", + "610828": "佳县", + "610829": "吴堡县", + "610830": "清涧县", + "610831": "子洲县", + "610881": "神木市" + }, + "610900": { + "610901": "市辖区", + "610902": "汉滨区", + "610921": "汉阴县", + "610922": "石泉县", + "610923": "宁陕县", + "610924": "紫阳县", + "610925": "岚皋县", + "610926": "平利县", + "610927": "镇坪县", + "610928": "旬阳县", + "610929": "白河县" + }, + "611000": { + "611001": "市辖区", + "611002": "商州区", + "611021": "洛南县", + "611022": "丹凤县", + "611023": "商南县", + "611024": "山阳县", + "611025": "镇安县", + "611026": "柞水县" + }, + "620000": { + "620100": "兰州市", + "620200": "嘉峪关市", + "620300": "金昌市", + "620400": "白银市", + "620500": "天水市", + "620600": "武威市", + "620700": "张掖市", + "620800": "平凉市", + "620900": "酒泉市", + "621000": "庆阳市", + "621100": "定西市", + "621200": "陇南市", + "622900": "临夏回族自治州", + "623000": "甘南藏族自治州" + }, + "620100": { + "620101": "市辖区", + "620102": "城关区", + "620103": "七里河区", + "620104": "西固区", + "620105": "安宁区", + "620111": "红古区", + "620121": "永登县", + "620122": "皋兰县", + "620123": "榆中县", + "620171": "兰州新区" + }, + "620200": { + "620201": "市辖区" + }, + "620300": { + "620301": "市辖区", + "620302": "金川区", + "620321": "永昌县" + }, + "620400": { + "620401": "市辖区", + "620402": "白银区", + "620403": "平川区", + "620421": "靖远县", + "620422": "会宁县", + "620423": "景泰县" + }, + "620500": { + "620501": "市辖区", + "620502": "秦州区", + "620503": "麦积区", + "620521": "清水县", + "620522": "秦安县", + "620523": "甘谷县", + "620524": "武山县", + "620525": "张家川回族自治县" + }, + "620600": { + "620601": "市辖区", + "620602": "凉州区", + "620621": "民勤县", + "620622": "古浪县", + "620623": "天祝藏族自治县" + }, + "620700": { + "620701": "市辖区", + "620702": "甘州区", + "620721": "肃南裕固族自治县", + "620722": "民乐县", + "620723": "临泽县", + "620724": "高台县", + "620725": "山丹县" + }, + "620800": { + "620801": "市辖区", + "620802": "崆峒区", + "620821": "泾川县", + "620822": "灵台县", + "620823": "崇信县", + "620825": "庄浪县", + "620826": "静宁县", + "620881": "华亭市" + }, + "620900": { + "620901": "市辖区", + "620902": "肃州区", + "620921": "金塔县", + "620922": "瓜州县", + "620923": "肃北蒙古族自治县", + "620924": "阿克塞哈萨克族自治县", + "620981": "玉门市", + "620982": "敦煌市" + }, + "621000": { + "621001": "市辖区", + "621002": "西峰区", + "621021": "庆城县", + "621022": "环县", + "621023": "华池县", + "621024": "合水县", + "621025": "正宁县", + "621026": "宁县", + "621027": "镇原县" + }, + "621100": { + "621101": "市辖区", + "621102": "安定区", + "621121": "通渭县", + "621122": "陇西县", + "621123": "渭源县", + "621124": "临洮县", + "621125": "漳县", + "621126": "岷县" + }, + "621200": { + "621201": "市辖区", + "621202": "武都区", + "621221": "成县", + "621222": "文县", + "621223": "宕昌县", + "621224": "康县", + "621225": "西和县", + "621226": "礼县", + "621227": "徽县", + "621228": "两当县" + }, + "622900": { + "622901": "临夏市", + "622921": "临夏县", + "622922": "康乐县", + "622923": "永靖县", + "622924": "广河县", + "622925": "和政县", + "622926": "东乡族自治县", + "622927": "积石山保安族东乡族撒拉族自治县" + }, + "623000": { + "623001": "合作市", + "623021": "临潭县", + "623022": "卓尼县", + "623023": "舟曲县", + "623024": "迭部县", + "623025": "玛曲县", + "623026": "碌曲县", + "623027": "夏河县" + }, + "630000": { + "630100": "西宁市", + "630200": "海东市", + "632200": "海北藏族自治州", + "632300": "黄南藏族自治州", + "632500": "海南藏族自治州", + "632600": "果洛藏族自治州", + "632700": "玉树藏族自治州", + "632800": "海西蒙古族藏族自治州" + }, + "630100": { + "630101": "市辖区", + "630102": "城东区", + "630103": "城中区", + "630104": "城西区", + "630105": "城北区", + "630121": "大通回族土族自治县", + "630122": "湟中县", + "630123": "湟源县" + }, + "630200": { + "630202": "乐都区", + "630203": "平安区", + "630222": "民和回族土族自治县", + "630223": "互助土族自治县", + "630224": "化隆回族自治县", + "630225": "循化撒拉族自治县" + }, + "632200": { + "632221": "门源回族自治县", + "632222": "祁连县", + "632223": "海晏县", + "632224": "刚察县" + }, + "632300": { + "632321": "同仁县", + "632322": "尖扎县", + "632323": "泽库县", + "632324": "河南蒙古族自治县" + }, + "632500": { + "632521": "共和县", + "632522": "同德县", + "632523": "贵德县", + "632524": "兴海县", + "632525": "贵南县" + }, + "632600": { + "632621": "玛沁县", + "632622": "班玛县", + "632623": "甘德县", + "632624": "达日县", + "632625": "久治县", + "632626": "玛多县" + }, + "632700": { + "632701": "玉树市", + "632722": "杂多县", + "632723": "称多县", + "632724": "治多县", + "632725": "囊谦县", + "632726": "曲麻莱县" + }, + "632800": { + "632801": "格尔木市", + "632802": "德令哈市", + "632803": "茫崖市", + "632821": "乌兰县", + "632822": "都兰县", + "632823": "天峻县", + "632857": "大柴旦行政委员会" + }, + "640000": { + "640100": "银川市", + "640200": "石嘴山市", + "640300": "吴忠市", + "640400": "固原市", + "640500": "中卫市" + }, + "640100": { + "640101": "市辖区", + "640104": "兴庆区", + "640105": "西夏区", + "640106": "金凤区", + "640121": "永宁县", + "640122": "贺兰县", + "640181": "灵武市" + }, + "640200": { + "640201": "市辖区", + "640202": "大武口区", + "640205": "惠农区", + "640221": "平罗县" + }, + "640300": { + "640301": "市辖区", + "640302": "利通区", + "640303": "红寺堡区", + "640323": "盐池县", + "640324": "同心县", + "640381": "青铜峡市" + }, + "640400": { + "640401": "市辖区", + "640402": "原州区", + "640422": "西吉县", + "640423": "隆德县", + "640424": "泾源县", + "640425": "彭阳县" + }, + "640500": { + "640501": "市辖区", + "640502": "沙坡头区", + "640521": "中宁县", + "640522": "海原县" + }, + "650000": { + "650100": "乌鲁木齐市", + "650200": "克拉玛依市", + "650400": "吐鲁番市", + "650500": "哈密市", + "652300": "昌吉回族自治州", + "652700": "博尔塔拉蒙古自治州", + "652800": "巴音郭楞蒙古自治州", + "652900": "阿克苏地区", + "653000": "克孜勒苏柯尔克孜自治州", + "653100": "喀什地区", + "653200": "和田地区", + "654000": "伊犁哈萨克自治州", + "654200": "塔城地区", + "654300": "阿勒泰地区", + "659000": "自治区直辖县级行政区划" + }, + "650100": { + "650101": "市辖区", + "650102": "天山区", + "650103": "沙依巴克区", + "650104": "新市区", + "650105": "水磨沟区", + "650106": "头屯河区", + "650107": "达坂城区", + "650109": "米东区", + "650121": "乌鲁木齐县" + }, + "650200": { + "650201": "市辖区", + "650202": "独山子区", + "650203": "克拉玛依区", + "650204": "白碱滩区", + "650205": "乌尔禾区" + }, + "650400": { + "650402": "高昌区", + "650421": "鄯善县", + "650422": "托克逊县" + }, + "650500": { + "650502": "伊州区", + "650521": "巴里坤哈萨克自治县", + "650522": "伊吾县" + }, + "652300": { + "652301": "昌吉市", + "652302": "阜康市", + "652323": "呼图壁县", + "652324": "玛纳斯县", + "652325": "奇台县", + "652327": "吉木萨尔县", + "652328": "木垒哈萨克自治县" + }, + "652700": { + "652701": "博乐市", + "652702": "阿拉山口市", + "652722": "精河县", + "652723": "温泉县" + }, + "652800": { + "652801": "库尔勒市", + "652822": "轮台县", + "652823": "尉犁县", + "652824": "若羌县", + "652825": "且末县", + "652826": "焉耆回族自治县", + "652827": "和静县", + "652828": "和硕县", + "652829": "博湖县", + "652871": "库尔勒经济技术开发区" + }, + "652900": { + "652901": "阿克苏市", + "652922": "温宿县", + "652923": "库车县", + "652924": "沙雅县", + "652925": "新和县", + "652926": "拜城县", + "652927": "乌什县", + "652928": "阿瓦提县", + "652929": "柯坪县" + }, + "653000": { + "653001": "阿图什市", + "653022": "阿克陶县", + "653023": "阿合奇县", + "653024": "乌恰县" + }, + "653100": { + "653101": "喀什市", + "653121": "疏附县", + "653122": "疏勒县", + "653123": "英吉沙县", + "653124": "泽普县", + "653125": "莎车县", + "653126": "叶城县", + "653127": "麦盖提县", + "653128": "岳普湖县", + "653129": "伽师县", + "653130": "巴楚县", + "653131": "塔什库尔干塔吉克自治县" + }, + "653200": { + "653201": "和田市", + "653221": "和田县", + "653222": "墨玉县", + "653223": "皮山县", + "653224": "洛浦县", + "653225": "策勒县", + "653226": "于田县", + "653227": "民丰县" + }, + "654000": { + "654002": "伊宁市", + "654003": "奎屯市", + "654004": "霍尔果斯市", + "654021": "伊宁县", + "654022": "察布查尔锡伯自治县", + "654023": "霍城县", + "654024": "巩留县", + "654025": "新源县", + "654026": "昭苏县", + "654027": "特克斯县", + "654028": "尼勒克县" + }, + "654200": { + "654201": "塔城市", + "654202": "乌苏市", + "654221": "额敏县", + "654223": "沙湾县", + "654224": "托里县", + "654225": "裕民县", + "654226": "和布克赛尔蒙古自治县" + }, + "654300": { + "654301": "阿勒泰市", + "654321": "布尔津县", + "654322": "富蕴县", + "654323": "福海县", + "654324": "哈巴河县", + "654325": "青河县", + "654326": "吉木乃县" + }, + "659000": { + "659001": "石河子市", + "659002": "阿拉尔市", + "659003": "图木舒克市", + "659004": "五家渠市", + "659006": "铁门关市" + }, + "710000": { + "710100": "台北市", + "710200": "高雄市", + "710300": "基隆市", + "710400": "台中市", + "710500": "台南市", + "710600": "新竹市", + "710700": "嘉义市" + }, + "710100": { + "710101": "内湖区", + "710102": "南港区", + "710103": "中正区", + "710104": "松山区", + "710105": "信义区", + "710106": "大安区", + "710107": "中山区", + "710108": "文山区", + "710109": "大同区", + "710110": "万华区", + "710111": "士林区", + "710112": "北投区" + }, + "710200": { + "710201": "新兴区", + "710202": "前金区", + "710203": "芩雅区", + "710204": "盐埕区", + "710205": "鼓山区", + "710206": "旗津区", + "710207": "前镇区", + "710208": "三民区", + "710209": "左营区", + "710210": "楠梓区", + "710211": "小港区" + }, + "710300": { + "710301": "仁爱区", + "710302": "信义区", + "710303": "中正区", + "710304": "暖暖区", + "710305": "安乐区", + "710307": "七堵区" + }, + "710400": { + "710401": "中区", + "710402": "东区", + "710403": "南区", + "710404": "西区", + "710405": "北区", + "710406": "北屯区", + "710407": "西屯区", + "710408": "南屯区" + }, + "710500": { + "710501": "中西区", + "710502": "东区", + "710503": "南区", + "710504": "北区", + "710505": "安平区", + "710506": "安南区" + }, + "710600": { + "710601": "东区", + "710602": "北区", + "710603": "香山区" + }, + "710700": { + "710701": "东区", + "710702": "西区" + }, + "810000": { + "810001": "中西區", + "810002": "灣仔區", + "810003": "東區", + "810004": "南區", + "810005": "油尖旺區", + "810006": "深水埗區", + "810007": "九龍城區", + "810008": "黃大仙區", + "810009": "觀塘區", + "810010": "荃灣區", + "810011": "屯門區", + "810012": "元朗區", + "810013": "北區", + "810014": "大埔區", + "810015": "西貢區", + "810016": "沙田區", + "810017": "葵青區", + "810018": "離島區" + }, + "820000": { + "820001": "花地瑪堂區", + "820002": "花王堂區", + "820003": "望德堂區", + "820004": "大堂區", + "820005": "風順堂區", + "820006": "嘉模堂區", + "820007": "路氹填海區", + "820008": "聖方濟各堂區" + } +}` ) + return db.Transaction(func(tx *gorm.DB) error { + + err := tx.Migrator().AutoMigrate(models.SysChinaAreaData{}) + if err != nil { + fmt.Println("初始化模型失败:", err) + return err + } + + var p map[string]map[string]interface{} + var list []models.SysChinaAreaData + err = json.Unmarshal(data, &p) + if err != nil { + fmt.Println("json err:", err) + return err + } + for k, v := range p { + fmt.Println(k, v) + for k1, v1 := range v { + fmt.Println(k, k1, v1) + var id = 0 + id, _ = pkg.StringToInt(k1) + list = append(list, models.SysChinaAreaData{PId: k, Model: common.Model{Id: id}, Name: v1.(string),ModelTime:common.ModelTime{CreatedAt: time.Now(),UpdatedAt: time.Now()}}) + } + } + err = tx.Create(list).Error + if err != nil { + return err + } + + return tx.Create(&common.Migration{ + Version: version, + }).Error + }) +} \ No newline at end of file diff --git a/cmd/migrate/migration/version/1599190683659_tables.go b/cmd/migrate/migration/version/1599190683659_tables.go index ba23366..1d19dae 100644 --- a/cmd/migrate/migration/version/1599190683659_tables.go +++ b/cmd/migrate/migration/version/1599190683659_tables.go @@ -39,6 +39,7 @@ func _1599190683659Tables(db *gorm.DB, version string) error { new(models.SysFileInfo), new(models.SysCategory), new(models.SysContent), + new(models.SysApi), ) if err != nil { return err @@ -46,4 +47,4 @@ func _1599190683659Tables(db *gorm.DB, version string) error { return db.Create(&common.Migration{ Version: version, }).Error -} +} \ No newline at end of file diff --git a/common/apis/api.go b/common/apis/api.go index ba93ecd..cf21cfd 100644 --- a/common/apis/api.go +++ b/common/apis/api.go @@ -1,12 +1,13 @@ package apis import ( + "errors" "fmt" - "github.com/go-admin-team/go-admin-core/sdk/api" + "github.com/gin-gonic/gin/binding" "net/http" "github.com/gin-gonic/gin" - "github.com/gin-gonic/gin/binding" + "github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/pkg" "github.com/go-admin-team/go-admin-core/sdk/pkg/logger" "github.com/go-admin-team/go-admin-core/sdk/pkg/response" @@ -16,29 +17,38 @@ import ( type Api struct { Context *gin.Context Logger *logger.Logger + Orm *gorm.DB + Errors error } -func (e Api) SetContext(c *gin.Context) { +func (e *Api) AddError(err error) { + if e.Errors == nil { + e.Errors = err + } else if err != nil { + e.Logger.Error(err) + e.Errors = fmt.Errorf("%v; %w", e.Error, err) + } +} + +// MakeContext 设置http上下文 +func (e *Api) MakeContext(c *gin.Context) *Api { fmt.Println(&c) e.Context = c + e.Logger = api.GetRequestLogger(c) fmt.Println(&e.Context) + return e } // GetLogger 获取上下文提供的日志 func (e Api) GetLogger() *logger.Logger { - return api.GetRequestLogger(e.Context) } -//func (e Api) GetLogger() (*logger.Logger, error) { -// if e.Context == nil { -// return nil, errors.New("API context cannot be nil") -// } -// return api.GetRequestLogger(e.Context), nil -//} - func (e Api) Bind(d interface{}, bindings ...binding.Binding) error { var err error + if len(bindings) == 0 { + bindings = append(bindings, binding.JSON, nil) + } for i := range bindings { switch bindings[i] { case binding.JSON: @@ -81,6 +91,24 @@ func (e Api) GetOrm() (*gorm.DB, error) { return db, nil } +// MakeOrm 设置Orm DB +func (e *Api) MakeOrm() *Api { + var err error + if e.Logger == nil { + err = errors.New("at MakeOrm logger is nil") + //e.Logger.Error(http.StatusInternalServerError, err, "at MakeOrm logger is nil") + e.AddError(err) + return e + } + db, err := pkg.GetOrm(e.Context) + if err != nil { + e.Logger.Error(http.StatusInternalServerError, err, "数据库连接获取失败") + e.AddError(err) + } + e.Orm = db + return e +} + // Error 通常错误数据处理 func (e Api) Error(code int, err error, msg string) { response.Error(e.Context, code, err, msg) @@ -99,4 +127,4 @@ func (e Api) PageOK(result interface{}, count int, pageIndex int, pageSize int, // Custom 兼容函数 func (e Api) Custom(data gin.H) { response.Custum(e.Context, data) -} +} \ No newline at end of file diff --git a/common/middleware/handler/auth.go b/common/middleware/handler/auth.go index 36d940e..eabbbc8 100644 --- a/common/middleware/handler/auth.go +++ b/common/middleware/handler/auth.go @@ -1,6 +1,7 @@ package handler import ( + "go-admin/app/admin/models" "net/http" "github.com/gin-gonic/gin" @@ -14,7 +15,6 @@ import ( "github.com/go-admin-team/go-admin-core/sdk/pkg/response" "github.com/mssola/user_agent" - "go-admin/app/admin/models/system" "go-admin/common/global" ) @@ -159,8 +159,8 @@ func LogOut(c *gin.Context) { func Authorizator(data interface{}, c *gin.Context) bool { if v, ok := data.(map[string]interface{}); ok { - u, _ := v["user"].(system.SysUser) - r, _ := v["role"].(system.SysRole) + u, _ := v["user"].(models.SysUser) + r, _ := v["role"].(models.SysRole) c.Set("role", r.RoleName) c.Set("roleIds", r.RoleId) c.Set("userId", u.UserId) @@ -177,4 +177,4 @@ func Unauthorized(c *gin.Context, code int, message string) { "code": code, "msg": message, }) -} +} \ No newline at end of file diff --git a/common/service/service.go b/common/service/service.go index 87e0cd6..a748aab 100644 --- a/common/service/service.go +++ b/common/service/service.go @@ -1,6 +1,7 @@ package service import ( + "fmt" "github.com/go-admin-team/go-admin-core/sdk/pkg/logger" "gorm.io/gorm" ) @@ -10,4 +11,14 @@ type Service struct { Msg string MsgID string Log *logger.Logger + Error error +} + +func (db *Service) AddError(err error) error { + if db.Error == nil { + db.Error = err + } else if err != nil { + db.Error = fmt.Errorf("%v; %w", db.Error, err) + } + return db.Error } diff --git a/go.mod b/go.mod index d1c744e..03d0b40 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5 github.com/bytedance/go-tagexpr/v2 v2.7.10 github.com/casbin/casbin/v2 v2.25.1 - github.com/gin-gonic/gin v1.6.3 + github.com/gin-gonic/gin v1.7.1 github.com/go-admin-team/go-admin-core v1.3.5-rc.0.0.20210423072631-e3580b68ee26 github.com/go-admin-team/go-admin-core/sdk v1.3.0-rc.3.0.20210427015751-b42693c49c6c github.com/google/uuid v1.2.0 @@ -28,4 +28,4 @@ require ( gorm.io/driver/postgres v1.0.6-0.20201208020313-1ed927cfab53 gorm.io/driver/sqlite v1.1.5-0.20201206014648-c84401fbe3ba gorm.io/gorm v1.21.6 -) +) \ No newline at end of file diff --git a/template/v4/no_actions/router_check_role.go.template b/template/v4/no_actions/router_check_role.go.template index 0aeb43e..b045297 100644 --- a/template/v4/no_actions/router_check_role.go.template +++ b/template/v4/no_actions/router_check_role.go.template @@ -4,7 +4,7 @@ import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" - "go-admin/app/{{.PackageName}}/apis/{{.ModuleName}}" + "go-admin/app/{{.PackageName}}/apis" "go-admin/common/middleware" ) @@ -14,7 +14,7 @@ func init() { // register{{.ClassName}}Router func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - api := &{{.ModuleName}}.{{.ClassName}}{} + api := apis.{{.ClassName}}{} r := v1.Group("/{{.ModuleName}}").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { r.GET("", api.Get{{.ClassName}}List) diff --git a/template/v4/vue.go.template b/template/v4/vue.go.template index 0e7f050..a47785f 100644 --- a/template/v4/vue.go.template +++ b/template/v4/vue.go.template @@ -6,7 +6,7 @@ {{range .Columns}} {{- $x := .IsQuery -}} - {{- if ($x) -}} + {{- if (eq $x "1") -}} {{- if ne .FkTableName "" -}}