init

datamodels/account.go

@@ -4,7 +4,7 @@ import "time"
 
 type Account struct {
 	OcId            int64       `json:"ocId"             xorm:"'oc_id'             bigint         comment('组织ID:公司或机构或单位ID')"`
-	AccountId       int64       `json:"accountId"        xorm:"'account_id'        bigint not null pk comment('主键ID')"`
+	AccountId       int64       `json:"accountId"        xorm:"'account_id'        bigint         comment('主键ID')"`
 	AccountName     string      `json:"accountName"      xorm:"'account_name'      varchar(128)   comment('帐号名称')"`
 	Password        string      `json:"password"         xorm:"'password'          varchar(128)   comment('密码')"`
 	AccountType     int64       `json:"accountType"      xorm:"'account_type'      bigint         comment('帐号类型：0：系统用户，1：企业用户，2：集团用户，3:政府用户，4:合作伙伴')"`

datamodels/oc.go

@@ -3,22 +3,23 @@ package datamodels
 import "time"
 
 type Oc struct {
-	OcId        int64       `json:"ocId"          form:"ocTypeId"      xorm:"'oc_id'       bigint    pk  comment('主键ID')     " `
-	OcName      string      `json:"ocName"        form:"ocName"        xorm:"'oc_name'     varchar(127)  comment('ENT类型名称') " `
-	OcTypeId    int64       `json:"ocTypeId"      form:"ocTypeId"      xorm:"'oc_type_id'  bigint        comment('Type ID')    " `
-	OcCatId     int64       `json:"ocCatId"       form:"ocCatId"       xorm:"'oc_cat_id'   bigint        comment('Cat ID')     " `
+	OcId        int64       `json:"ocId"          xorm:"'oc_id'       bigint    pk  comment('主键ID')       " `
+	OcName      string      `json:"ocName"        xorm:"'oc_name'     varchar(127)  comment('ENT类型名称')   " `
+	OcTypeId    int64       `json:"ocTypeId"      xorm:"'oc_type_id'  bigint        comment('Type ID')     " `
+	OcCatId     int64       `json:"ocCatId"       xorm:"'oc_cat_id'   bigint        comment('Cat ID')      " `
 	
-	RootId      int64       `json:"rootId"        form:"rootId"        xorm:"'root_id'     bigint        comment('Root ID')     " `
-	ParentId    int64       `json:"parentId"      form:"parentId"      xorm:"'parent_id'   bigint        comment('Parent ID')   " `
-	AdminId     int64       `json:"adminId"       form:"adminId"       xorm:"'admin_id'    bigint        comment('Admin ID')    " `
-	GroupId     int64       `json:"groupId"       form:"groupId"       xorm:"'group_id'    bigint        comment('Root Group Id')" `
-	IfLic       int64       `json:"ifLic"         form:"ifLic"         xorm:"'if_lic'      int           comment('Admin ID')    " `
+	RootId      int64       `json:"rootId"        xorm:"'root_id'     bigint        comment('Root ID')     " `
+	ParentId    int64       `json:"parentId"      xorm:"'parent_id'   bigint        comment('Parent ID')   " `
+	AdminId     int64       `json:"adminId"       xorm:"'admin_id'    bigint        comment('Admin ID')    " `
+	GroupId     int64       `json:"groupId"       xorm:"'group_id'    bigint        comment('Root Group Id')" `
+	IfLic       int64       `json:"ifLic"         xorm:"'if_lic'      int           comment('Admin ID')    " `
 
-	NodeLeft    int         `json:"nodeLeft"      form:"nodeLeft"      xorm:"'node_left'   int           comment('Admin ID')    " `
-	NodeRight   int         `json:"nodeRight"     form:"nodeRight"     xorm:"'node_right'  int           comment('Admin ID')    " `
-	IsLeaf      int         `json:"isLeaf"        form:"isLeaf"        xorm:"'is_leaf'     int           comment('Admin ID')    " `
-	NodeLevel   int         `json:"nodeLevel"     form:"nodeLevel"     xorm:"'node_level'  int           comment('Admin ID')    " `
-	Status      int64       `json:"status"        form:"status"        xorm:"'status'      int           comment('OC Status')   " `
+	NodeLeft    int         `json:"nodeLeft"      xorm:"'node_left'   int           comment('Admin ID')    " `
+	NodeRight   int         `json:"nodeRight"     xorm:"'node_right'  int           comment('Admin ID')    " `
+	IsLeaf      int         `json:"isLeaf"        xorm:"'is_leaf'     int           comment('Admin ID')    " `
+	NodeLevel   int         `json:"nodeLevel"     xorm:"'node_level'  int           comment('Admin ID')    " `
+	Status      int64       `json:"status"        xorm:"'status'      bigint        comment('OC Status')   " `
+	IsFixed     int64       `json:"isFixed"       xorm:"'is_fixed'    bigint        comment('Is Fixed')    " `
 
 	CreatedBy   int64       `json:"createdBy"     xorm:"'created_by'"`
 	CreatedAt   time.Time   `json:"createdAt"     xorm:"'created_at'"`

repositories/x_bus_rebo.go → dataway/database_io.go

@@ -1,4 +1,4 @@
-package repositories
+package dataway
 
 import (
     "errors"
@@ -12,17 +12,17 @@ import (
     "xps/viewmodels"
 )
 
-type XBusRepo struct {
+type DatabaseIO struct {
     engine *xorm.Engine
 }
 
-func NewXBusRepo(engine *xorm.Engine) *XBusRepo {
-    return &XBusRepo{
+func NewDatabaseIO(engine *xorm.Engine) *DatabaseIO {
+    return &DatabaseIO{
         engine: engine,
     }
 }
 
-func (d *XBusRepo) BuildQueryParam(params []viewmodels.QueryParam) string {
+func (d *DatabaseIO) BuildQueryParam(params []viewmodels.QueryParam) string {
     sqlWhere := " WHERE 1 = 1 "
     for _, param := range params {
         paramType := param.Type
@@ -37,7 +37,7 @@ func (d *XBusRepo) BuildQueryParam(params []viewmodels.QueryParam) string {
     return sqlWhere
 }
 
-func (d *XBusRepo) GetPage(sqlStatement, sqlCount string, params []viewmodels.QueryParam, page int, limit int) (*viewmodels.PageResult, error) {
+func (d *DatabaseIO) GetPage(sqlStatement, sqlCount string, params []viewmodels.QueryParam, page int, limit int) (*viewmodels.PageResult, error) {
     sqlWhere  := d.BuildQueryParam(params)
     res, err1 := d.engine.Query(sqlCount + sqlWhere)
     if err1 != nil {
@@ -66,7 +66,7 @@ func (d *XBusRepo) GetPage(sqlStatement, sqlCount string, params []viewmodels.Qu
     return pageResult, nil
 }
 
-func (d *XBusRepo) GetList(sqlStatement string, params []viewmodels.QueryParam) ([]map[string]interface{}, error) {
+func (d *DatabaseIO) GetList(sqlStatement string, params []viewmodels.QueryParam) ([]map[string]interface{}, error) {
     sqlWhere := d.BuildQueryParam(params)
     results, err := d.engine.QueryInterface(sqlStatement + sqlWhere)
     if err != nil {
@@ -75,7 +75,7 @@ func (d *XBusRepo) GetList(sqlStatement string, params []viewmodels.QueryParam)
     return results, nil
 }
 
-func (d *XBusRepo) GetById(sqlStatement string, params []viewmodels.QueryParam)(map[string]interface{}, error){
+func (d *DatabaseIO) GetById(sqlStatement string, params []viewmodels.QueryParam)(map[string]interface{}, error){
     sqlWhere := d.BuildQueryParam(params)
     results, err   := d.engine.QueryInterface(sqlStatement + sqlWhere)
     if err != nil {
@@ -88,7 +88,7 @@ func (d *XBusRepo) GetById(sqlStatement string, params []viewmodels.QueryParam)(
     return results[0], nil
 }
 
-func (d *XBusRepo) Create(objectCode string, values map[string]interface{}) error {
+func (d *DatabaseIO) Create(objectCode string, values map[string]interface{}) error {
     object, err1 := cache.GetModelObject(objectCode)
     if err1 != nil {
         return err1
@@ -133,7 +133,7 @@ func (d *XBusRepo) Create(objectCode string, values map[string]interface{}) erro
     return err3
 }
 
-func (d *XBusRepo) Update(objectCode string, values map[string]interface{}) error {
+func (d *DatabaseIO) Update(objectCode string, values map[string]interface{}) error {
     object, err1 := cache.GetModelObject(objectCode)
     if err1 != nil {
         return err1
@@ -187,7 +187,7 @@ func (d *XBusRepo) Update(objectCode string, values map[string]interface{}) erro
     return err
 }
 
-func (d *XBusRepo) Patch(objectCode string, values map[string]interface{}) error {
+func (d *DatabaseIO) Patch(objectCode string, values map[string]interface{}) error {
     object, err1 := cache.GetModelObject(objectCode)
     if err1 != nil {
         return err1
@@ -238,7 +238,7 @@ func (d *XBusRepo) Patch(objectCode string, values map[string]interface{}) error
     return err
 }
 
-func (d *XBusRepo) Delete(objectCode string, values map[string]interface{}) error {
+func (d *DatabaseIO) Delete(objectCode string, values map[string]interface{}) error {
     object, err1 := cache.GetModelObject(objectCode)
     if err1 == nil {
         return err1

service/x_gateway_service.go → gateway/http_handler.go

@@ -1,4 +1,4 @@
-package service
+package gateway
 
 import (
     "errors"
@@ -6,11 +6,12 @@ import (
     "xps/cache"
     "xps/constant"
     "xps/datasource"
-    "xps/repositories"
+    "xps/dataway"
+    "xps/service"
     "xps/viewmodels"
 )
 
-type XGatewayService interface {
+type HttpHandler interface {
     Get(objectCode, oamCode string, params []viewmodels.QueryParam)(map[string]interface{}, error)
     GetPage(objectCode, oamCode string, params []viewmodels.QueryParam, page int, limit int)(*viewmodels.PageResult, error)
     GetList(objectCode, oamCode string, params []viewmodels.QueryParam)([]map[string]interface{}, error)
@@ -23,17 +24,17 @@ type XGatewayService interface {
     Delete(objectCode, oamCode string, m map[string]interface{}, user *viewmodels.CurUserInfo)error
 }
 
-type xGatewayService struct {
-    xBus *repositories.XBusRepo
+type httpHandler struct {
+    xBus *dataway.DatabaseIO
 }
 
-func NewApiGatewayService() XGatewayService {
-    return &xGatewayService{
-        xBus: repositories.NewXBusRepo(datasource.InstanceSlave()),
+func NewHttpHandler() HttpHandler {
+    return &httpHandler{
+        xBus: dataway.NewDatabaseIO(datasource.InstanceSlave()),
     }
 }
 
-func (a *xGatewayService) GenerateParams(objectCode, oamCode string) (map[string]interface{}, error) {
+func (a *httpHandler) GenerateParams(objectCode, oamCode string) (map[string]interface{}, error) {
     attrs, err2 := cache.GetBizObjectAttrs(objectCode)
     if err2 != nil {
         return nil, err2
@@ -58,7 +59,7 @@ func (a *xGatewayService) GenerateParams(objectCode, oamCode string) (map[string
     return result, nil
 }
 
-func (a *xGatewayService) Get(objectCode, oamCode string, params []viewmodels.QueryParam)(map[string]interface{}, error) {
+func (a *httpHandler) Get(objectCode, oamCode string, params []viewmodels.QueryParam)(map[string]interface{}, error) {
     oam, err1:= cache.GetBizObjectOAM(objectCode, oamCode)
     if err1 != nil {
         return nil, err1
@@ -73,7 +74,7 @@ func (a *xGatewayService) Get(objectCode, oamCode string, params []viewmodels.Qu
     return a.Mapping2BizObjectAttr(objectCode, data)
 }
 
-func (a *xGatewayService) GetList(objectCode, oamCode string, params []viewmodels.QueryParam)([]map[string]interface{}, error) {
+func (a *httpHandler) GetList(objectCode, oamCode string, params []viewmodels.QueryParam)([]map[string]interface{}, error) {
     oam, err1:= cache.GetBizObjectOAM(objectCode, oamCode)
     if err1 != nil {
         return nil, err1
@@ -86,7 +87,7 @@ func (a *xGatewayService) GetList(objectCode, oamCode string, params []viewmodel
     return a.Mapping2BizObjectList(objectCode, dataList)
 }
 
-func (a *xGatewayService) GetPage(objectCode, oamCode string, params []viewmodels.QueryParam, page int, limit int) (*viewmodels.PageResult, error) {
+func (a *httpHandler) GetPage(objectCode, oamCode string, params []viewmodels.QueryParam, page int, limit int) (*viewmodels.PageResult, error) {
     oam , err1:= cache.GetBizObjectOAM(objectCode, oamCode)
     if err1 != nil {
         return nil, err1
@@ -101,7 +102,7 @@ func (a *xGatewayService) GetPage(objectCode, oamCode string, params []viewmodel
     return a.Mapping2BizPageObject(objectCode, pageData)
 }
 
-func (a *xGatewayService) Create(objectCode, oamCode string, m map[string]interface{}, user *viewmodels.CurUserInfo) error {
+func (a *httpHandler) Create(objectCode, oamCode string, m map[string]interface{}, user *viewmodels.CurUserInfo) error {
     err1 := a.HandleOAMRuleList(objectCode, oamCode, m, user)
     if err1 != nil {
         return err1
@@ -127,7 +128,7 @@ func (a *xGatewayService) Create(objectCode, oamCode string, m map[string]interf
     return nil
 }
 
-func (a *xGatewayService) Update(objectCode, oamCode string, m map[string]interface{}, user *viewmodels.CurUserInfo) error {
+func (a *httpHandler) Update(objectCode, oamCode string, m map[string]interface{}, user *viewmodels.CurUserInfo) error {
     err1 := a.HandleOAMRuleList(objectCode, oamCode, m, user)
     if err1 != nil {
         return err1
@@ -154,7 +155,7 @@ func (a *xGatewayService) Update(objectCode, oamCode string, m map[string]interf
     return nil
 }
 
-func (a *xGatewayService) Patch(objectCode, oamCode string, m map[string]interface{}, user *viewmodels.CurUserInfo) error {
+func (a *httpHandler) Patch(objectCode, oamCode string, m map[string]interface{}, user *viewmodels.CurUserInfo) error {
     err1 := a.HandleOAMRuleList(objectCode, oamCode, m, user)
     if err1 != nil {
         return err1
@@ -179,7 +180,7 @@ func (a *xGatewayService) Patch(objectCode, oamCode string, m map[string]interfa
     return nil
 }
 
-func (a *xGatewayService) Delete(objectCode, oamCode string, m map[string]interface{}, user *viewmodels.CurUserInfo) error {
+func (a *httpHandler) Delete(objectCode, oamCode string, m map[string]interface{}, user *viewmodels.CurUserInfo) error {
     err1 := a.HandleOAMRuleList(objectCode, oamCode, m, user)
     if err1 != nil {
         return err1
@@ -205,7 +206,7 @@ func (a *xGatewayService) Delete(objectCode, oamCode string, m map[string]interf
     return nil
 }
 
-func (a *xGatewayService) HandleOAMRuleList(objectCode, oamCode string, m map[string]interface{}, user *viewmodels.CurUserInfo) error {
+func (a *httpHandler) HandleOAMRuleList(objectCode, oamCode string, m map[string]interface{}, user *viewmodels.CurUserInfo) error {
     oamRules, err1 := cache.GetBizObjectOAMRules(objectCode, oamCode)
     if err1 != nil {
         return err1
@@ -220,9 +221,9 @@ func (a *xGatewayService) HandleOAMRuleList(objectCode, oamCode string, m map[st
     return nil
 }
 
-func (a *xGatewayService) HandleOAMRule(oamRule *viewmodels.BizObjectOAMRuleInfo, m map[string]interface{}, user *viewmodels.CurUserInfo)(error) {
+func (a *httpHandler) HandleOAMRule(oamRule *viewmodels.BizObjectOAMRuleInfo, m map[string]interface{}, user *viewmodels.CurUserInfo)(error) {
     if oamRule.RuleId == constant.BIZ_RULE_NEW_ID {
-        m[oamRule.TargetAttrCode] = NewID()
+        m[oamRule.TargetAttrCode] = service.NewID()
     } else if oamRule.RuleId == constant.BIZ_RULE_CUR_DATETIME {
         m[oamRule.TargetAttrCode] = time.Now()
     } else if oamRule.RuleId == constant.BIZ_RULE_CUR_DATE {
@@ -243,7 +244,7 @@ func (a *xGatewayService) HandleOAMRule(oamRule *viewmodels.BizObjectOAMRuleInfo
     return nil
 }
 
-func (a *xGatewayService) Mapping2ModelObjectAttr(objectCode string, m map[string]interface{})(map[string]interface{}, error) {
+func (a *httpHandler) Mapping2ModelObjectAttr(objectCode string, m map[string]interface{})(map[string]interface{}, error) {
     bizObjectAttrs, err := cache.GetBizObjectAttrs(objectCode)
     if err != nil {
         return nil, err
@@ -260,7 +261,7 @@ func (a *xGatewayService) Mapping2ModelObjectAttr(objectCode string, m map[strin
     return m, nil
 }
 
-func (a *xGatewayService) Mapping2BizObjectAttr(objectCode string, m map[string]interface{})(map[string]interface{}, error) {
+func (a *httpHandler) Mapping2BizObjectAttr(objectCode string, m map[string]interface{})(map[string]interface{}, error) {
     bizObjectAttrs, err := cache.GetBizObjectAttrs(objectCode)
     if err != nil {
         return nil, err
@@ -278,7 +279,7 @@ func (a *xGatewayService) Mapping2BizObjectAttr(objectCode string, m map[string]
 }
 
 
-func (a *xGatewayService) Mapping2BizObjectList(objectCode string, dataList []map[string]interface{})([]map[string]interface{}, error) {
+func (a *httpHandler) Mapping2BizObjectList(objectCode string, dataList []map[string]interface{})([]map[string]interface{}, error) {
     bizObjectAttrs, err := cache.GetBizObjectAttrs(objectCode)
     if err != nil {
         return nil, err
@@ -299,7 +300,7 @@ func (a *xGatewayService) Mapping2BizObjectList(objectCode string, dataList []ma
     return targetDataList, nil
 }
 
-func (a *xGatewayService) Mapping2BizPageObject(objectCode string, pageData *viewmodels.PageResult)(*viewmodels.PageResult, error) {
+func (a *httpHandler) Mapping2BizPageObject(objectCode string, pageData *viewmodels.PageResult)(*viewmodels.PageResult, error) {
     bizObjectAttrs, err := cache.GetBizObjectAttrs(objectCode)
     if err != nil {
         return nil, err

repositories/app_cat_repo.go

@@ -72,8 +72,12 @@ func (d *AppCatRepo) GetList(m map[string]interface{}) ([]viewmodels.AppCatInfo,
 }
 
 func (d *AppCatRepo) GetById(appCatId int64) (*viewmodels.AppCatInfo, error) {
+	sqlSelect  := ` SELECT A.*                `
+	sqlFrom    := ` FROM  app_cat AS A        `
+	sqlWhere   := ` WHERE A.deleted_flag = 0  `
+	sqlWhere   += fmt.Sprintf(" AND A.app_cat_id = %d ", appCatId)
 	data := &viewmodels.AppCatInfo{}
-	ok, err := d.engine.Where("app_cat_id = ?", appCatId).Get(data)
+	ok, err   := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere).Limit(1).Get(data)
 	if !ok && err == nil {
 		return nil, err
 	} else {

repositories/task_cat_repo.go

@@ -25,10 +25,11 @@ func (d *TaskCatRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
 
 	sqlSelect := ` SELECT A.*             `
 	sqlFrom   := ` FROM   task_cat   AS A `
-	sqlWhere  := ` WHERE  A.deleted_flag = 0  and A.oc_id = ` + fmt.Sprintf("%d", ocId)
+	sqlWhere  := ` WHERE  A.deleted_flag = 0 `
+	sqlWhere  +=  fmt.Sprintf(" AND A.oc_id =%d ", ocId)
 	
 	if keywords, ok := m["keywords"]; ok {
-		sqlWhere += ` AND   A.task_cat_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
+		sqlWhere += ` AND A.task_cat_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
 	}
 
 	sqlCount    := ` SELECT COUNT(*)   `
@@ -37,7 +38,7 @@ func (d *TaskCatRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
 		return nil, err1
 	}
 
-	sqlOrderBy := " ORDER BY task_cat_id DESC "
+	sqlOrderBy := " ORDER BY A.task_cat_id DESC "
 	pageStart  := (page - 1) * limit
 	sqlLimit   := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
 
@@ -61,12 +62,14 @@ func (d *TaskCatRepo) GetList(m map[string]interface{}) ([]viewmodels.TaskCatInf
 
 	sqlSelect := ` SELECT A.* `
 	sqlFrom   := ` FROM  task_cat   AS A    `
-	sqlWhere  := ` WHERE A.deleted_flag = 0  AND A.oc_id =` + fmt.Sprintf("%d", ocId)
+	sqlWhere  := ` WHERE A.deleted_flag = 0 `
+	sqlWhere  +=  fmt.Sprintf(" AND A.oc_id =%d ", ocId)
+	
 	if keywords, ok := m["keywords"]; ok {
 		sqlWhere += ` AND A.task_cat_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
 	}
 
-	sqlOrderBy := " ORDER BY task_cat_id DESC "
+	sqlOrderBy := " ORDER BY A.task_cat_id DESC "
 	datalist   := make([]viewmodels.TaskCatInfo, 0)
 	err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
 	if err != nil {
@@ -77,9 +80,12 @@ func (d *TaskCatRepo) GetList(m map[string]interface{}) ([]viewmodels.TaskCatInf
 }
 
 func (d *TaskCatRepo) GetById(ocId int64, taskCatId int64) (*viewmodels.TaskCatInfo, error) {
+	sqlSelect := ` SELECT A.*               `
+	sqlFrom   := ` FROM  task_cat   AS A    `
+	sqlWhere  := ` WHERE A.deleted_flag = 0  AND A.oc_id =` + fmt.Sprintf("%d", ocId)
 	data := &viewmodels.TaskCatInfo{}
-	ok, err := d.engine.Where("oc_id = ?", ocId).Where("task_cat_id = ?", taskCatId).Get(data)
-	if !ok && err == nil {
+	has, err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere).Get(data)
+	if !has || err != nil {
 		return nil, err
 	} else {
 		return data, nil

viewmodels/ent_cat_info.go

@@ -1,21 +0,0 @@
-package viewmodels
-
-import "time"
-
-type EntCatInfo struct {
-	EntCatId    int64     `json:"entCatId"        xorm:"'ent_cat_id'      bigint     pk comment('主键ID')          "`
-	EntCatTitle string    `json:"entCatTitle"     xorm:"'ent_cat_title'   varchar(50)   comment('单位类型名称')     "`
-	EntCatDesc  string    `json:"entCatDesc"      xorm:"'ent_cat_desc'    varchar(50)   comment('描述')            "`
-	IsFixed     int64     `json:"isFixed"         xorm:"'is_fixed'        int           comment('是否可修改')       "`
-	CreatedBy   int64     `json:"createdBy"       xorm:"'created_by'"`
-	CreatedAt   time.Time `json:"createdAt"       xorm:"'created_at'"`
-	UpdatedBy   int64     `json:"updatedBy"       xorm:"'updated_by'"`
-	UpdatedAt   time.Time `json:"updatedAt"       xorm:"'updated_at'"`
-	DeletedFlag int64     `json:"deletedFlag"     xorm:"'deleted_flag'"`
-	DeletedBy   int64     `json:"deletedBy"       xorm:"'deleted_by'"`
-	DeletedAt   time.Time `json:"deletedAt"       xorm:"'deleted_at'"`
-}
-
-func (t *EntCatInfo) TableName() string {
-	return "ent_cat"
-}

viewmodels/oc_info.go

@@ -19,6 +19,7 @@ type OcInfo struct {
 	IsLeaf      int     `json:"isLeaf"       xorm:"'is_leaf'        int           comment('Admin ID')     " `
 	NodeLevel   int     `json:"nodeLevel"    xorm:"'node_level'     int           comment('Admin ID')     " `
 	Status      int     `json:"status"       xorm:"'status'         int           comment('OC Status')    " `
+	IsFixed     int64   `json:"isFixed"      xorm:"'is_fixed'       bigint        comment('Is Fixed')    " `
 }
 
 func (t *OcInfo) TableName() string {

viewmodels/partner_cat_info.go

@@ -1,12 +0,0 @@
-package viewmodels
-
-type PartnerCatInfo struct {
-	PartnerCatId    int64  `json:"partnerCatId"      xorm:"'partner_cat_id'      bigint     pk comment('主键ID')        "`
-	PartnerCatTitle string `json:"partnerCatTitle"   xorm:"'partner_cat_title'   varchar(50)   comment('群组类型名称')   "`
-	PartnerCatDesc  string `json:"partnerCatDesc"    xorm:"'partner_cat_desc'    varchar(50)   comment('描述')          "`
-	IsFixed         int64  `json:"isFixed"           xorm:"'is_fixed'        int           comment('是否可修改')         "`
-}
-
-func (t *PartnerCatInfo) TableName() string {
-	return "partner_cat"
-}

web/controllers/api_gateway_controller.go

@@ -6,13 +6,13 @@ import (
     "time"
     "xps/cache"
     "xps/constant"
-    "xps/service"
+    "xps/gateway"
     "xps/viewmodels"
 )
 
 type ApiGatewayController struct {
     Base
-    Service service.XGatewayService
+    Service gateway.HttpHandler
 }
 
 func (c *ApiGatewayController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/task_cat_controller.go

@@ -12,8 +12,8 @@ type TaskCatController struct {
 }
 
 func (c *TaskCatController) BeforeActivation(b mvc.BeforeActivation) {
-	b.Handle("GET",     "/",                    "GetList" )
-	b.Handle("GET",     "/page",                "GetPage" )
+	b.Handle("GET",     "",                     "GetList"   )
+	b.Handle("GET",     "/page",                "GetPage"   )
 	b.Handle("GET",     "/{taskCatId:int64}",   "GetById"   )
 	b.Handle("POST",    "/add",                 "Create"    )
 	b.Handle("PUT",     "/update",              "Update"    )

web/main.go

@@ -58,5 +58,5 @@ func makeAccessLog() *accesslog.AccessLog {
 func main() {
 	app := newApp()
 
-	app.Listen(":8080", iris.WithPostMaxMemory(maxSize))
+	app.Listen(":8001", iris.WithPostMaxMemory(maxSize))
 }

web/router/routes.go

@@ -5,7 +5,8 @@ import (
 	"github.com/kataras/iris/v12"
 	"github.com/kataras/iris/v12/mvc"
 	"xps/bootstrap"
-	"xps/service"
+    "xps/gateway"
+    "xps/service"
 	"xps/web/controllers"
 	"xps/web/middleware"
 )
@@ -305,7 +306,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 	xParty := b.Party("/x", crs).AllowMethods(iris.MethodOptions)
 	{
 		xParty.Use(middleware.AuthToken)
-		apiGatewayService := service.NewApiGatewayService()
+		apiGatewayService := gateway.NewHttpHandler()
 		apiGatewayApp := mvc.New(xParty.Party(""))
 		apiGatewayApp.Register(apiGatewayService)
 		apiGatewayApp.Handle(new(controllers.ApiGatewayController))