init

cache/redis.go

@@ -89,14 +89,14 @@ func SetUserData(userId int64, userData *viewmodels.UserData) error {
 	return SetCache(keyStr, userData, 0)
 }
 
-func SetObjectData(objectCode string, data *viewmodels.ObjectDataInfo) error {
+func SetObjectData(objectCode string, data *viewmodels.ModelObjectDataInfo) error {
 	keyStr := fmt.Sprintf("model_object_%s", objectCode)
 	return SetCache(keyStr, data, 0)
 }
 
-func GetObjectData(objectCode string)(*viewmodels.ObjectDataInfo, error){
+func GetObjectData(objectCode string)(*viewmodels.ModelObjectDataInfo, error){
 	keyStr := fmt.Sprintf("model_object_%s", objectCode)
-	modelData := &viewmodels.ObjectDataInfo{}
+	modelData := &viewmodels.ModelObjectDataInfo{}
 	err := Instance().Get(context.Background(), keyStr).Scan(modelData)
 	if err != nil {
 		return nil, err

datamodels/api.go

@@ -1,15 +1,23 @@
 package datamodels
 
+import "time"
+
 type Api struct {
     ModuleId    int64     `json:"moduleId"        xorm:"'module_id'     bigint pk  pk comment('Module ID') "`
     ApiId       int64     `json:"apiId"           xorm:"'api_id'        bigint     pk comment('Api ID')    "`
-    ApiType     int64     `json:"apiType"         xorm:"'api_type'      bigint     pk comment('Api Type')  "`
-    ApiTitle    string    `json:"apiTitle"        xorm:"'api_title'     varchar(127)  comment('名称')      "`
-    ApiCode     string    `json:"apiCode"         xorm:"'api_code'      varchar(127)  comment('编码')      "`
-    ApiParams   string    `json:"apiParams"       xorm:"'api_params'    varchar(127)  comment('Param')    "`
-    Status      int64     `json:"status"          xorm:"'status'        bigint        comment('Status')   "`
-    ApiDesc     string    `json:"apiDesc"         xorm:"'api_desc'      varchar(50)   comment('描述')      "`
-    Base
+    ApiType     int64     `json:"apiType"         xorm:"'api_type'      bigint        comment('Api Type')  "`
+    ApiTitle    string    `json:"apiTitle"        xorm:"'api_title'     varchar(127)  comment('名称')       "`
+    ApiCode     string    `json:"apiCode"         xorm:"'api_code'      varchar(127)  comment('编码')       "`
+    ApiParams   string    `json:"apiParams"       xorm:"'api_params'    varchar(127)  comment('Param')     "`
+    Status      int64     `json:"status"          xorm:"'status'        bigint        comment('Status')    "`
+    ApiDesc     string    `json:"apiDesc"         xorm:"'api_desc'      varchar(50)   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 *Api) TableName() string {

datamodels/api_req.go → datamodels/api_log.go

@@ -2,7 +2,7 @@ package datamodels
 
 import "time"
 
-type ApiReq struct {
+type ApiLog struct {
     OcId        int64       `json:"ocId"          xorm:"'oc_id'        bigint      pk comment('OcId')      "`
     AccountId   int64       `json:"accountId"     xorm:"'account_id'   bigint      pk comment('AccountId') "`
     AppId       int64       `json:"appId"         xorm:"'app_id'       bigint      pk comment('AppId')     "`
@@ -14,6 +14,6 @@ type ApiReq struct {
     ReqTime     time.Time   `json:"reqTime"       xorm:"'req_time'     datetime       comment('ReqTime')   "`
 }
 
-func (t *ApiReq) TableName() string {
+func (t *ApiLog) TableName() string {
     return "ps_api_req"
 }

datamodels/module.go → datamodels/api_module.go

@@ -2,11 +2,12 @@ package datamodels
 
 import "time"
 
-type Module struct {
+type ApiModule struct {
     ModuleId    int64     `json:"moduleId"        xorm:"'module_id'     bigint pk     comment('Module ID')    "`
     ModuleTitle string    `json:"moduleTitle"     xorm:"'module_title'  varchar(127)  comment('Module Title') "`
+    ModuleCode  string    `json:"moduleCode"      xorm:"'module_code'   varchar(127)  comment('Module Code')  "`
     ModuleDesc  string    `json:"moduleDesc"      xorm:"'module_desc'   varchar(50)   comment('Module Desc')  "`
-    IsFixed     int64     `json:"isFixed"         xorm:"'is_fixed'      int           comment('是否可修改')   "`
+    IsFixed     int64     `json:"isFixed"         xorm:"'is_fixed'      bigint        comment('是否可修改')    "`
     CreatedBy   int64     `json:"createdBy"       xorm:"'created_by'"`
     CreatedAt   time.Time `json:"createdAt"       xorm:"'created_at'"`
     UpdatedBy   int64     `json:"updatedBy"       xorm:"'updated_by'"`
@@ -16,6 +17,6 @@ type Module struct {
     DeletedAt   time.Time `json:"deletedAt"       xorm:"'deleted_at'"`
 }
 
-func (t *Module) TableName() string {
-    return "ps_module"
+func (t *ApiModule) TableName() string {
+    return "api_module"
 }

datamodels/biz.go

@@ -0,0 +1,21 @@
+package datamodels
+
+import "time"
+
+type Biz struct {
+    BizId       int64     `json:"bizId"           xorm:"'biz_id'        bigint     pk comment('Biz ID')        "`
+    BizTitle    string    `json:"bizTitle"        xorm:"'biz_title'     varchar(50)   comment('Biz Title')     "`
+    BizDesc     string    `json:"bizDesc"         xorm:"'biz_desc'      varchar(50)   comment('Biz Desc')      "`
+    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'"`
+    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 *Biz) TableName() string {
+    return "biz"
+}

datamodels/biz_object.go

@@ -0,0 +1,24 @@
+package datamodels
+
+import "time"
+
+type BizObject struct {
+    BizId       int64     `json:"bizId"           xorm:"'biz_id'          bigint      pk comment('Biz ID')         "`
+    ObjectId    int64     `json:"objectId"        xorm:"'object_id'       bigint      pk comment('Object ID')      "`
+    ObjectType  int64     `json:"objectType"      xorm:"'object_type'     bigint         comment('Object Type')    "`
+    ObjectTitle string    `json:"objectTitle"     xorm:"'object_title'    varchar(127)   comment('Object Title')   "`
+    ObjectCode  string    `json:"objectCode"      xorm:"'object_code'     varchar(127)   comment('Object Code')    "`
+    Comment     string    `json:"comment"         xorm:"'comment'         varchar(255)   comment('Comment')        "`
+    IsFixed     int64     `json:"isFixed"         xorm:"'is_fixed'        int            comment('Is Fixed')       "`
+    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 *BizObject) TableName() string {
+    return "biz_object"
+}

datamodels/biz_object_attr.go

@@ -0,0 +1,30 @@
+package datamodels
+
+import "time"
+
+type BizObjectAttr struct {
+    BizId           int64     `json:"bizId"           xorm:"'biz_id'            bigint      pk comment('Biz ID')         "`
+    ObjectId        int64     `json:"objectId"        xorm:"'object_id'         bigint      pk comment('Object ID')      "`
+    AttrId          int64     `json:"attrId"          xorm:"'attr_id'           bigint      pk comment('Attr ID')        "`
+    AttrTitle       string    `json:"attrTitle"       xorm:"'attr_title'        varchar(127)   comment('AttrTitle')      "`
+    AttrCode        string    `json:"attrCode"        xorm:"'attr_code'         varchar(127)   comment('AttrCode')       "`
+    AttrType        int64     `json:"attrType"        xorm:"'attr_type'         bigint         comment('Type')           "`
+    AttrLength      int64     `json:"attrLength"      xorm:"'attr_length'       bigint         comment('attrLength')     "`
+    AttrDecimals    int64     `json:"attrDecimals"    xorm:"'attr_decimals'     bigint         comment('attrDecimals')   "`
+    Comment         string    `json:"comment"         xorm:"'comment'           varchar(255)   comment('描述')           "`
+    AttrMappingCode string    `json:"attrMappingCode" xorm:"'attr_mapping_code' varchar(127)   comment('AttrMappingCode')"`
+    IsNotNull       int64     `json:"isNotNull"       xorm:"'is_not_null'       int            comment('是否可修改')      "`
+    SortNo          int64     `json:"sortNo"          xorm:"'sort_no'           int            comment('是否可修改')      "`
+    RuleId          int64     `json:"ruleId"          xorm:"'rule_id'           int            comment('Rule ID')        "`
+    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 *BizObjectAttr) TableName() string {
+    return "ds_object_attr"
+}

datamodels/biz_object_mapping.go

@@ -0,0 +1,14 @@
+package datamodels
+
+type BizObjectMapping struct {
+    BizId           int64     `json:"bizId"           xorm:"'biz_id'            bigint  pk comment('Biz ID')     "`
+    ObjectId        int64     `json:"objectId"        xorm:"'object_id'         bigint  pk comment('Object ID')  "`
+    MappingId       int64     `json:"mappingId"       xorm:"'mapping_id'        bigint     comment('Mapping ID') "`
+    MappingModelId  int64     `json:"mappingModelId"  xorm:"'mapping_model_id'  bigint     comment('Mapping Model ID') "`
+    MappingObjectId int64     `json:"mappingObjectId" xorm:"'mapping_object_id' bigint     comment('Mapping Object ID')"`
+    SortNo          int64     `json:"sortNo"          xorm:"'sort_no'           bigint     comment('Sort No')          "`
+}
+
+func (t *BizObjectMapping) TableName() string {
+    return "biz_object_mapping"
+}

datamodels/biz_object_rule.go

@@ -0,0 +1,12 @@
+package datamodels
+
+type BizObjectRule struct {
+    BizId       int64     `json:"bizId"           xorm:"'biz_id'          bigint      pk comment('主键ID')      "`
+    ObjectId    int64     `json:"objectId"        xorm:"'object_id'       bigint      pk comment('主键ID')      "`
+    RuleId      int64     `json:"ruleId"          xorm:"'rule_id'         int            comment('Rule ID')    "`
+    SortNo      int64     `json:"sortNo"          xorm:"'sort_no'         int            comment('Sort No')    "`
+}
+
+func (t *BizObjectRule) TableName() string {
+    return "biz_object_rule"
+}

datamodels/biz_rule.go

@@ -0,0 +1,23 @@
+package datamodels
+
+import "time"
+
+type BizRule struct {
+    RuleId      int64     `json:"ruleId"          xorm:"'rule_id'         bigint      pk comment('Rule ID')        "`
+    RuleType    int64     `json:"ruleType"        xorm:"'rule_type'       bigint         comment('Type')           "`
+    RuleTitle   string    `json:"ruleTitle"       xorm:"'rule_title'      varchar(127)   comment('模型名称')        "`
+    RuleCode    string    `json:"ruleCode"        xorm:"'rule_code'       varchar(127)   comment('模型名称')        "`
+    Comment     string    `json:"comment"         xorm:"'comment'         varchar(255)   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 *BizRule) TableName() string {
+    return "biz_rule"
+}

datamodels/db.go

@@ -0,0 +1 @@
+package datamodels

datamodels/db_type.go

@@ -1,7 +1,5 @@
 package datamodels
 
-import "time"
-
 type DbType struct {
     DbTypeId     int64     `json:"dbTypeId"         xorm:"'db_type_id'        bigint      pk comment('主键ID')      "`
     DbTypeTitle  string    `json:"dbTypeTitle"      xorm:"'db_type_title'     varchar(50)    comment('模型名称')     "`
@@ -9,13 +7,7 @@ type DbType struct {
     GetTableDef  string    `json:"getTableDef"      xorm:"'get_table_def'     varchar(255)   comment('描述')        "`
     DbTypeDesc   string    `json:"dbTypeDesc"       xorm:"'db_type_desc'      varchar(255)   comment('模型名称')     "`
     DbTypeLink   string    `json:"dbTypeLink"       xorm:"'db_type_link'      varchar(255)   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'"`
+    Base
 }
 
 func (t *DbType) TableName() string {

datamodels/wf_activity_action_def.go

@@ -0,0 +1 @@
+package datamodels

datamodels/wf_activity_action_ins.go

@@ -0,0 +1 @@
+package datamodels

datamodels/wf_activity_def.go

@@ -0,0 +1 @@
+package datamodels

datamodels/wf_activity_ins.go

@@ -0,0 +1 @@
+package datamodels

datamodels/wf_activity_member.go

@@ -0,0 +1 @@
+package datamodels

datamodels/wf_def.go

@@ -0,0 +1 @@
+package datamodels

datamodels/wf_ins.go

@@ -0,0 +1 @@
+package datamodels

datamodels/wf_ins_attach.go

@@ -0,0 +1 @@
+package datamodels

datasource/dbhelper.go

@@ -8,6 +8,7 @@ import (
 	"xorm.io/xorm"
 	"xorm.io/xorm/caches"
 	log2 "xorm.io/xorm/log"
+	"xorm.io/xorm/names"
 	"xps/conf"
 )
 
@@ -79,6 +80,7 @@ func InstanceSlave() *xorm.Engine {
 	}
 
 	engine.SetTZLocation(conf.SysTimeLocation)
+	engine.SetColumnMapper(names.SnakeMapper{})
 	slaveEngine = engine
 	return engine
 }

go.mod

@@ -47,7 +47,7 @@ require (
 	github.com/kataras/pio v0.0.11 // indirect
 	github.com/kataras/sitemap v0.0.6 // indirect
 	github.com/kataras/tunnel v0.0.4 // indirect
-	github.com/klauspost/compress v1.16.0 // indirect
+	github.com/klauspost/compress v1.16.3 // indirect
 	github.com/leodido/go-urn v1.2.2 // indirect
 	github.com/mailgun/raymond/v2 v2.0.48 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -60,11 +60,11 @@ require (
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/schollz/closestmatch v2.1.0+incompatible // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/syndtr/goleveldb v1.0.0 // indirect
-	github.com/tdewolff/minify/v2 v2.12.4 // indirect
-	github.com/tdewolff/parse/v2 v2.6.4 // indirect
+	github.com/tdewolff/minify/v2 v2.12.5 // indirect
+	github.com/tdewolff/parse/v2 v2.6.5 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
@@ -75,7 +75,7 @@ require (
 	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	google.golang.org/protobuf v1.29.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect

repositories/api_req_repo.go → repositories/api_log_repo.go

@@ -7,17 +7,17 @@ import (
     "xps/viewmodels"
 )
 
-type ApiReqRepo struct {
+type ApiLogRepo struct {
     engine *xorm.Engine
 }
 
-func NewApiReqRepo(engine *xorm.Engine) *ApiReqRepo {
-    return &ApiReqRepo{
+func NewApiLogRepo(engine *xorm.Engine) *ApiLogRepo {
+    return &ApiLogRepo{
         engine: engine,
     }
 }
 
-func (d *ApiReqRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+func (d *ApiLogRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
     limit := m["limit"].(int)
     page  := m["page"].(int)
     
@@ -42,7 +42,7 @@ func (d *ApiReqRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
     }
 
     sqlCount := ` SELECT COUNT(*) `
-    total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(datamodels.ApiReq))
+    total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(datamodels.ApiLog))
     if err1 != nil {
         return nil, err1
     }
@@ -51,7 +51,7 @@ func (d *ApiReqRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
     pageStart  := (page - 1) * limit
     sqlLimit   := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
     
-    datalist := make([]datamodels.ApiReq, 0)
+    datalist := make([]datamodels.ApiLog, 0)
     err2 := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy + sqlLimit).Find(&datalist)
     if err2 != nil {
         return nil, err2
@@ -65,7 +65,7 @@ func (d *ApiReqRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
     return pageResult, nil
 }
 
-func (d *ApiReqRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiReqInfo, error) {
+func (d *ApiLogRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiLogInfo, error) {
     sqlSelect := ` SELECT A.*,
                           B.app_title,
                           C.api_title `
@@ -88,7 +88,7 @@ func (d *ApiReqRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiReqInfo,
     }
     sqlOrderBy := " ORDER BY A.req_id ASC "
     
-    datalist := make([]viewmodels.ApiReqInfo, 0)
+    datalist := make([]viewmodels.ApiLogInfo, 0)
     err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
     if err != nil {
         return nil, err
@@ -97,8 +97,8 @@ func (d *ApiReqRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiReqInfo,
     }
 }
 
-func (d *ApiReqRepo) GetById(reqId int64) (*viewmodels.ApiReqInfo, error) {
-    data := &viewmodels.ApiReqInfo{}
+func (d *ApiLogRepo) GetById(reqId int64) (*viewmodels.ApiLogInfo, error) {
+    data := &viewmodels.ApiLogInfo{}
     ok, err := d.engine.
         Where("req_id = ?", reqId).
         Get(data)
@@ -109,7 +109,7 @@ func (d *ApiReqRepo) GetById(reqId int64) (*viewmodels.ApiReqInfo, error) {
     }
 }
 
-func (d *ApiReqRepo) Create(data *datamodels.ApiReq) error {
+func (d *ApiLogRepo) Create(data *datamodels.ApiLog) error {
     _, err := d.engine.Insert(data)
     return err
 }

repositories/module_repo.go → repositories/api_module_repo.go

@@ -31,7 +31,7 @@ func (d *ModuleRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
     }
     
     sqlCount    := ` SELECT COUNT(*) `
-    total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(datamodels.Module))
+    total, err1 := d.engine.SQL(sqlCount + sqlFrom + sqlWhere).Count(new(datamodels.ApiModule))
     if err1 != nil {
         return nil, err1
     }
@@ -40,7 +40,7 @@ func (d *ModuleRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
     pageStart   := (page - 1) * limit
     sqlLimit    := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
     
-    datalist := make([]viewmodels.ModuleInfo, 0)
+    datalist := make([]viewmodels.ApiModuleInfo, 0)
     err2 := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy + sqlLimit).Find(&datalist)
     if err2 != nil {
         return nil, err2
@@ -54,7 +54,7 @@ func (d *ModuleRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
     return pageResult, nil
 }
 
-func (d *ModuleRepo) GetList(m map[string]interface{}) ([]viewmodels.ModuleInfo, error) {
+func (d *ModuleRepo) GetList(m map[string]interface{}) ([]viewmodels.ApiModuleInfo, error) {
     sqlSelect := ` SELECT A.*                `
     sqlFrom   := ` FROM  ps_module   AS A    `
     sqlWhere  := ` WHERE A.deleted_flag = 0  `
@@ -63,7 +63,7 @@ func (d *ModuleRepo) GetList(m map[string]interface{}) ([]viewmodels.ModuleInfo,
     }
     sqlOrderBy := " ORDER BY A.module_id ASC "
     
-    datalist   := make([]viewmodels.ModuleInfo, 0)
+    datalist   := make([]viewmodels.ApiModuleInfo, 0)
     err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
     if err != nil {
         return nil, err
@@ -72,13 +72,13 @@ func (d *ModuleRepo) GetList(m map[string]interface{}) ([]viewmodels.ModuleInfo,
     }
 }
 
-func (d *ModuleRepo) GetById(moduleId int64) (*viewmodels.ModuleInfo, error) {
+func (d *ModuleRepo) GetById(moduleId int64) (*viewmodels.ApiModuleInfo, error) {
     sqlSelect := ` SELECT A.*                `
     sqlFrom   := ` FROM  ps_module   AS A    `
     sqlWhere  := ` WHERE A.deleted_flag = 0  `
     sqlWhere  += fmt.Sprintf(" AND A.module_id = %d", moduleId)
     
-    data := &viewmodels.ModuleInfo{}
+    data := &viewmodels.ApiModuleInfo{}
     has, err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere).Get(data)
     if !has || err != nil {
         return nil, err
@@ -87,13 +87,13 @@ func (d *ModuleRepo) GetById(moduleId int64) (*viewmodels.ModuleInfo, error) {
     }
 }
 
-func (d *ModuleRepo) Create(data *datamodels.Module) error {
+func (d *ModuleRepo) Create(data *datamodels.ApiModule) error {
     data.CreatedAt = time.Now()
     _, err := d.engine.Insert(data)
     return err
 }
 
-func (d *ModuleRepo) Update(data *datamodels.Module) error {
+func (d *ModuleRepo) Update(data *datamodels.ApiModule) error {
     moduleId := data.ModuleId
     
     data.UpdatedAt = time.Now()
@@ -107,7 +107,7 @@ func (d *ModuleRepo) Delete(m map[string]interface{}) error {
     moduleId  := m["moduleId"].(int64)
     deletedBy := m["deletedBy"].(int64)
     
-    data := &datamodels.Module{}
+    data := &datamodels.ApiModule{}
     data.DeletedFlag = 1
     data.DeletedBy = deletedBy
     data.DeletedAt = time.Now()

repositories/data_bus_rebo.go

@@ -59,9 +59,9 @@ func (d *DataBusRepo) GetById(statement string, fields map[string]interface{})([
     sql := statement
     sql += " WHERE 1 = 1"
     
-    for fieldName, fieldValue := range fields {
-        sql += fmt.Sprintf(" AND %v = %v", fieldName, fieldValue)
-    }
+    // for fieldName, fieldValue := range fields {
+    //    sql += fmt.Sprintf(" AND %v = %v", fieldName, fieldValue)
+    // }
     results, err   := d.engine.QueryInterface(sql)
     
     if err != nil {
@@ -74,7 +74,7 @@ func (d *DataBusRepo) GetById(statement string, fields map[string]interface{})([
     return results, nil
 }
 
-func (d *DataBusRepo) Create(object *viewmodels.ObjectDataInfo, values map[string]interface{}) error {
+func (d *DataBusRepo) Create(object *viewmodels.ModelObjectDataInfo, values map[string]interface{}) error {
     tableName := object.ObjectCode
     fields    := object.Attrs
     
@@ -103,7 +103,7 @@ func (d *DataBusRepo) Create(object *viewmodels.ObjectDataInfo, values map[strin
     return err
 }
 
-func (d *DataBusRepo) Update(object *viewmodels.ObjectDataInfo, values map[string]interface{}) error {
+func (d *DataBusRepo) Update(object *viewmodels.ModelObjectDataInfo, values map[string]interface{}) error {
     tableName := object.ObjectCode
     fields    := object.Attrs
     
@@ -133,7 +133,7 @@ func (d *DataBusRepo) Update(object *viewmodels.ObjectDataInfo, values map[strin
     return err
 }
 
-func (d *DataBusRepo) Patch(object *viewmodels.ObjectDataInfo, values map[string]interface{}) error {
+func (d *DataBusRepo) Patch(object *viewmodels.ModelObjectDataInfo, values map[string]interface{}) error {
     tableName := object.ObjectCode
     fields    := object.Attrs
     
@@ -164,7 +164,7 @@ func (d *DataBusRepo) Patch(object *viewmodels.ObjectDataInfo, values map[string
 }
 
 
-func (d *DataBusRepo) Delete(object *viewmodels.ObjectDataInfo, values map[string]interface{}) error {
+func (d *DataBusRepo) Delete(object *viewmodels.ModelObjectDataInfo, values map[string]interface{}) error {
     tableName := object.ObjectCode
     fields    := object.Attrs
     

repositories/db_repo.go

@@ -0,0 +1 @@
+package repositories

repositories/object_attr_repo.go → repositories/model_object_attr_repo.go

@@ -8,17 +8,17 @@ import (
 	"xps/viewmodels"
 )
 
-type ObjectAttrRepo struct {
+type ModelObjectAttrRepo struct {
 	engine *xorm.Engine
 }
 
-func NewObjectAttrRepo(engine *xorm.Engine) *ObjectAttrRepo {
-	return &ObjectAttrRepo{
+func NewModelObjectAttrRepo(engine *xorm.Engine) *ModelObjectAttrRepo {
+	return &ModelObjectAttrRepo{
 		engine: engine,
 	}
 }
 
-func (d *ObjectAttrRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+func (d *ModelObjectAttrRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
 	limit     := m["limit"].(int)
 	page      := m["page"].(int)
 
@@ -53,7 +53,7 @@ func (d *ObjectAttrRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResu
 	return pageResult, nil
 }
 
-func (d *ObjectAttrRepo) GetList(m map[string]interface{}) ([]viewmodels.ObjectAttrInfo, error) {
+func (d *ModelObjectAttrRepo) GetList(m map[string]interface{}) ([]viewmodels.ModelObjectAttrInfo, error) {
 	sqlSelect  := ` SELECT A.*                 `
 	sqlFrom    := ` FROM   ds_object_attr AS A  `
 	sqlWhere   := ` WHERE  A.deleted_flag = 0   `
@@ -62,7 +62,7 @@ func (d *ObjectAttrRepo) GetList(m map[string]interface{}) ([]viewmodels.ObjectA
 	}
 	sqlOrderBy := " ORDER BY A.sort_no "
 	
-	datalist   := make([]viewmodels.ObjectAttrInfo, 0)
+	datalist   := make([]viewmodels.ModelObjectAttrInfo, 0)
 	err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
 	if err != nil {
 		return nil, err
@@ -71,13 +71,13 @@ func (d *ObjectAttrRepo) GetList(m map[string]interface{}) ([]viewmodels.ObjectA
 	}
 }
 
-func (d *ObjectAttrRepo) GetAll() ([]viewmodels.ObjectAttrInfo, error) {
+func (d *ModelObjectAttrRepo) GetAll() ([]viewmodels.ModelObjectAttrInfo, error) {
 	sqlSelect  := ` SELECT A.*                  `
 	sqlFrom    := ` FROM   ds_object_attr AS A  `
 	sqlWhere   := ` WHERE  A.deleted_flag = 0   `
 	sqlOrderBy := ` ORDER BY A.sort_no          `
 	
-	datalist   := make([]viewmodels.ObjectAttrInfo, 0)
+	datalist   := make([]viewmodels.ModelObjectAttrInfo, 0)
 	err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
 	if err != nil {
 		return nil, err
@@ -86,7 +86,7 @@ func (d *ObjectAttrRepo) GetAll() ([]viewmodels.ObjectAttrInfo, error) {
 	}
 }
 
-func (d *ObjectAttrRepo) GetListById(modelId, objectId int64) ([]viewmodels.ObjectAttrInfo, error) {
+func (d *ModelObjectAttrRepo) GetListById(modelId, objectId int64) ([]viewmodels.ModelObjectAttrInfo, error) {
 	sqlSelect  := ` SELECT A.*                 `
 	sqlFrom    := ` FROM  ds_object_attr AS A  `
 	sqlWhere   := ` WHERE A.deleted_flag = 0   `
@@ -94,7 +94,7 @@ func (d *ObjectAttrRepo) GetListById(modelId, objectId int64) ([]viewmodels.Obje
 	sqlWhere   += fmt.Sprintf(" AND A.object_id = %d", objectId)
 	sqlOrderBy := " ORDER BY A.sort_no "
 	
-	datalist   := make([]viewmodels.ObjectAttrInfo, 0)
+	datalist   := make([]viewmodels.ModelObjectAttrInfo, 0)
 	err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
 	if err != nil {
 		return nil, err
@@ -103,8 +103,8 @@ func (d *ObjectAttrRepo) GetListById(modelId, objectId int64) ([]viewmodels.Obje
 	}
 }
 
-func (d *ObjectAttrRepo) GetById(modelId, objectId, attrId int64) (*viewmodels.ObjectAttrInfo, error) {
-	data    := &viewmodels.ObjectAttrInfo{}
+func (d *ModelObjectAttrRepo) GetById(modelId, objectId, attrId int64) (*viewmodels.ModelObjectAttrInfo, error) {
+	data    := &viewmodels.ModelObjectAttrInfo{}
 	ok, err := d.engine.
 		Where("model_id = ?", modelId).
 		Where("object_id = ?", objectId).
@@ -117,13 +117,13 @@ func (d *ObjectAttrRepo) GetById(modelId, objectId, attrId int64) (*viewmodels.O
 	}
 }
 
-func (d *ObjectAttrRepo) Create(data *datamodels.ObjectAttr) error {
+func (d *ModelObjectAttrRepo) Create(data *datamodels.ObjectAttr) error {
 	data.CreatedAt = time.Now()
 	_, err := d.engine.Insert(data)
 	return err
 }
 
-func (d *ObjectAttrRepo) Update(data *datamodels.ObjectAttr) error {
+func (d *ModelObjectAttrRepo) Update(data *datamodels.ObjectAttr) error {
 	modelId   := data.ModelId
 	objectId  := data.ObjectId
 	attrId    := data.AttrId
@@ -136,7 +136,7 @@ func (d *ObjectAttrRepo) Update(data *datamodels.ObjectAttr) error {
 	return err
 }
 
-func (d *ObjectAttrRepo) Delete(m map[string]interface{}) error {
+func (d *ModelObjectAttrRepo) Delete(m map[string]interface{}) error {
 	modelId   := m["modelId"].(int64)
 	objectId  := m["objectId"].(int64)
 	attrId    := m["attrId"].(int64)
@@ -154,7 +154,7 @@ func (d *ObjectAttrRepo) Delete(m map[string]interface{}) error {
 	return err
 }
 
-func (d *ObjectAttrRepo) DeleteByObjectId(modelId, objectId int64) error {
+func (d *ModelObjectAttrRepo) DeleteByObjectId(modelId, objectId int64) error {
 	data := &datamodels.ObjectAttr{}
 	_, err := d.engine.
 		Where("model_id = ?", modelId).

repositories/object_oam_repo.go → repositories/model_object_oam_repo.go

@@ -8,17 +8,17 @@ import (
     "xps/viewmodels"
 )
 
-type ObjectOAMRepo struct {
+type ModelObjectOAMRepo struct {
     engine *xorm.Engine
 }
 
-func NewObjectOAMRepo(engine *xorm.Engine) *ObjectOAMRepo {
-    return &ObjectOAMRepo{
+func NewObjectOAMRepo(engine *xorm.Engine) *ModelObjectOAMRepo {
+    return &ModelObjectOAMRepo{
         engine: engine,
     }
 }
 
-func (d *ObjectOAMRepo) GetList(m map[string]interface{}) ([]viewmodels.ObjectOAMInfo, error) {
+func (d *ModelObjectOAMRepo) GetList(m map[string]interface{}) ([]viewmodels.ModelObjectOAMInfo, error) {
     sqlSelect  := ` SELECT A.*                 `
     sqlFrom    := ` FROM  ds_object_oam  AS A  `
     sqlWhere   := ` WHERE A.deleted_flag = 0   `
@@ -27,7 +27,7 @@ func (d *ObjectOAMRepo) GetList(m map[string]interface{}) ([]viewmodels.ObjectOA
     }
     sqlOrderBy := " ORDER BY A.oam_id ASC "
     
-    datalist   := make([]viewmodels.ObjectOAMInfo, 0)
+    datalist   := make([]viewmodels.ModelObjectOAMInfo, 0)
     err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
     if err != nil {
         return nil, err
@@ -36,8 +36,8 @@ func (d *ObjectOAMRepo) GetList(m map[string]interface{}) ([]viewmodels.ObjectOA
     }
 }
 
-func (d *ObjectOAMRepo) GetById(modelId, objectId, oamId int64) (*viewmodels.ObjectOAMInfo, error) {
-    data    := &viewmodels.ObjectOAMInfo{}
+func (d *ModelObjectOAMRepo) GetById(modelId, objectId, oamId int64) (*viewmodels.ModelObjectOAMInfo, error) {
+    data    := &viewmodels.ModelObjectOAMInfo{}
     ok, err := d.engine.
         Where("model_id = ?", modelId).
         Where("object_id = ?", objectId).
@@ -50,13 +50,13 @@ func (d *ObjectOAMRepo) GetById(modelId, objectId, oamId int64) (*viewmodels.Obj
     }
 }
 
-func (d *ObjectOAMRepo) Create(data *datamodels.ObjectOAM) error {
+func (d *ModelObjectOAMRepo) Create(data *datamodels.ObjectOAM) error {
     data.CreatedAt = time.Now()
     _, err := d.engine.Insert(data)
     return err
 }
 
-func (d *ObjectOAMRepo) Update(data *datamodels.ObjectOAM) error {
+func (d *ModelObjectOAMRepo) Update(data *datamodels.ObjectOAM) error {
     modelId   := data.ModelId
     objectId  := data.ObjectId
     oamId     := data.OamId
@@ -70,7 +70,7 @@ func (d *ObjectOAMRepo) Update(data *datamodels.ObjectOAM) error {
     return err
 }
 
-func (d *ObjectOAMRepo) Delete(m map[string]interface{}) error {
+func (d *ModelObjectOAMRepo) Delete(m map[string]interface{}) error {
     modelId   := m["modelId"].(int64)
     objectId  := m["objectId"].(int64)
     oamId     := m["oamId"].(int64)
@@ -88,7 +88,7 @@ func (d *ObjectOAMRepo) Delete(m map[string]interface{}) error {
     return err
 }
 
-func (d *ObjectOAMRepo) DeleteByObjectId(modelId, objectId, oamId int64) error {
+func (d *ModelObjectOAMRepo) DeleteByObjectId(modelId, objectId, oamId int64) error {
     data := &datamodels.ObjectOAM{}
     _, err := d.engine.
         Where("model_id = ?", modelId).

repositories/object_repo.go → repositories/model_object_repo.go

@@ -8,17 +8,17 @@ import (
 	"xps/viewmodels"
 )
 
-type ObjectRepo struct {
+type ModelObjectRepo struct {
 	engine *xorm.Engine
 }
 
-func NewObjectRepo(engine *xorm.Engine) *ObjectRepo {
-	return &ObjectRepo{
+func NewModelObjectRepo(engine *xorm.Engine) *ModelObjectRepo {
+	return &ModelObjectRepo{
 		engine: engine,
 	}
 }
 
-func (d *ObjectRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+func (d *ModelObjectRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
 	limit := m["limit"].(int)
 	page  := m["page"].(int)
 
@@ -55,7 +55,7 @@ func (d *ObjectRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
 	return pageResult, nil
 }
 
-func (d *ObjectRepo) GetList(m map[string]interface{}) ([]viewmodels.ObjectInfo, error) {
+func (d *ModelObjectRepo) GetList(m map[string]interface{}) ([]viewmodels.ModelObjectInfo, error) {
 	modelId   := m["modelId"].(int64)
 	
 	sqlSelect := ` SELECT A.*,
@@ -68,7 +68,7 @@ func (d *ObjectRepo) GetList(m map[string]interface{}) ([]viewmodels.ObjectInfo,
 	}
 	sqlOrderBy := " ORDER BY A.model_id, A.object_id "
 	
-	datalist := make([]viewmodels.ObjectInfo, 0)
+	datalist := make([]viewmodels.ModelObjectInfo, 0)
 	err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
 	if err != nil {
 		return nil, err
@@ -77,7 +77,7 @@ func (d *ObjectRepo) GetList(m map[string]interface{}) ([]viewmodels.ObjectInfo,
 	}
 }
 
-func (d *ObjectRepo) GetAll() ([]viewmodels.ObjectInfo, error) {
+func (d *ModelObjectRepo) GetAll() ([]viewmodels.ModelObjectInfo, error) {
 	sqlSelect  := ` SELECT    A.*,
                               B.model_title      `
 	sqlFrom    := ` FROM      ds_object  AS A
@@ -85,7 +85,7 @@ func (d *ObjectRepo) GetAll() ([]viewmodels.ObjectInfo, error) {
 	sqlWhere   := ` WHERE A.deleted_flag = 0 `
 	sqlOrderBy := " ORDER BY A.model_id, A.object_id "
 	
-	datalist := make([]viewmodels.ObjectInfo, 0)
+	datalist := make([]viewmodels.ModelObjectInfo, 0)
 	err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
 	if err != nil {
 		return nil, err
@@ -94,7 +94,7 @@ func (d *ObjectRepo) GetAll() ([]viewmodels.ObjectInfo, error) {
 	}
 }
 
-func (d *ObjectRepo) GetById(modelId, objectId int64) (*viewmodels.ObjectInfo, error) {
+func (d *ModelObjectRepo) GetById(modelId, objectId int64) (*viewmodels.ModelObjectInfo, error) {
 	sqlSelect := ` SELECT A.*,
                           B.model_title      `
 	sqlFrom   := ` FROM   ds_object   AS A
@@ -102,7 +102,7 @@ func (d *ObjectRepo) GetById(modelId, objectId int64) (*viewmodels.ObjectInfo, e
 	sqlWhere  := ` WHERE A.deleted_flag = 0 AND A.model_id =` + fmt.Sprintf("%d", modelId)
 	sqlWhere  += fmt.Sprintf(" AND A.object_id = %d", objectId)
 	
-	data := &viewmodels.ObjectInfo{}
+	data := &viewmodels.ModelObjectInfo{}
 	has, err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere).Get(data)
 	if !has || err != nil {
 		return nil, err
@@ -111,13 +111,13 @@ func (d *ObjectRepo) GetById(modelId, objectId int64) (*viewmodels.ObjectInfo, e
 	}
 }
 
-func (d *ObjectRepo) Create(data *datamodels.Object) error {
+func (d *ModelObjectRepo) Create(data *datamodels.Object) error {
 	data.CreatedAt = time.Now()
 	_, err := d.engine.Insert(data)
 	return err
 }
 
-func (d *ObjectRepo) Update(data *datamodels.Object) error {
+func (d *ModelObjectRepo) Update(data *datamodels.Object) error {
 	modelId := data.ObjectId
 	objectId := data.ObjectId
 
@@ -129,7 +129,7 @@ func (d *ObjectRepo) Update(data *datamodels.Object) error {
 	return err
 }
 
-func (d *ObjectRepo) Delete(m map[string]interface{}) error {
+func (d *ModelObjectRepo) Delete(m map[string]interface{}) error {
 	modelId   := m["modelId"].(int64)
 	objectId  := m["objectId"].(int64)
 	deletedBy := m["deletedBy"].(int64)

service/api_gateway_service.go

@@ -21,7 +21,7 @@ type apiGatewayService struct {
 
 func NewApiGatewayService() ApiGatewayService {
     return &apiGatewayService{
-        dataBus: repositories.NewDataBusRepo(datasource.InstanceMaster()),
+        dataBus: repositories.NewDataBusRepo(datasource.InstanceSlave()),
     }
 }
 

service/api_log_service.go

@@ -0,0 +1,42 @@
+package service
+
+import (
+    "xps/datamodels"
+    "xps/datasource"
+    "xps/repositories"
+    "xps/viewmodels"
+)
+
+type ApiLogService interface {
+    GetList(m map[string]interface{}) ([]viewmodels.ApiLogInfo, error)
+    GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
+    GetById(reqId int64) (*viewmodels.ApiLogInfo, error)
+    Create(d *datamodels.ApiLog) error
+}
+
+type apiLogService struct {
+    repo *repositories.ApiLogRepo
+}
+
+func NewApiLogService() ApiLogService {
+    return &apiLogService{
+        repo: repositories.NewApiLogRepo(datasource.InstanceMaster()),
+    }
+}
+
+func (s *apiLogService) GetList(m map[string]interface{}) ([]viewmodels.ApiLogInfo, error) {
+    return s.repo.GetList(m)
+}
+
+func (s *apiLogService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+    return s.repo.GetPage(m)
+}
+
+func (s *apiLogService) GetById(reqId int64) (*viewmodels.ApiLogInfo, error) {
+    return s.repo.GetById(reqId)
+}
+
+func (s *apiLogService) Create(apiLog *datamodels.ApiLog) error {
+    apiLog.ApiId = NewID()
+    return s.repo.Create(apiLog)
+}

service/module_service.go → service/api_module_service.go

@@ -7,12 +7,12 @@ import (
     "xps/viewmodels"
 )
 
-type ModuleService interface {
-    GetList(m map[string]interface{}) ([]viewmodels.ModuleInfo, error)
+type ApiModuleService interface {
+    GetList(m map[string]interface{}) ([]viewmodels.ApiModuleInfo, error)
     GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
-    GetById(moduleId int64) (*viewmodels.ModuleInfo, error)
-    Create(d *datamodels.Module) error
-    Update(d *datamodels.Module) error
+    GetById(moduleId int64) (*viewmodels.ApiModuleInfo, error)
+    Create(d *datamodels.ApiModule) error
+    Update(d *datamodels.ApiModule) error
     Delete(m map[string]interface{}) error
 }
 
@@ -20,13 +20,13 @@ type moduleService struct {
     repo *repositories.ModuleRepo
 }
 
-func NewModuleService() ModuleService {
+func NewModuleService() ApiModuleService {
     return &moduleService{
         repo: repositories.NewModuleRepo(datasource.InstanceMaster()),
     }
 }
 
-func (s *moduleService) GetList(m map[string]interface{}) ([]viewmodels.ModuleInfo, error) {
+func (s *moduleService) GetList(m map[string]interface{}) ([]viewmodels.ApiModuleInfo, error) {
     return s.repo.GetList(m)
 }
 
@@ -34,16 +34,16 @@ func (s *moduleService) GetPage(m map[string]interface{}) (*viewmodels.PageResul
     return s.repo.GetPage(m)
 }
 
-func (s *moduleService) GetById(moduleId int64) (*viewmodels.ModuleInfo, error) {
+func (s *moduleService) GetById(moduleId int64) (*viewmodels.ApiModuleInfo, error) {
     return s.repo.GetById(moduleId)
 }
 
-func (s *moduleService) Create(Module *datamodels.Module) error {
+func (s *moduleService) Create(Module *datamodels.ApiModule) error {
     Module.ModuleId = NewID()
     return s.repo.Create(Module)
 }
 
-func (s *moduleService) Update(Module *datamodels.Module) error {
+func (s *moduleService) Update(Module *datamodels.ApiModule) error {
     return s.repo.Update(Module)
 }
 

service/api_req_service.go

@@ -1,42 +0,0 @@
-package service
-
-import (
-    "xps/datamodels"
-    "xps/datasource"
-    "xps/repositories"
-    "xps/viewmodels"
-)
-
-type ApiReqService interface {
-    GetList(m map[string]interface{}) ([]viewmodels.ApiReqInfo, error)
-    GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
-    GetById(reqId int64) (*viewmodels.ApiReqInfo, error)
-    Create(d *datamodels.ApiReq) error
-}
-
-type apiReqService struct {
-    repo *repositories.ApiReqRepo
-}
-
-func NewApiReqService() ApiReqService {
-    return &apiReqService{
-        repo: repositories.NewApiReqRepo(datasource.InstanceMaster()),
-    }
-}
-
-func (s *apiReqService) GetList(m map[string]interface{}) ([]viewmodels.ApiReqInfo, error) {
-    return s.repo.GetList(m)
-}
-
-func (s *apiReqService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-    return s.repo.GetPage(m)
-}
-
-func (s *apiReqService) GetById(reqId int64) (*viewmodels.ApiReqInfo, error) {
-    return s.repo.GetById(reqId)
-}
-
-func (s *apiReqService) Create(apiReq *datamodels.ApiReq) error {
-    apiReq.ApiId = NewID()
-    return s.repo.Create(apiReq)
-}

service/init_service.go

@@ -15,28 +15,28 @@ type InitService interface {
 }
 
 type initService struct {
-    objectRepo              *repositories.ObjectRepo
-    objectAttrRepo          *repositories.ObjectAttrRepo
+    modelObjectRepo         *repositories.ModelObjectRepo
+    modelObjectAttrRepo     *repositories.ModelObjectAttrRepo
     apiRepo                 *repositories.ApiRepo
     apiTransUnitRepo        *repositories.ApiTransUnitRepo
 }
 
 func NewInitService() InitService {
     return &initService{
-        objectRepo:         repositories.NewObjectRepo(datasource.InstanceMaster()),
-        objectAttrRepo:     repositories.NewObjectAttrRepo(datasource.InstanceMaster()),
-        apiRepo:            repositories.NewApiRepo(datasource.InstanceMaster()),
-        apiTransUnitRepo:   repositories.NewApiTransUnitRepo(datasource.InstanceMaster()),
+        modelObjectRepo:        repositories.NewModelObjectRepo(datasource.InstanceMaster()),
+        modelObjectAttrRepo:    repositories.NewModelObjectAttrRepo(datasource.InstanceMaster()),
+        apiRepo:                repositories.NewApiRepo(datasource.InstanceMaster()),
+        apiTransUnitRepo:       repositories.NewApiTransUnitRepo(datasource.InstanceMaster()),
     }
 }
 
 func (s *initService) CacheObjectData() error {
-    objectList, err1 := s.objectRepo.GetAll()
+    objectList, err1 := s.modelObjectRepo.GetAll()
     if err1 != nil {
         return err1
     }
 
-    attrsList, err2 := s.objectAttrRepo.GetAll()
+    attrsList, err2 := s.modelObjectAttrRepo.GetAll()
     if err2 != nil {
         return err2
     }
@@ -44,14 +44,14 @@ func (s *initService) CacheObjectData() error {
     for _, object := range objectList {
         objectId := object.ObjectId
         
-        attrs := make([]viewmodels.ObjectAttrInfo, 0)
+        attrs := make([]viewmodels.ModelObjectAttrInfo, 0)
         for _, attr := range attrsList {
             if attr.ObjectId == objectId {
                 attrs = append(attrs, attr)
             }
         }
         
-        cacheData := &viewmodels.ObjectDataInfo{
+        cacheData := &viewmodels.ModelObjectDataInfo{
             ModelId:     object.ModelId,
             ModelTitle:  object.ModelTitle,
             ObjectId:    object.ObjectId,

service/model_object_attr_service.go

@@ -0,0 +1,52 @@
+package service
+
+import (
+	"xps/datamodels"
+	"xps/datasource"
+	"xps/repositories"
+	"xps/viewmodels"
+)
+
+type ModelObjectAttrService interface {
+	GetList(m map[string]interface{}) ([]viewmodels.ModelObjectAttrInfo, error)
+	GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
+	GetById(modelId, objectId, attrId int64) (*viewmodels.ModelObjectAttrInfo, error)
+	Create(d *datamodels.ObjectAttr) error
+	Update(d *datamodels.ObjectAttr) error
+	Delete(m map[string]interface{}) error
+}
+
+type modelObjectAttrService struct {
+	repo *repositories.ModelObjectAttrRepo
+}
+
+func NewModelObjectAttrService() ModelObjectAttrService {
+	return &modelObjectAttrService{
+		repo: repositories.NewModelObjectAttrRepo(datasource.InstanceMaster()),
+	}
+}
+
+func (s *modelObjectAttrService) GetList(m map[string]interface{}) ([]viewmodels.ModelObjectAttrInfo, error) {
+	return s.repo.GetList(m)
+}
+
+func (s *modelObjectAttrService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+	return s.repo.GetPage(m)
+}
+
+func (s *modelObjectAttrService) GetById(modelId, objectId, attrId int64) (*viewmodels.ModelObjectAttrInfo, error) {
+	return s.repo.GetById(modelId, objectId, attrId)
+}
+
+func (s *modelObjectAttrService) Create(ObjectAttr *datamodels.ObjectAttr) error {
+	ObjectAttr.AttrId = NewID()
+	return s.repo.Create(ObjectAttr)
+}
+
+func (s *modelObjectAttrService) Update(ObjectAttr *datamodels.ObjectAttr) error {
+	return s.repo.Update(ObjectAttr)
+}
+
+func (s *modelObjectAttrService) Delete(m map[string]interface{}) error {
+	return s.repo.Delete(m)
+}

service/model_object_oam_service.go

@@ -0,0 +1,47 @@
+package service
+
+import (
+    "xps/datamodels"
+    "xps/datasource"
+    "xps/repositories"
+    "xps/viewmodels"
+)
+
+type ModelObjectOAMService interface {
+    GetList(m map[string]interface{}) ([]viewmodels.ModelObjectOAMInfo, error)
+    GetById(modelId, objectId, attrId int64) (*viewmodels.ModelObjectOAMInfo, error)
+    Create(d *datamodels.ObjectOAM) error
+    Update(d *datamodels.ObjectOAM) error
+    Delete(m map[string]interface{}) error
+}
+
+type modelObjectOAMService struct {
+    repo *repositories.ModelObjectOAMRepo
+}
+
+func NewModelObjectOAMService() ModelObjectOAMService {
+    return &modelObjectOAMService{
+        repo: repositories.NewObjectOAMRepo(datasource.InstanceMaster()),
+    }
+}
+
+func (s *modelObjectOAMService) GetList(m map[string]interface{}) ([]viewmodels.ModelObjectOAMInfo, error) {
+    return s.repo.GetList(m)
+}
+
+func (s *modelObjectOAMService) GetById(modelId, objectId, attrId int64) (*viewmodels.ModelObjectOAMInfo, error) {
+    return s.repo.GetById(modelId, objectId, attrId)
+}
+
+func (s *modelObjectOAMService) Create(ObjectOAM *datamodels.ObjectOAM) error {
+    ObjectOAM.OamId = NewID()
+    return s.repo.Create(ObjectOAM)
+}
+
+func (s *modelObjectOAMService) Update(ObjectOAM *datamodels.ObjectOAM) error {
+    return s.repo.Update(ObjectOAM)
+}
+
+func (s *modelObjectOAMService) Delete(m map[string]interface{}) error {
+    return s.repo.Delete(m)
+}

service/object_service.go → service/model_object_service.go

@@ -10,73 +10,73 @@ import (
 	"xps/viewmodels"
 )
 
-type ObjectService interface {
-	GetList(m map[string]interface{}) ([]viewmodels.ObjectInfo, error)
+type ModelObjectService interface {
+	GetList(m map[string]interface{}) ([]viewmodels.ModelObjectInfo, error)
 	GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
-	GetById(modelId, objectId int64) (*viewmodels.ObjectInfo, error)
+	GetById(modelId, objectId int64) (*viewmodels.ModelObjectInfo, error)
 	Create(d *datamodels.Object) error
 	Update(d *datamodels.Object) error
 	Delete(m map[string]interface{}) error
-	GetObjectDataById(modelId, objectId int64) (*viewmodels.ObjectDataInfo, error)
-	CreateObjectData(d *viewmodels.ObjectData) error
-	UpdateObjectData(d *viewmodels.ObjectData) error
+	GetObjectDataById(modelId, objectId int64) (*viewmodels.ModelObjectDataInfo, error)
+	CreateObjectData(d *viewmodels.ModelObjectData) error
+	UpdateObjectData(d *viewmodels.ModelObjectData) error
 }
 
-type objectService struct {
-	objectRepo     *repositories.ObjectRepo
-	objectAttrRepo *repositories.ObjectAttrRepo
+type modelObjectService struct {
+	modelObjectRepo     *repositories.ModelObjectRepo
+	modelObjectAttrRepo *repositories.ModelObjectAttrRepo
 }
 
-func NewObjectService() ObjectService {
-	return &objectService{
-		objectRepo:     repositories.NewObjectRepo(datasource.InstanceMaster()),
-		objectAttrRepo: repositories.NewObjectAttrRepo(datasource.InstanceMaster()),
+func NewModelObjectService() ModelObjectService {
+	return &modelObjectService{
+		modelObjectRepo:     repositories.NewModelObjectRepo(datasource.InstanceMaster()),
+		modelObjectAttrRepo: repositories.NewModelObjectAttrRepo(datasource.InstanceMaster()),
 	}
 }
 
-func (s *objectService) GetList(m map[string]interface{}) ([]viewmodels.ObjectInfo, error) {
-	return s.objectRepo.GetList(m)
+func (s *modelObjectService) GetList(m map[string]interface{}) ([]viewmodels.ModelObjectInfo, error) {
+	return s.modelObjectRepo.GetList(m)
 }
 
-func (s *objectService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-	return s.objectRepo.GetPage(m)
+func (s *modelObjectService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
+	return s.modelObjectRepo.GetPage(m)
 }
 
-func (s *objectService) GetById(modelId, objectId int64) (*viewmodels.ObjectInfo, error) {
-	return s.objectRepo.GetById(modelId, objectId)
+func (s *modelObjectService) GetById(modelId, objectId int64) (*viewmodels.ModelObjectInfo, error) {
+	return s.modelObjectRepo.GetById(modelId, objectId)
 }
 
-func (s *objectService) Create(Object *datamodels.Object) error {
+func (s *modelObjectService) Create(Object *datamodels.Object) error {
 	Object.ObjectId = NewID()
-	return s.objectRepo.Create(Object)
+	return s.modelObjectRepo.Create(Object)
 }
 
-func (s *objectService) Update(Object *datamodels.Object) error {
-	return s.objectRepo.Update(Object)
+func (s *modelObjectService) Update(Object *datamodels.Object) error {
+	return s.modelObjectRepo.Update(Object)
 }
 
-func (s *objectService) Delete(m map[string]interface{}) error {
+func (s *modelObjectService) Delete(m map[string]interface{}) error {
 	modelId  := m["modelId"].(int64)
 	objectId := m["objectId"].(int64)
-	err := s.objectRepo.Delete(m)
+	err := s.modelObjectRepo.Delete(m)
 	if err != nil {
 		return err
 	}
-	return s.objectAttrRepo.DeleteByObjectId(modelId, objectId)
+	return s.modelObjectAttrRepo.DeleteByObjectId(modelId, objectId)
 }
 
-func (s *objectService) GetObjectDataById(modelId, objectId int64) (*viewmodels.ObjectDataInfo, error) {
-	objectInfo, err := s.objectRepo.GetById(modelId, objectId)
+func (s *modelObjectService) GetObjectDataById(modelId, objectId int64) (*viewmodels.ModelObjectDataInfo, error) {
+	objectInfo, err := s.modelObjectRepo.GetById(modelId, objectId)
 	if err != nil {
 		return nil, err
 	}
 	
-	attrs, err := s.objectAttrRepo.GetListById(modelId, objectId)
+	attrs, err := s.modelObjectAttrRepo.GetListById(modelId, objectId)
 	if err != nil {
 		return nil, err
 	}
 
-	objectDataInfo := &viewmodels.ObjectDataInfo{
+	objectDataInfo := &viewmodels.ModelObjectDataInfo{
 		ModelId:     objectInfo.ModelId,
 		ObjectId:    objectInfo.ObjectId,
 		ObjectType:  objectInfo.ObjectType,
@@ -90,7 +90,7 @@ func (s *objectService) GetObjectDataById(modelId, objectId int64) (*viewmodels.
 	return objectDataInfo, nil
 }
 
-func (s *objectService) CreateObjectData(o *viewmodels.ObjectData) error {
+func (s *modelObjectService) CreateObjectData(o *viewmodels.ModelObjectData) error {
 	modelId   := o.ModelId
 	objectId  := NewID()
 	createdBy := o.CreatedBy
@@ -106,13 +106,13 @@ func (s *objectService) CreateObjectData(o *viewmodels.ObjectData) error {
 		CreatedAt:   time.Now(),
 	}
 
-	err := s.objectRepo.Create(object)
+	err := s.modelObjectRepo.Create(object)
 	if err != nil {
 		return err
 	}
 	
 	// cache object
-	attrsCache := make([]viewmodels.ObjectAttrInfo, 0)
+	attrsCache := make([]viewmodels.ModelObjectAttrInfo, 0)
 	for _, a := range o.Attrs {
 		newId := NewID()
 		objectAttr := &datamodels.ObjectAttr{
@@ -132,12 +132,12 @@ func (s *objectService) CreateObjectData(o *viewmodels.ObjectData) error {
 			CreatedBy:    createdBy,
 		}
 
-		err = s.objectAttrRepo.Create(objectAttr)
+		err = s.modelObjectAttrRepo.Create(objectAttr)
 		if err != nil {
 			return err
 		}
 		
-		attrCache := viewmodels.ObjectAttrInfo{
+		attrCache := viewmodels.ModelObjectAttrInfo{
 			ModelId:      modelId,
 			ObjectId:     objectId,
 			AttrId:       newId,
@@ -155,7 +155,7 @@ func (s *objectService) CreateObjectData(o *viewmodels.ObjectData) error {
 		attrsCache = append(attrsCache, attrCache)
 	}
 	
-	objectDataCache := &viewmodels.ObjectDataInfo{
+	objectDataCache := &viewmodels.ModelObjectDataInfo{
 		ModelId:     o.ModelId,
 		ModelTitle:  o.ModelTitle,
 		ObjectId:    o.ObjectId,
@@ -176,7 +176,7 @@ func (s *objectService) CreateObjectData(o *viewmodels.ObjectData) error {
 	return nil
 }
 
-func (s *objectService) UpdateObjectData(o *viewmodels.ObjectData) error {
+func (s *modelObjectService) UpdateObjectData(o *viewmodels.ModelObjectData) error {
 	modelId   := o.ModelId
 	objectId  := o.ObjectId
 	updatedBy := o.UpdatedBy
@@ -191,18 +191,18 @@ func (s *objectService) UpdateObjectData(o *viewmodels.ObjectData) error {
 		UpdatedBy:   updatedBy,
 	}
 
-	err := s.objectRepo.Update(object)
+	err := s.modelObjectRepo.Update(object)
 	if err != nil {
 		return err
 	}
 
-	err = s.objectAttrRepo.DeleteByObjectId(modelId, objectId)
+	err = s.modelObjectAttrRepo.DeleteByObjectId(modelId, objectId)
 	if err != nil {
 		return err
 	}
 	
 	// cache object
-	attrsCache := make([]viewmodels.ObjectAttrInfo, 0)
+	attrsCache := make([]viewmodels.ModelObjectAttrInfo, 0)
 	for _, a := range o.Attrs {
 		newId := NewID()
 		objectAttr := &datamodels.ObjectAttr{
@@ -221,12 +221,12 @@ func (s *objectService) UpdateObjectData(o *viewmodels.ObjectData) error {
 			CreatedBy:    updatedBy,
 		}
 
-		err = s.objectAttrRepo.Create(objectAttr)
+		err = s.modelObjectAttrRepo.Create(objectAttr)
 		if err != nil {
 			return err
 		}
 		
-		attrCache := viewmodels.ObjectAttrInfo{
+		attrCache := viewmodels.ModelObjectAttrInfo{
 			ModelId:      modelId,
 			ObjectId:     objectId,
 			AttrId:       newId,
@@ -244,7 +244,7 @@ func (s *objectService) UpdateObjectData(o *viewmodels.ObjectData) error {
 		attrsCache = append(attrsCache, attrCache)
 	}
 	
-	objectDataCache := &viewmodels.ObjectDataInfo{
+	objectDataCache := &viewmodels.ModelObjectDataInfo{
 		ModelId:     o.ModelId,
 		ModelTitle:  o.ModelTitle,
 		ObjectId:    o.ObjectId,

service/object_attr_service.go

@@ -1,52 +0,0 @@
-package service
-
-import (
-	"xps/datamodels"
-	"xps/datasource"
-	"xps/repositories"
-	"xps/viewmodels"
-)
-
-type ObjectAttrService interface {
-	GetList(m map[string]interface{}) ([]viewmodels.ObjectAttrInfo, error)
-	GetPage(m map[string]interface{}) (*viewmodels.PageResult, error)
-	GetById(modelId, objectId, attrId int64) (*viewmodels.ObjectAttrInfo, error)
-	Create(d *datamodels.ObjectAttr) error
-	Update(d *datamodels.ObjectAttr) error
-	Delete(m map[string]interface{}) error
-}
-
-type objectAttrService struct {
-	repo *repositories.ObjectAttrRepo
-}
-
-func NewObjectAttrService() ObjectAttrService {
-	return &objectAttrService{
-		repo: repositories.NewObjectAttrRepo(datasource.InstanceMaster()),
-	}
-}
-
-func (s *objectAttrService) GetList(m map[string]interface{}) ([]viewmodels.ObjectAttrInfo, error) {
-	return s.repo.GetList(m)
-}
-
-func (s *objectAttrService) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-	return s.repo.GetPage(m)
-}
-
-func (s *objectAttrService) GetById(modelId, objectId, attrId int64) (*viewmodels.ObjectAttrInfo, error) {
-	return s.repo.GetById(modelId, objectId, attrId)
-}
-
-func (s *objectAttrService) Create(ObjectAttr *datamodels.ObjectAttr) error {
-	ObjectAttr.AttrId = NewID()
-	return s.repo.Create(ObjectAttr)
-}
-
-func (s *objectAttrService) Update(ObjectAttr *datamodels.ObjectAttr) error {
-	return s.repo.Update(ObjectAttr)
-}
-
-func (s *objectAttrService) Delete(m map[string]interface{}) error {
-	return s.repo.Delete(m)
-}

service/object_oam_service.go

@@ -1,47 +0,0 @@
-package service
-
-import (
-    "xps/datamodels"
-    "xps/datasource"
-    "xps/repositories"
-    "xps/viewmodels"
-)
-
-type ObjectOAMService interface {
-    GetList(m map[string]interface{}) ([]viewmodels.ObjectOAMInfo, error)
-    GetById(modelId, objectId, attrId int64) (*viewmodels.ObjectOAMInfo, error)
-    Create(d *datamodels.ObjectOAM) error
-    Update(d *datamodels.ObjectOAM) error
-    Delete(m map[string]interface{}) error
-}
-
-type objectOAMService struct {
-    repo *repositories.ObjectOAMRepo
-}
-
-func NewObjectOAMService() ObjectOAMService {
-    return &objectOAMService{
-        repo: repositories.NewObjectOAMRepo(datasource.InstanceMaster()),
-    }
-}
-
-func (s *objectOAMService) GetList(m map[string]interface{}) ([]viewmodels.ObjectOAMInfo, error) {
-    return s.repo.GetList(m)
-}
-
-func (s *objectOAMService) GetById(modelId, objectId, attrId int64) (*viewmodels.ObjectOAMInfo, error) {
-    return s.repo.GetById(modelId, objectId, attrId)
-}
-
-func (s *objectOAMService) Create(ObjectOAM *datamodels.ObjectOAM) error {
-    ObjectOAM.OamId = NewID()
-    return s.repo.Create(ObjectOAM)
-}
-
-func (s *objectOAMService) Update(ObjectOAM *datamodels.ObjectOAM) error {
-    return s.repo.Update(ObjectOAM)
-}
-
-func (s *objectOAMService) Delete(m map[string]interface{}) error {
-    return s.repo.Delete(m)
-}

utils/json.go

@@ -1,14 +0,0 @@
-package utils
-
-import "encoding/json"
-
-// interface{} can be any type data
-func JsonEncode(code int, data interface{}, msg string) ([]byte, error) {
-	result := struct {
-		Code int
-		Data interface{}
-		Msg  string
-	}{code, data, msg}
-
-	return json.Marshal(result)
-}

utils/json_conv.go

@@ -0,0 +1,132 @@
+package utils
+
+import (
+	"bytes"
+	"encoding/json"
+	"log"
+	"regexp"
+	"strconv"
+	"strings"
+	"unicode"
+)
+
+/*************************************** 下划线json ***************************************/
+type JsonSnakeCase struct {
+	Value interface{}
+}
+
+func (c JsonSnakeCase) MarshalJSON() ([]byte, error) {
+	// Regexp definitions
+	keyMatchRegex    := regexp.MustCompile(`\"(\w+)\":`)
+	wordBarrierRegex := regexp.MustCompile(`(\w)([A-Z])`)
+	marshalled, err  := json.Marshal(c.Value)
+	converted := keyMatchRegex.ReplaceAllFunc(
+		marshalled,
+		func(match []byte) []byte {
+			return bytes.ToLower(wordBarrierRegex.ReplaceAll(
+				match,
+				[]byte(`${1}_${2}`),
+			))
+		},
+	)
+	return converted, err
+}
+
+/*************************************** 驼峰json ***************************************/
+type JsonCamelCase struct {
+	Value interface{}
+}
+
+func (c JsonCamelCase) MarshalJSON() ([]byte, error) {
+	keyMatchRegex := regexp.MustCompile(`\"(\w+)\":`)
+	marshalled, err := json.Marshal(c.Value)
+	converted := keyMatchRegex.ReplaceAllFunc(
+		marshalled,
+		func(match []byte) []byte {
+			matchStr := string(match)
+			key := matchStr[1 : len(matchStr)-2]
+			resKey := Lcfirst(Case2Camel(key))
+			return []byte(`"` + resKey + `":`)
+		},
+	)
+	return converted, err
+}
+
+/*************************************** 其他方法 ***************************************/
+// 驼峰式写法转为下划线写法
+func Camel2Case(name string) string {
+	buffer := NewBuffer()
+	for i, r := range name {
+		if unicode.IsUpper(r) {
+			if i != 0 {
+				buffer.Append('_')
+			}
+			buffer.Append(unicode.ToLower(r))
+		} else {
+			buffer.Append(r)
+		}
+	}
+	return buffer.String()
+}
+
+// Case2Camel 下划线写法转为驼峰写法
+func Case2Camel(name string) string {
+	name = strings.Replace(name, "_", " ", -1)
+	name = strings.Title(name)
+	return strings.Replace(name, " ", "", -1)
+}
+
+// Ucfirst first 首字母大写
+func Ucfirst(str string) string {
+	for i, v := range str {
+		return string(unicode.ToUpper(v)) + str[i+1:]
+	}
+	return ""
+}
+
+// Lcfirst 首字母小写
+func Lcfirst(str string) string {
+	for i, v := range str {
+		return string(unicode.ToLower(v)) + str[i+1:]
+	}
+	return ""
+}
+
+// Buffer 内嵌bytes.Buffer，支持连写
+type Buffer struct {
+	*bytes.Buffer
+}
+
+func NewBuffer() *Buffer {
+	return &Buffer{Buffer: new(bytes.Buffer)}
+}
+
+func (b *Buffer) Append(i interface{}) *Buffer {
+	switch val := i.(type) {
+	case int:
+		b.append(strconv.Itoa(val))
+	case int64:
+		b.append(strconv.FormatInt(val, 10))
+	case uint:
+		b.append(strconv.FormatUint(uint64(val), 10))
+	case uint64:
+		b.append(strconv.FormatUint(val, 10))
+	case string:
+		b.append(val)
+	case []byte:
+		b.Write(val)
+	case rune:
+		b.WriteRune(val)
+	}
+	return b
+}
+
+func (b *Buffer) append(s string) *Buffer {
+	defer func() {
+		if err := recover(); err != nil {
+			log.Println("*****内存不够了！******")
+		}
+	}()
+	b.WriteString(s)
+	return b
+}

viewmodels/api_req_info.go → viewmodels/api_log_info.go

@@ -2,7 +2,7 @@ package viewmodels
 
 import "time"
 
-type ApiReqInfo struct {
+type ApiLogInfo struct {
     OcId        int64       `json:"ocId"          xorm:"'oc_id'        bigint         comment('OcId')      "`
     AccountId   int64       `json:"accountId"     xorm:"'account_id'   bigint         comment('AccountId') "`
     AppId       int64       `json:"appId"         xorm:"'app_id'       bigint         comment('AppId')     "`
@@ -15,6 +15,6 @@ type ApiReqInfo struct {
     ReqTime     time.Time   `json:"reqTime"       xorm:"'req_time'     datetime       comment('ReqTime')   "`
 }
 
-func (t *ApiReqInfo) TableName() string {
-    return "ps_api_req"
+func (t *ApiLogInfo) TableName() string {
+    return "api_log"
 }

viewmodels/api_module_info.go

@@ -0,0 +1,13 @@
+package viewmodels
+
+type ApiModuleInfo struct {
+    ModuleId    int64  `json:"moduleId"      xorm:"'module_id'     bigint      pk comment('主键ID')        "`
+    ModuleTitle string `json:"moduleTitle"   xorm:"'module_title'  varchar(50)    comment('群组类型名称')   "`
+    ModuleCode  string `json:"moduleCode"    xorm:"'module_code'   varchar(127)   comment('Module Code')  "`
+    ModuleDesc  string `json:"moduleDesc"    xorm:"'module_desc'   varchar(50)    comment('描述')          "`
+    IsFixed     int64  `json:"isFixed"       xorm:"'is_fixed'      bigint         comment('是否可修改')     "`
+}
+
+func (t *ApiModuleInfo) TableName() string {
+    return "ps_module"
+}

viewmodels/object_attr_info.go → viewmodels/model_object_attr_info.go

@@ -1,6 +1,6 @@
 package viewmodels
 
-type ObjectAttrInfo struct {
+type ModelObjectAttrInfo struct {
 	ModelId      int64  `json:"modelId"         xorm:"'model_id'         bigint      pk comment('主键ID')         "`
 	ObjectId     int64  `json:"objectId"        xorm:"'object_id'        bigint      pk comment('主键ID')         "`
 	AttrId       int64  `json:"attrId"          xorm:"'attr_id'          bigint      pk comment('主键ID')         "`
@@ -16,6 +16,6 @@ type ObjectAttrInfo struct {
 	SortNo       int64  `json:"sortNo"          xorm:"'sort_no'         int            comment('是否可修改')       "`
 }
 
-func (t *ObjectAttrInfo) TableName() string {
+func (t *ModelObjectAttrInfo) TableName() string {
 	return "ds_object_attr"
 }

viewmodels/object_data.go → viewmodels/model_object_data.go

@@ -2,7 +2,7 @@ package viewmodels
 
 import "time"
 
-type ObjectData struct {
+type ModelObjectData struct {
     ModelId     int64            `json:"modelId"         xorm:"'model_id'        bigint      pk comment('主键ID')      "`
     ModelTitle  string           `json:"modelTitle"      xorm:"'model_title'     varchar(127)   comment('Model Title') "`
     ObjectId    int64            `json:"objectId"        xorm:"'object_id'       bigint      pk comment('主键ID')      "`
@@ -18,9 +18,9 @@ type ObjectData struct {
     DeletedFlag int64            `json:"deletedFlag"     xorm:"'deleted_flag'"`
     DeletedBy   int64            `json:"deletedBy"       xorm:"'deleted_by'"`
     DeletedAt   time.Time        `json:"deletedAt"       xorm:"'deleted_at'"`
-    Attrs       []ObjectAttrInfo `json:"attrs"`
+    Attrs       []ModelObjectAttrInfo `json:"attrs"`
 }
 
-func (t *ObjectData) TableName() string {
+func (t *ModelObjectData) TableName() string {
     return "ds_object"
 }

viewmodels/object_data_info.go → viewmodels/model_object_data_info.go

@@ -2,7 +2,7 @@ package viewmodels
 
 import "encoding/json"
 
-type ObjectDataInfo struct {
+type ModelObjectDataInfo struct {
 	ModelId     int64            `json:"modelId"         xorm:"'model_id'        bigint      pk comment('主键ID')     "`
 	ModelTitle  string           `json:"modelTitle"      xorm:"'model_title'     varchar(127)   comment('Model Title')"`
 	ObjectId    int64            `json:"objectId"        xorm:"'object_id'       bigint      pk comment('主键ID')     "`
@@ -11,18 +11,18 @@ type ObjectDataInfo struct {
 	ObjectCode  string           `json:"objectCode"      xorm:"'object_code'     varchar(127)   comment('模型名称')    "`
 	Comment     string           `json:"comment"         xorm:"'comment'         varchar(255)   comment('描述')       "`
 	IsFixed     int64            `json:"isFixed"         xorm:"'is_fixed'        int            comment('是否可修改')  "`
-	Attrs       []ObjectAttrInfo `json:"attrs"`
+	Attrs       []ModelObjectAttrInfo `json:"attrs"`
 }
 
-func (t *ObjectDataInfo) TableName() string {
+func (t *ModelObjectDataInfo) TableName() string {
 	return "ds_object"
 }
 
 
-func (g *ObjectDataInfo) MarshalBinary() (data []byte, err error){
+func (g *ModelObjectDataInfo) MarshalBinary() (data []byte, err error){
 	return json.Marshal(g)
 }
 
-func (g *ObjectDataInfo) UnmarshalBinary(data []byte) (err error){
+func (g *ModelObjectDataInfo) UnmarshalBinary(data []byte) (err error){
 	return json.Unmarshal(data, g)
 }

viewmodels/object_info.go → viewmodels/model_object_info.go

@@ -1,6 +1,6 @@
 package viewmodels
 
-type ObjectInfo struct {
+type ModelObjectInfo struct {
 	ModelId     int64     `json:"modelId"         xorm:"'model_id'        bigint      pk comment('Model ID')         "`
 	ModelTitle  string    `json:"modelTitle"      xorm:"'model_title'     varchar(127)   comment('Model Title')      "`
 	ObjectId    int64     `json:"objectId"        xorm:"'object_id'       bigint      pk comment('Object ID')        "`
@@ -11,6 +11,6 @@ type ObjectInfo struct {
 	IsFixed     int64     `json:"isFixed"         xorm:"'is_fixed'        int            comment('Is Fixed?')        "`
 }
 
-func (t *ObjectInfo) TableName() string {
+func (t *ModelObjectInfo) TableName() string {
 	return "ds_object"
 }

viewmodels/object_oam_info.go → viewmodels/model_object_oam_info.go

@@ -1,7 +1,7 @@
 package viewmodels
 
 
-type ObjectOAMInfo struct {
+type ModelObjectOAMInfo struct {
     ModelId      int64     `json:"modelId"         xorm:"'model_id'        bigint      pk comment('Model ID')       "`
     ObjectId     int64     `json:"objectId"        xorm:"'object_id'       bigint      pk comment('Object ID')      "`
     OamId        int64     `json:"oamId"           xorm:"'oam_id'          bigint      pk comment('OAM ID')         "`
@@ -16,6 +16,6 @@ type ObjectOAMInfo struct {
     OamDesc      string    `json:"oamDesc"         xorm:"'oam_desc'        varchar(1023)  comment('描述')            "`
 }
 
-func (t *ObjectOAMInfo) TableName() string {
+func (t *ModelObjectOAMInfo) TableName() string {
     return "ds_object_oam"
 }

viewmodels/module_info.go

@@ -1,12 +0,0 @@
-package viewmodels
-
-type ModuleInfo struct {
-    ModuleId    int64  `json:"moduleId"      xorm:"'module_id'      bigint      pk comment('主键ID')        "`
-    ModuleTitle string `json:"moduleTitle"   xorm:"'module_title'   varchar(50)    comment('群组类型名称')   "`
-    ModuleDesc  string `json:"moduleDesc"    xorm:"'module_desc'    varchar(50)    comment('描述')          "`
-    IsFixed     int64  `json:"isFixed"       xorm:"'is_fixed'       bigint         comment('是否可修改')     "`
-}
-
-func (t *ModuleInfo) TableName() string {
-    return "ps_module"
-}

web/controllers/api_gateway_controller.go

@@ -12,11 +12,11 @@ type ApiGatewayController struct {
 }
 
 func (c *ApiGatewayController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",         "/{apiCode:string}",              "Get"     )
-    b.Handle("POST",        "/{apiCode:string}",              "Create"  )
-    b.Handle("PUT",         "/{apiCode:string}",              "Update"  )
-    b.Handle("PATCH",       "/{apiCode:string}",              "Patch"   )
-    b.Handle("DELETE",      "/{apiCode:string}",              "Delete"  )
+    //b.Handle("GET",         "/{apiCode:string}",              "Get"     )
+    //b.Handle("POST",        "/{apiCode:string}",              "Create"  )
+    //b.Handle("PUT",         "/{apiCode:string}",              "Update"  )
+    //b.Handle("PATCH",       "/{apiCode:string}",              "Patch"   )
+    //b.Handle("DELETE",      "/{apiCode:string}",              "Delete"  )
 }
 
 func (c *ApiGatewayController) Get(apiCode string)*JsonResult {

web/controllers/api_req_controller.go → web/controllers/api_log_controller.go

@@ -7,19 +7,19 @@ import (
     "xps/service"
 )
 
-type ApiReqController struct {
+type ApiLogController struct {
     Base
-    Service service.ApiReqService
+    Service service.ApiLogService
 }
 
-func (c *ApiReqController) BeforeActivation(b mvc.BeforeActivation) {
+func (c *ApiLogController) BeforeActivation(b mvc.BeforeActivation) {
     b.Handle("GET",         "/",                              "GetList"       )
     b.Handle("GET",         "/page",                          "GetPage"       )
     b.Handle("GET",         "/{reqId:int64}",                 "GetById"       )
     b.Handle("POST",        "/add",                           "Create"        )
 }
 
-func (c *ApiReqController) GetList() *JsonResult {
+func (c *ApiLogController) GetList() *JsonResult {
     params  := c.buildParams()
     data, err := c.Service.GetList(params)
     if err != nil {
@@ -29,7 +29,7 @@ func (c *ApiReqController) GetList() *JsonResult {
     }
 }
 
-func (c *ApiReqController) GetPage() *JsonResult {
+func (c *ApiLogController) GetPage() *JsonResult {
     params  := c.buildParams()
     data, err := c.Service.GetPage(params)
     if err != nil {
@@ -39,7 +39,7 @@ func (c *ApiReqController) GetPage() *JsonResult {
     }
 }
 
-func (c *ApiReqController) GetById(reqId int64) *JsonResult {
+func (c *ApiLogController) GetById(reqId int64) *JsonResult {
     data, err := c.Service.GetById(reqId)
     if err != nil {
         return ResultErr(err.Error(), nil)
@@ -48,10 +48,10 @@ func (c *ApiReqController) GetById(reqId int64) *JsonResult {
     }
 }
 
-func (c *ApiReqController) Create() *JsonResult {
+func (c *ApiLogController) Create() *JsonResult {
     userId := c.GetCurUserId()
     
-    req    := datamodels.ApiReq{}
+    req    := datamodels.ApiLog{}
     if err := c.Ctx.ReadJSON(&req); err != nil {
         return ResultErr("读取数据失败", nil)
     }

web/controllers/module_controller.go → web/controllers/api_module_controller.go

@@ -8,16 +8,16 @@ import (
 
 type ModuleController struct {
     Base
-    Service service.ModuleService
+    Service service.ApiModuleService
 }
 
 func (c *ModuleController) BeforeActivation(b mvc.BeforeActivation) {
-    b.Handle("GET",         "/",                    "GetList"   )
-    b.Handle("GET",         "/page",                "GetPage"   )
-    b.Handle("GET",         "/{moduleId:int64}",    "GetById"   )
-    b.Handle("POST",        "/add",                 "Create"    )
-    b.Handle("PUT",         "/update",              "Update"    )
-    b.Handle("DELETE",      "/{moduleId:int64}",    "DeleteByID")
+    b.Handle("GET",         "/",                        "GetList"   )
+    b.Handle("GET",         "/page",                    "GetPage"   )
+    b.Handle("GET",         "/{moduleId:int64}",        "GetById"   )
+    b.Handle("POST",        "/add",                     "Create"    )
+    b.Handle("PUT",         "/update",                  "Update"    )
+    b.Handle("DELETE",      "/{moduleId:int64}",        "DeleteByID")
 }
 
 func (c *ModuleController) GetList() *JsonResult {
@@ -53,13 +53,12 @@ func (c *ModuleController) GetById(moduleId int64) *JsonResult {
 func (c *ModuleController) Create() *JsonResult {
     userId := c.GetCurUserId()
     
-    module := datamodels.Module{}
+    module := datamodels.ApiModule{}
     module.CreatedBy = userId
     if err := c.Ctx.ReadJSON(&module); err != nil {
         return ResultErr("读取数据失败", nil)
     }
     
-    
     if err := c.Service.Create(&module); err != nil {
         return ResultErr(err.Error(), nil)
     } else {
@@ -70,7 +69,7 @@ func (c *ModuleController) Create() *JsonResult {
 func (c *ModuleController) Update() *JsonResult {
     userId := c.GetCurUserId()
     
-    module  := datamodels.Module{}
+    module := datamodels.ApiModule{}
     if err := c.Ctx.ReadJSON(&module); err != nil {
         return ResultErr("读取数据失败", nil)
     }

web/controllers/object_attr_controller.go → web/controllers/model_object_attr_controller.go

@@ -8,7 +8,7 @@ import (
 
 type ObjectAttrController struct {
 	Base
-	Service service.ObjectAttrService
+	Service service.ModelObjectAttrService
 }
 
 func (c *ObjectAttrController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/object_controller.go → web/controllers/model_object_controller.go

@@ -8,7 +8,7 @@ import (
 
 type ObjectController struct {
 	Base
-	Service service.ObjectService
+	Service service.ModelObjectService
 }
 
 func (c *ObjectController) BeforeActivation(b mvc.BeforeActivation) {
@@ -63,7 +63,7 @@ func (c *ObjectController) GetById(modelId, objectId int64) *JsonResult {
 func (c *ObjectController) Create() *JsonResult {
 	userId     := c.GetCurUserId()
 	
-	objectData := viewmodels.ObjectData{}
+	objectData := viewmodels.ModelObjectData{}
 	if err := c.Ctx.ReadJSON(&objectData); err != nil {
 		return ResultErr("读取数据失败", nil)
 	}
@@ -79,7 +79,7 @@ func (c *ObjectController) Create() *JsonResult {
 func (c *ObjectController) Update() *JsonResult {
 	userId     := c.GetCurUserId()
 	
-	objectData := viewmodels.ObjectData{}
+	objectData := viewmodels.ModelObjectData{}
 	if err := c.Ctx.ReadJSON(&objectData); err != nil {
 		return ResultErr("读取数据失败", nil)
 	}

web/controllers/object_oam_controller.go → web/controllers/model_object_oam_controller.go

@@ -8,7 +8,7 @@ import (
 
 type ObjectOAMController struct {
     Base
-    Service service.ObjectOAMService
+    Service service.ModelObjectOAMService
 }
 
 func (c *ObjectOAMController) BeforeActivation(b mvc.BeforeActivation) {

web/middleware/auth.go

@@ -59,14 +59,6 @@ func AuthToken(ctx iris.Context) {
 	ctx.Values().Set("appKey", hs.AppKey)
 	ctx.Values().Set("appSecret", hs.AppSecret)
 
-	// Get the verified and decoded claims.
-	//xClaims := jwt.Get(ctx).(*XClaims)
-
-	// Optionally, get token information if you want to work with them.
-	// Just an example on how you can retrieve all the standard claims (set by signer's max age, "exp").
-	//standardClaims := jwt.GetVerifiedToken(ctx).StandardClaims
-	//timeLeft := standardClaims.Timeleft()
-
 	ocId     := claims.OcId
 	ocTypeId := claims.OcTypeId
 	userId   := claims.UserId
@@ -74,5 +66,6 @@ func AuthToken(ctx iris.Context) {
 	ctx.Values().Set("ocId", ocId)
 	ctx.Values().Set("ocTypeId", ocTypeId)
 	ctx.Values().Set("userId", userId)
-	ctx.Next()
+	
+	HandleX(ctx)
 }

web/middleware/gateway.go

@@ -0,0 +1,10 @@
+package middleware
+
+import (
+    "github.com/kataras/iris/v12"
+)
+
+func HandleX(ctx iris.Context) {
+   
+   ctx.Next()
+}

web/router/routes.go

@@ -152,20 +152,20 @@ func Configure(b *bootstrap.Bootstrapper) {
 		modelApp.Register(modelService)
 		modelApp.Handle(new(controllers.ModelController))
 
-		objectService := service.NewObjectService()
-		objectApp := mvc.New(modelParty.Party("/object"))
-		objectApp.Register(objectService)
-		objectApp.Handle(new(controllers.ObjectController))
-
-		objectAttrService := service.NewObjectAttrService()
-		objectAttrApp := mvc.New(modelParty.Party("/object/attribute"))
-		objectAttrApp.Register(objectAttrService)
-		objectAttrApp.Handle(new(controllers.ObjectAttrController))
+		modelObjectService := service.NewModelObjectService()
+		modelObjectApp := mvc.New(modelParty.Party("/object"))
+		modelObjectApp.Register(modelObjectService)
+		modelObjectApp.Handle(new(controllers.ObjectController))
 		
-		objectOAMService := service.NewObjectOAMService()
-		objectOAMApp := mvc.New(modelParty.Party("/object/oam"))
-		objectOAMApp.Register(objectOAMService)
-		objectOAMApp.Handle(new(controllers.ObjectOAMController))
+		modelObjectAttrService := service.NewModelObjectAttrService()
+		modelObjectAttrApp := mvc.New(modelParty.Party("/object/attribute"))
+		modelObjectAttrApp.Register(modelObjectAttrService)
+		modelObjectAttrApp.Handle(new(controllers.ObjectAttrController))
+		
+		modelObjectOAMService := service.NewModelObjectOAMService()
+		modelObjectOAMApp := mvc.New(modelParty.Party("/object/oam"))
+		modelObjectOAMApp.Register(modelObjectOAMService)
+		modelObjectOAMApp.Handle(new(controllers.ObjectOAMController))
 	}
 	
 	// DaaS
@@ -192,10 +192,10 @@ func Configure(b *bootstrap.Bootstrapper) {
 		apiApp.Register(apiService)
 		apiApp.Handle(new(controllers.ApiController))
 		
-		reqService := service.NewApiReqService()
-		reqApp := mvc.New(paasParty.Party("/api/request"))
-		reqApp.Register(reqService)
-		reqApp.Handle(new(controllers.ApiReqController))
+		apiLogService := service.NewApiLogService()
+		apiLogApp := mvc.New(paasParty.Party("/api/request"))
+		apiLogApp.Register(apiLogService)
+		apiLogApp.Handle(new(controllers.ApiLogController))
 		
 		atuService := service.NewApiTransUnitService()
 		apiAtuApp := mvc.New(paasParty.Party("/api/atu"))