init

repositories/system/account_repo.go → repositories/account_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import (
 	"fmt"

repositories/paas/api_repo.go → repositories/api_repo.go

@@ -1,4 +1,4 @@
-package paas
+package repositories
 
 import (
     "fmt"

repositories/paas/api_req_repo.go → repositories/api_req_repo.go

@@ -1,4 +1,4 @@
-package paas
+package repositories
 
 import (
     "fmt"

repositories/system/app_cat_repo.go → repositories/app_cat_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import (
 	"fmt"

repositories/system/app_permit_repo.go → repositories/app_permit_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import (
 	"fmt"

repositories/system/app_repo.go → repositories/app_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import (
 	"fmt"

repositories/system/company_repo.go → repositories/company_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import (
     "xorm.io/xorm"

repositories/daas/db_type.go → repositories/db_type_repo.go

@@ -1,4 +1,4 @@
-package daas
+package repositories
 
 import (
     "fmt"

repositories/system/ent_cat_repo.go → repositories/ent_cat_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import (
 	"fmt"

repositories/system/group_cat_repo.go → repositories/group_cat_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import (
 	"fmt"

repositories/system/group_member_position_repo.go → repositories/group_member_position_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import (
 	"fmt"

repositories/system/group_member_repo.go → repositories/group_member_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import (
 	"fmt"

repositories/system/group_repo.go → repositories/group_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import (
     "fmt"
@@ -12,7 +12,7 @@ type GroupRepo struct {
     engine *xorm.Engine
 }
 
-func NewGroupRepo(engine *xorm.Engine) *GroupRepo{
+func NewGroupRepo(engine *xorm.Engine) *GroupRepo {
     return &GroupRepo{
         engine:engine,
     }

repositories/model/model_repo.go → repositories/model_repo.go

@@ -1,4 +1,4 @@
-package model
+package repositories
 
 import (
 	"fmt"

repositories/paas/module_repo.go → repositories/module_repo.go

@@ -1,4 +1,4 @@
-package paas
+package repositories
 
 import (
     "fmt"

repositories/model/object_attr_repo.go → repositories/object_attr_repo.go

@@ -1,4 +1,4 @@
-package model
+package repositories
 
 import (
 	"fmt"

repositories/model/object_repo.go → repositories/object_repo.go

@@ -1,4 +1,4 @@
-package model
+package repositories
 
 import (
 	"fmt"
@@ -54,23 +54,23 @@ func (d *ObjectRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult,
 }
 
 func (d *ObjectRepo) GetList(m map[string]interface{}) ([]viewmodels.ObjectInfo, error) {
-	modelId := m["modelId"].(int64)
-	keywords := m["keywords"].(string)
-
-	sqlSelect := `SELECT A.* `
-	sqlFrom := `FROM  ds_object   AS A    `
-	sqlWhere := `WHERE A.deleted_flag = 0 AND A.model_id =` + fmt.Sprintf("%d", modelId)
-	if keywords != "" {
-		sqlWhere += ` AND A.object_title like ` + "'%" + keywords + "%'"
-	}
+	modelId   := m["modelId"].(int64)
 
+	sqlSelect := ` SELECT A.*                `
+	sqlFrom   := ` FROM  ds_object   AS A    `
+	sqlWhere  := ` WHERE A.deleted_flag = 0 AND A.model_id =` + fmt.Sprintf("%d", modelId)
+	if keywords, ok := m["keywords"]; ok {
+		sqlWhere += ` AND A.object_title like ` + "'%" + fmt.Sprintf("%s", keywords) + "%'"
+	}
 	sqlOrderBy := " ORDER BY model_id ASC "
+	
 	datalist := make([]viewmodels.ObjectInfo, 0)
 	err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy).Find(&datalist)
 	if err != nil {
 		return nil, err
+	} else {
+		return datalist, nil
 	}
-	return datalist, nil
 }
 
 func (d *ObjectRepo) GetById(modelId, objectId int64) (*viewmodels.ObjectInfo, error) {
@@ -105,8 +105,8 @@ func (d *ObjectRepo) Update(data *datamodels.Object) error {
 }
 
 func (d *ObjectRepo) Delete(m map[string]interface{}) error {
-	modelId := m["modelId"].(int64)
-	objectId := m["objectId"].(int64)
+	modelId   := m["modelId"].(int64)
+	objectId  := m["objectId"].(int64)
 	deletedBy := m["deletedBy"].(int64)
 
 	data := &datamodels.Object{}

repositories/system/oc_repo.go → repositories/oc_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import (
 	"fmt"

repositories/system/partner_cat_repo.go → repositories/partner_cat_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import (
 	"fmt"

repositories/system/position_repo.go → repositories/position_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import (
 	"fmt"

repositories/system/role_member_repo.go → repositories/role_member_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import (
 	"fmt"

repositories/system/role_repo.go → repositories/role_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import (
 	"fmt"

repositories/system/task_cat_repo.go → repositories/task_cat_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import (
 	"fmt"

repositories/system/user_repo.go → repositories/user_repo.go

@@ -1,4 +1,4 @@
-package system
+package repositories
 
 import "C"
 import (

service/paas/api_req_service.go → service/api_req_service.go

@@ -1,9 +1,9 @@
-package paas
+package service
 
 import (
     "xps/datamodels"
     "xps/datasource"
-    "xps/repositories/paas"
+    "xps/repositories"
     "xps/viewmodels"
 )
 
@@ -15,12 +15,12 @@ type ApiReqService interface {
 }
 
 type apiReqService struct {
-    repo *paas.ApiReqRepo
+    repo *repositories.ApiReqRepo
 }
 
 func NewApiReqService() ApiReqService {
     return &apiReqService{
-        repo: paas.NewApiReqRepo(datasource.InstanceMaster()),
+        repo: repositories.NewApiReqRepo(datasource.InstanceMaster()),
     }
 }
 

service/paas/api_service.go → service/api_service.go

@@ -1,9 +1,9 @@
-package paas
+package service
 
 import (
     "xps/datamodels"
     "xps/datasource"
-    "xps/repositories/paas"
+    "xps/repositories"
     "xps/viewmodels"
 )
 
@@ -18,12 +18,12 @@ type ApiService interface {
 }
 
 type apiService struct {
-    repo *paas.ApiRepo
+    repo *repositories.ApiRepo
 }
 
 func NewApiService() ApiService {
     return &apiService{
-        repo: paas.NewApiRepo(datasource.InstanceMaster()),
+        repo: repositories.NewApiRepo(datasource.InstanceMaster()),
     }
 }
 

service/system/app_cat_service.go → service/app_cat_service.go

@@ -1,10 +1,10 @@
-package system
+package service
 
 import (
-	"xps/datamodels"
-	"xps/datasource"
-	"xps/repositories/system"
-	"xps/viewmodels"
+    "xps/datamodels"
+    "xps/datasource"
+    "xps/repositories"
+    "xps/viewmodels"
 )
 
 type AppCatService interface {
@@ -17,12 +17,12 @@ type AppCatService interface {
 }
 
 type appCatService struct {
-	repo *system.AppCatRepo
+	repo *repositories.AppCatRepo
 }
 
 func NewAppCatService() AppCatService {
 	return &appCatService{
-		repo: system.NewAppCatRepo(datasource.InstanceMaster()),
+		repo: repositories.NewAppCatRepo(datasource.InstanceMaster()),
 	}
 }
 

service/system/app_permit_service.go → service/app_permit_service.go

@@ -1,10 +1,10 @@
-package system
+package service
 
 import (
-	"xps/datamodels"
-	"xps/datasource"
-	"xps/repositories/system"
-	"xps/viewmodels"
+    "xps/datamodels"
+    "xps/datasource"
+    "xps/repositories"
+    "xps/viewmodels"
 )
 
 type AppPermitService interface {
@@ -16,12 +16,12 @@ type AppPermitService interface {
 }
 
 type appPermitService struct {
-	repo *system.AppPermitRepo
+	repo *repositories.AppPermitRepo
 }
 
 func NewAppPermitService() AppPermitService {
 	return &appPermitService{
-		repo: system.NewAppPermitRepo(datasource.InstanceMaster()),
+		repo: repositories.NewAppPermitRepo(datasource.InstanceMaster()),
 	}
 }
 

service/system/app_service.go → service/app_service.go

@@ -1,10 +1,10 @@
-package system
+package service
 
 import (
-	"xps/datamodels"
-	"xps/datasource"
-	"xps/repositories/system"
-	"xps/viewmodels"
+    "xps/datamodels"
+    "xps/datasource"
+    "xps/repositories"
+    "xps/viewmodels"
 )
 
 type AppService interface {
@@ -17,12 +17,12 @@ type AppService interface {
 }
 
 type appService struct {
-	repo *system.AppRepo
+	repo *repositories.AppRepo
 }
 
 func NewAppService() AppService {
 	return &appService{
-		repo: system.NewAppRepo(datasource.InstanceMaster()),
+		repo: repositories.NewAppRepo(datasource.InstanceMaster()),
 	}
 }
 

service/system/base_service.go → service/base_service.go

@@ -1,4 +1,4 @@
-package system
+package service
 
 import (
 	"log"

service/system/company_profile_service.go → service/company_profile_service.go

@@ -1,9 +1,9 @@
-package system
+package service
 
 import (
     "xps/datamodels"
     "xps/datasource"
-    "xps/repositories/system"
+    "xps/repositories"
 )
 
 type CompanyProfileService interface{
@@ -12,18 +12,18 @@ type CompanyProfileService interface{
 }
 
 type cmpProfileService struct {
-    companyRepo *system.CompanyRepo
-    ocRepo      *system.OcRepo
-    groupRepo   *system.GroupRepo
+    companyRepo *repositories.CompanyRepo
+    ocRepo      *repositories.OcRepo
+    groupRepo   *repositories.GroupRepo
 }
 
-func NewCompanyProfileService() CompanyProfileService{
+func NewCompanyProfileService() CompanyProfileService {
     engine := datasource.InstanceMaster()
     
     return &cmpProfileService{
-        companyRepo: system.NewCompanyRepo(engine),
-        ocRepo:      system.NewOcRepo(engine),
-        groupRepo:   system.NewGroupRepo(engine),
+        companyRepo: repositories.NewCompanyRepo(engine),
+        ocRepo:      repositories.NewOcRepo(engine),
+        groupRepo:   repositories.NewGroupRepo(engine),
     }
 }
 

service/daas/base_service.go

@@ -1,29 +0,0 @@
-package daas
-
-import (
-    "log"
-    "xps/cache"
-    "xps/datasource"
-    "xps/viewmodels"
-)
-
-func NewID() int64 {
-    engine := datasource.InstanceIDServer()
-    ret, err := engine.Exec("replace into uid_sequence(stub) values('a')")
-    if err != nil {
-        log.Fatal(err.Error())
-    }
-    uid, err := ret.LastInsertId()
-    if err != nil {
-        log.Fatal(err.Error())
-    }
-    return uid
-}
-
-func GetCurUser(userId int64) *viewmodels.UserData {
-    userData, err := cache.GetUserData(userId)
-    if err != nil {
-        log.Fatal(err.Error())
-    }
-    return userData
-}

service/daas/db_type_service.go → service/db_type_service.go

@@ -1,9 +1,9 @@
-package daas
+package service
 
 import (
     "xps/datamodels"
     "xps/datasource"
-    "xps/repositories/daas"
+    "xps/repositories"
     "xps/viewmodels"
 )
 
@@ -17,12 +17,12 @@ type DbTypeService interface {
 }
 
 type dbTypeService struct {
-    repo *daas.DbTypeRepo
+    repo *repositories.DbTypeRepo
 }
 
 func NewDbTypeService() DbTypeService {
     return &dbTypeService{
-        repo: daas.NewDbTypeRepo(datasource.InstanceMaster()),
+        repo: repositories.NewDbTypeRepo(datasource.InstanceMaster()),
     }
 }
 

service/system/ent_cat_service.go → service/ent_cat_service.go

@@ -1,10 +1,10 @@
-package system
+package service
 
 import (
-	"xps/datamodels"
-	"xps/datasource"
-	"xps/repositories/system"
-	"xps/viewmodels"
+    "xps/datamodels"
+    "xps/datasource"
+    "xps/repositories"
+    "xps/viewmodels"
 )
 
 type EntCatService interface {
@@ -17,12 +17,12 @@ type EntCatService interface {
 }
 
 type entCatService struct {
-	repo *system.EntCatRepo
+	repo *repositories.EntCatRepo
 }
 
 func NewEntCatService() EntCatService {
 	return &entCatService{
-		repo: system.NewEntCatRepo(datasource.InstanceMaster()),
+		repo: repositories.NewEntCatRepo(datasource.InstanceMaster()),
 	}
 }
 

service/system/group_cat_service.go → service/group_cat_service.go

@@ -1,9 +1,9 @@
-package system
+package service
 
 import (
     "xps/datamodels"
     "xps/datasource"
-    "xps/repositories/system"
+    "xps/repositories"
     "xps/viewmodels"
 )
 
@@ -17,12 +17,12 @@ type GroupCatService interface {
 }
 
 type groupCatService struct {
-    repo *system.GroupCatRepo
+    repo *repositories.GroupCatRepo
 }
 
 func NewGroupCatService() GroupCatService {
     return &groupCatService{
-        repo: system.NewGroupCatRepo(datasource.InstanceMaster()),
+        repo: repositories.NewGroupCatRepo(datasource.InstanceMaster()),
     }
 }
 

service/system/group_service.go → service/group_service.go

@@ -1,10 +1,10 @@
-package system
+package service
 
 import (
     "errors"
     "xps/datamodels"
     "xps/datasource"
-    "xps/repositories/system"
+    "xps/repositories"
     "xps/viewmodels"
 )
 
@@ -17,17 +17,17 @@ type GroupService interface {
 }
 
 type groupService struct {
-    groupRepo *system.GroupRepo
-    groupMemberRepo *system.GroupMemberRepo
-    groupMemberPositionRepo *system.GroupMemberPositionRepo
+    groupRepo *repositories.GroupRepo
+    groupMemberRepo *repositories.GroupMemberRepo
+    groupMemberPositionRepo *repositories.GroupMemberPositionRepo
     //groupMemberPositionGrantRepo *base.GroupMemberPositionGrantRepo
 }
 
-func NewGroupService() GroupService{
+func NewGroupService() GroupService {
     return &groupService{
-        groupRepo:                     system.NewGroupRepo(datasource.InstanceMaster()),
-        groupMemberRepo :              system.NewGroupMemberRepo(datasource.InstanceMaster()),
-        groupMemberPositionRepo :      system.NewGroupMemberPositionRepo(datasource.InstanceMaster()),
+        groupRepo:                repositories.NewGroupRepo(datasource.InstanceMaster()),
+        groupMemberRepo :         repositories.NewGroupMemberRepo(datasource.InstanceMaster()),
+        groupMemberPositionRepo : repositories.NewGroupMemberPositionRepo(datasource.InstanceMaster()),
         //groupMemberPositionGrantRepo : base.NewGroupMemberPositionGrantRepo(datasource.InstanceMaster()),
     }
 }

service/system/login_service.go → service/login_service.go

@@ -1,13 +1,13 @@
-package system
+package service
 
 import (
-	"time"
-	"xps/cache"
-	"xps/datasource"
-	"xps/repositories/system"
-	"xps/utils"
-	"xps/viewmodels"
-	"xps/web/middleware"
+    "time"
+    "xps/cache"
+    "xps/datasource"
+    "xps/repositories"
+    "xps/utils"
+    "xps/viewmodels"
+    "xps/web/middleware"
 )
 
 type LoginService interface {
@@ -17,20 +17,20 @@ type LoginService interface {
 }
 
 type loginService struct {
-	accountRepo             *system.AccountRepo
-	ocRepo                  *system.OcRepo
-	roleMemberRepo          *system.RoleMemberRepo
-	groupMemberRepo         *system.GroupMemberRepo
-	groupMemberPositionRepo *system.GroupMemberPositionRepo
+	accountRepo             *repositories.AccountRepo
+	ocRepo                  *repositories.OcRepo
+	roleMemberRepo          *repositories.RoleMemberRepo
+	groupMemberRepo         *repositories.GroupMemberRepo
+	groupMemberPositionRepo *repositories.GroupMemberPositionRepo
 }
 
 func NewLoginService() LoginService {
 	return &loginService{
-		accountRepo:             system.NewAccountRepo(datasource.InstanceMaster()),
-		ocRepo:                  system.NewOcRepo(datasource.InstanceMaster()),
-		roleMemberRepo:          system.NewRoleMemberRepo(datasource.InstanceMaster()),
-		groupMemberRepo:         system.NewGroupMemberRepo(datasource.InstanceMaster()),
-		groupMemberPositionRepo: system.NewGroupMemberPositionRepo(datasource.InstanceMaster()),
+		accountRepo:             repositories.NewAccountRepo(datasource.InstanceMaster()),
+		ocRepo:                  repositories.NewOcRepo(datasource.InstanceMaster()),
+		roleMemberRepo:          repositories.NewRoleMemberRepo(datasource.InstanceMaster()),
+		groupMemberRepo:         repositories.NewGroupMemberRepo(datasource.InstanceMaster()),
+		groupMemberPositionRepo: repositories.NewGroupMemberPositionRepo(datasource.InstanceMaster()),
 	}
 }
 

service/model/base_service.go

@@ -1,29 +0,0 @@
-package model
-
-import (
-	"log"
-	"xps/cache"
-	"xps/datasource"
-	"xps/viewmodels"
-)
-
-func NewID() int64 {
-	engine := datasource.InstanceIDServer()
-	ret, err := engine.Exec("replace into uid_sequence(stub) values('a')")
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-	uid, err := ret.LastInsertId()
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-	return uid
-}
-
-func GetCurUser(userId int64) *viewmodels.UserData {
-	userData, err := cache.GetUserData(userId)
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-	return userData
-}

service/model/model_service.go → service/model_service.go

@@ -1,9 +1,9 @@
-package model
+package service
 
 import (
-	"xps/datamodels"
-	"xps/datasource"
-	"xps/repositories/model"
+    "xps/datamodels"
+    "xps/datasource"
+    "xps/repositories"
 	"xps/viewmodels"
 )
 
@@ -17,12 +17,12 @@ type ModelService interface {
 }
 
 type modelService struct {
-	repo *model.ModelRepo
+	repo *repositories.ModelRepo
 }
 
 func NewModelService() ModelService {
 	return &modelService{
-		repo: model.NewModelRepo(datasource.InstanceMaster()),
+		repo: repositories.NewModelRepo(datasource.InstanceMaster()),
 	}
 }
 

service/paas/module_service.go → service/module_service.go

@@ -1,9 +1,9 @@
-package paas
+package service
 
 import (
     "xps/datamodels"
     "xps/datasource"
-    "xps/repositories/paas"
+    "xps/repositories"
     "xps/viewmodels"
 )
 
@@ -17,12 +17,12 @@ type ModuleService interface {
 }
 
 type moduleService struct {
-    repo *paas.ModuleRepo
+    repo *repositories.ModuleRepo
 }
 
 func NewModuleService() ModuleService {
     return &moduleService{
-        repo: paas.NewModuleRepo(datasource.InstanceMaster()),
+        repo: repositories.NewModuleRepo(datasource.InstanceMaster()),
     }
 }
 

service/model/object_attr_service.go → service/object_attr_service.go

@@ -1,9 +1,9 @@
-package model
+package service
 
 import (
 	"xps/datamodels"
 	"xps/datasource"
-	"xps/repositories/model"
+	"xps/repositories"
 	"xps/viewmodels"
 )
 
@@ -17,12 +17,12 @@ type ObjectAttrService interface {
 }
 
 type objectAttrService struct {
-	repo *model.ObjectAttrRepo
+	repo *repositories.ObjectAttrRepo
 }
 
 func NewObjectAttrService() ObjectAttrService {
 	return &objectAttrService{
-		repo: model.NewObjectAttrRepo(datasource.InstanceMaster()),
+		repo: repositories.NewObjectAttrRepo(datasource.InstanceMaster()),
 	}
 }
 

service/model/object_service.go → service/object_service.go

@@ -1,10 +1,10 @@
-package model
+package service
 
 import (
-	"time"
-	"xps/datamodels"
-	"xps/datasource"
-	"xps/repositories/model"
+    "time"
+    "xps/datamodels"
+    "xps/datasource"
+    "xps/repositories"
 	"xps/viewmodels"
 )
 
@@ -21,14 +21,14 @@ type ObjectService interface {
 }
 
 type objectService struct {
-	objectRepo     *model.ObjectRepo
-	objectAttrRepo *model.ObjectAttrRepo
+	objectRepo     *repositories.ObjectRepo
+	objectAttrRepo *repositories.ObjectAttrRepo
 }
 
 func NewObjectService() ObjectService {
 	return &objectService{
-		objectRepo:     model.NewObjectRepo(datasource.InstanceMaster()),
-		objectAttrRepo: model.NewObjectAttrRepo(datasource.InstanceMaster()),
+		objectRepo:     repositories.NewObjectRepo(datasource.InstanceMaster()),
+		objectAttrRepo: repositories.NewObjectAttrRepo(datasource.InstanceMaster()),
 	}
 }
 

service/paas/base_service.go

@@ -1,34 +0,0 @@
-package paas
-
-import (
-    "log"
-    "xps/cache"
-    "xps/datasource"
-    "xps/viewmodels"
-)
-
-func NewID() int64 {
-    engine   := datasource.InstanceIDServer()
-    ret, err := engine.Exec("replace into uid_sequence(stub) values('a')")
-    if err != nil {
-        log.Fatal(err.Error())
-    }
-    uid, err := ret.LastInsertId()
-    if err != nil {
-        log.Fatal(err.Error())
-    }
-    return uid
-}
-
-func GetCurUser(userId int64) (*viewmodels.UserData, error){
-    return cache.GetUserData(userId)
-}
-
-func GetCurUserRoleId(userId int64) int64 {
-    userData, err := cache.GetUserData(userId)
-    if err != nil {
-        log.Fatal(err.Error())
-        return 0
-    }
-    return userData.RoleId
-}

service/system/partner_cat_service.go → service/partner_cat_service.go

@@ -1,10 +1,10 @@
-package system
+package service
 
 import (
-	"xps/datamodels"
-	"xps/datasource"
-	"xps/repositories/system"
-	"xps/viewmodels"
+    "xps/datamodels"
+    "xps/datasource"
+    "xps/repositories"
+    "xps/viewmodels"
 )
 
 type PartnerCatService interface {
@@ -17,12 +17,12 @@ type PartnerCatService interface {
 }
 
 type partnerCatService struct {
-	repo *system.PartnerCatRepo
+	repo *repositories.PartnerCatRepo
 }
 
 func NewPartnerCatService() PartnerCatService {
 	return &partnerCatService{
-		repo: system.NewPartnerCatRepo(datasource.InstanceMaster()),
+		repo: repositories.NewPartnerCatRepo(datasource.InstanceMaster()),
 	}
 }
 

service/system/position_service.go → service/position_service.go

@@ -1,10 +1,10 @@
-package system
+package service
 
 import (
-	"xps/datamodels"
-	"xps/datasource"
-	"xps/repositories/system"
-	"xps/viewmodels"
+    "xps/datamodels"
+    "xps/datasource"
+    "xps/repositories"
+    "xps/viewmodels"
 )
 
 type PositionService interface {
@@ -17,12 +17,12 @@ type PositionService interface {
 }
 
 type positionService struct {
-	repo *system.PositionRepo
+	repo *repositories.PositionRepo
 }
 
 func NewPositionService() PositionService {
 	return &positionService{
-		repo: system.NewPositionRepo(datasource.InstanceMaster()),
+		repo: repositories.NewPositionRepo(datasource.InstanceMaster()),
 	}
 }
 

service/system/role_service.go → service/role_service.go

@@ -1,10 +1,10 @@
-package system
+package service
 
 import (
-	"xps/datamodels"
-	"xps/datasource"
-	"xps/repositories/system"
-	"xps/viewmodels"
+    "xps/datamodels"
+    "xps/datasource"
+    "xps/repositories"
+    "xps/viewmodels"
 )
 
 type RoleService interface {
@@ -17,12 +17,12 @@ type RoleService interface {
 }
 
 type roleService struct {
-	repo *system.RoleRepo
+	repo *repositories.RoleRepo
 }
 
 func NewRoleService() RoleService {
 	return &roleService{
-		repo: system.NewRoleRepo(datasource.InstanceMaster()),
+		repo: repositories.NewRoleRepo(datasource.InstanceMaster()),
 	}
 }
 

service/system/task_cat_service.go → service/task_cat_service.go

@@ -1,10 +1,10 @@
-package system
+package service
 
 import (
-	"xps/datamodels"
-	"xps/datasource"
-	"xps/repositories/system"
-	"xps/viewmodels"
+    "xps/datamodels"
+    "xps/datasource"
+    "xps/repositories"
+    "xps/viewmodels"
 )
 
 type TaskCatService interface {
@@ -17,12 +17,12 @@ type TaskCatService interface {
 }
 
 type taskCatService struct {
-	repo *system.TaskCatRepo
+	repo *repositories.TaskCatRepo
 }
 
 func NewTaskCatService() TaskCatService {
 	return &taskCatService{
-		repo: system.NewTaskCatRepo(datasource.InstanceMaster()),
+		repo: repositories.NewTaskCatRepo(datasource.InstanceMaster()),
 	}
 }
 

service/system/user_service.go → service/user_service.go

@@ -1,4 +1,4 @@
-package system
+package service
 
 import (
     "errors"
@@ -6,7 +6,7 @@ import (
     "xps/constant"
     "xps/datamodels"
     "xps/datasource"
-    "xps/repositories/system"
+    "xps/repositories"
     "xps/utils"
     "xps/viewmodels"
 )
@@ -30,24 +30,24 @@ type UserService interface {
 }
 
 type userService struct {
-    userRepo *system.UserRepo
-    accountRepo *system.AccountRepo
-    roleMemberRepo *system.RoleMemberRepo
-    groupRepo *system.GroupRepo
-    groupMemberRepo *system.GroupMemberRepo
-    groupMemberPositionRepo *system.GroupMemberPositionRepo
-    permitRepo *system.AppPermitRepo
+    userRepo *repositories.UserRepo
+    accountRepo *repositories.AccountRepo
+    roleMemberRepo *repositories.RoleMemberRepo
+    groupRepo *repositories.GroupRepo
+    groupMemberRepo *repositories.GroupMemberRepo
+    groupMemberPositionRepo *repositories.GroupMemberPositionRepo
+    permitRepo *repositories.AppPermitRepo
 }
 
 func NewUserService() UserService {
     return &userService{
-        userRepo: system.NewUserRepo(datasource.InstanceMaster()),
-        accountRepo: system.NewAccountRepo(datasource.InstanceMaster()),
-        roleMemberRepo: system.NewRoleMemberRepo(datasource.InstanceMaster()),
-        groupRepo: system.NewGroupRepo(datasource.InstanceMaster()),
-        groupMemberRepo: system.NewGroupMemberRepo(datasource.InstanceMaster()),
-        groupMemberPositionRepo: system.NewGroupMemberPositionRepo(datasource.InstanceMaster()),
-        permitRepo: system.NewAppPermitRepo(datasource.InstanceMaster()),
+        userRepo:                repositories.NewUserRepo(datasource.InstanceMaster()),
+        accountRepo:             repositories.NewAccountRepo(datasource.InstanceMaster()),
+        roleMemberRepo:          repositories.NewRoleMemberRepo(datasource.InstanceMaster()),
+        groupRepo:               repositories.NewGroupRepo(datasource.InstanceMaster()),
+        groupMemberRepo:         repositories.NewGroupMemberRepo(datasource.InstanceMaster()),
+        groupMemberPositionRepo: repositories.NewGroupMemberPositionRepo(datasource.InstanceMaster()),
+        permitRepo:              repositories.NewAppPermitRepo(datasource.InstanceMaster()),
     }
 }
 

web/controllers/api_controller.go

@@ -3,12 +3,12 @@ package controllers
 import (
     "github.com/kataras/iris/v12/mvc"
     "xps/datamodels"
-    "xps/service/paas"
+    "xps/service"
 )
 
 type ApiController struct {
     Base
-    Service paas.ApiService
+    Service service.ApiService
 }
 
 func (c *ApiController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/api_req_controller.go

@@ -4,12 +4,12 @@ import (
     "github.com/kataras/iris/v12/mvc"
     "time"
     "xps/datamodels"
-    "xps/service/paas"
+    "xps/service"
 )
 
 type ApiReqController struct {
     Base
-    Service paas.ApiReqService
+    Service service.ApiReqService
 }
 
 func (c *ApiReqController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/app_cat_controller.go

@@ -3,12 +3,12 @@ package controllers
 import (
     "github.com/kataras/iris/v12/mvc"
     "xps/datamodels"
-    "xps/service/system"
+    "xps/service"
 )
 
 type AppCatController struct {
     Base
-    Service system.AppCatService
+    Service service.AppCatService
 }
 
 func (c *AppCatController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/app_controller.go

@@ -1,14 +1,14 @@
 package controllers
 
 import (
-	"github.com/kataras/iris/v12/mvc"
-	"xps/datamodels"
-	"xps/service/system"
+    "github.com/kataras/iris/v12/mvc"
+    "xps/datamodels"
+    "xps/service"
 )
 
 type AppController struct {
 	Base
-	Service system.AppService
+	Service service.AppService
 }
 
 func (c *AppController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/app_permit_controller.go

@@ -1,14 +1,14 @@
 package controllers
 
 import (
-	"github.com/kataras/iris/v12/mvc"
-	"xps/datamodels"
-	"xps/service/system"
+    "github.com/kataras/iris/v12/mvc"
+    "xps/datamodels"
+    "xps/service"
 )
 
 type AppPermitController struct {
 	Base
-	Service system.AppPermitService
+	Service service.AppPermitService
 }
 
 func (c *AppPermitController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/company_profile_controller.go

@@ -3,12 +3,12 @@ package controllers
 import (
     "github.com/kataras/iris/v12/mvc"
     "xps/datamodels"
-    "xps/service/system"
+    "xps/service"
 )
 
 type CompanyProfileController struct {
     Base
-    Service system.CompanyProfileService
+    Service service.CompanyProfileService
 }
 
 func (c *CompanyProfileController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/db_type_controller.go

@@ -3,12 +3,12 @@ package controllers
 import (
     "github.com/kataras/iris/v12/mvc"
     "xps/datamodels"
-    "xps/service/daas"
+    "xps/service"
 )
 
 type DbTypeController struct {
     Base
-    Service daas.DbTypeService
+    Service service.DbTypeService
 }
 
 func (c *DbTypeController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/ent_cat_controller.go

@@ -1,14 +1,14 @@
 package controllers
 
 import (
-	"github.com/kataras/iris/v12/mvc"
-	"xps/datamodels"
-	"xps/service/system"
+    "github.com/kataras/iris/v12/mvc"
+    "xps/datamodels"
+    "xps/service"
 )
 
 type EntCatController struct {
 	Base
-	Service system.EntCatService
+	Service service.EntCatService
 }
 
 func (c *EntCatController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/group_cat_controller.go

@@ -3,12 +3,12 @@ package controllers
 import (
     "github.com/kataras/iris/v12/mvc"
     "xps/datamodels"
-    "xps/service/system"
+    "xps/service"
 )
 
 type GroupCatController struct {
     Base
-    Service system.GroupCatService
+    Service service.GroupCatService
 }
 
 func (c *GroupCatController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/group_controller.go

@@ -3,12 +3,12 @@ package controllers
 import (
     "github.com/kataras/iris/v12/mvc"
     "xps/datamodels"
-    "xps/service/system"
+    "xps/service"
 )
 
 type GroupController struct {
     Base
-    Service system.GroupService
+    Service service.GroupService
 }
 
 func (c *GroupController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/login_controller.go

@@ -1,13 +1,13 @@
 package controllers
 
 import (
-	"github.com/kataras/iris/v12/mvc"
-	"xps/service/system"
+    "github.com/kataras/iris/v12/mvc"
+    "xps/service"
 )
 
 type LoginController struct {
 	Base
-	Service system.LoginService
+	Service service.LoginService
 }
 
 func (c *LoginController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/model_controller.go

@@ -1,14 +1,14 @@
 package controllers
 
 import (
-	"github.com/kataras/iris/v12/mvc"
-	"xps/datamodels"
-	"xps/service/model"
+    "github.com/kataras/iris/v12/mvc"
+    "xps/datamodels"
+    "xps/service"
 )
 
 type ModelController struct {
 	Base
-	Service model.ModelService
+	Service service.ModelService
 }
 
 func (c *ModelController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/module_controller.go

@@ -3,12 +3,12 @@ package controllers
 import (
     "github.com/kataras/iris/v12/mvc"
     "xps/datamodels"
-    "xps/service/paas"
+    "xps/service"
 )
 
 type ModuleController struct {
     Base
-    Service paas.ModuleService
+    Service service.ModuleService
 }
 
 func (c *ModuleController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/object_attr_controller.go

@@ -1,14 +1,14 @@
 package controllers
 
 import (
-	"github.com/kataras/iris/v12/mvc"
-	"xps/datamodels"
-	"xps/service/model"
+    "github.com/kataras/iris/v12/mvc"
+    "xps/datamodels"
+    "xps/service"
 )
 
 type ObjectAttrController struct {
 	Base
-	Service model.ObjectAttrService
+	Service service.ObjectAttrService
 }
 
 func (c *ObjectAttrController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/object_controller.go

@@ -1,14 +1,14 @@
 package controllers
 
 import (
-	"github.com/kataras/iris/v12/mvc"
-	"xps/service/model"
-	"xps/viewmodels"
+    "github.com/kataras/iris/v12/mvc"
+    "xps/service"
+    "xps/viewmodels"
 )
 
 type ObjectController struct {
 	Base
-	Service model.ObjectService
+	Service service.ObjectService
 }
 
 func (c *ObjectController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/partner_cat_controller.go

@@ -1,14 +1,14 @@
 package controllers
 
 import (
-	"github.com/kataras/iris/v12/mvc"
-	"xps/datamodels"
-	"xps/service/system"
+    "github.com/kataras/iris/v12/mvc"
+    "xps/datamodels"
+    "xps/service"
 )
 
 type PartnerCatController struct {
 	Base
-	Service system.PartnerCatService
+	Service service.PartnerCatService
 }
 
 func (c *PartnerCatController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/position_controller.go

@@ -1,14 +1,14 @@
 package controllers
 
 import (
-	"github.com/kataras/iris/v12/mvc"
-	"xps/datamodels"
-	"xps/service/system"
+    "github.com/kataras/iris/v12/mvc"
+    "xps/datamodels"
+    "xps/service"
 )
 
 type PositionController struct {
 	Base
-	Service system.PositionService
+	Service service.PositionService
 }
 
 func (c *PositionController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/role_controller.go

@@ -1,14 +1,14 @@
 package controllers
 
 import (
-	"github.com/kataras/iris/v12/mvc"
-	"xps/datamodels"
-	"xps/service/system"
+    "github.com/kataras/iris/v12/mvc"
+    "xps/datamodels"
+    "xps/service"
 )
 
 type RoleController struct {
 	Base
-	Service system.RoleService
+	Service service.RoleService
 }
 
 func (c *RoleController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/task_cat_controller.go

@@ -1,14 +1,14 @@
 package controllers
 
 import (
-	"github.com/kataras/iris/v12/mvc"
-	"xps/datamodels"
-	"xps/service/system"
+    "github.com/kataras/iris/v12/mvc"
+    "xps/datamodels"
+    "xps/service"
 )
 
 type TaskCatController struct {
 	Base
-	Service system.TaskCatService
+	Service service.TaskCatService
 }
 
 func (c *TaskCatController) BeforeActivation(b mvc.BeforeActivation) {

web/controllers/user_controller.go

@@ -2,13 +2,13 @@ package controllers
 
 import (
     "github.com/kataras/iris/v12/mvc"
-    "xps/service/system"
+    "xps/service"
     "xps/viewmodels"
 )
 
 type UserController struct {
     Base
-    Service system.UserService
+    Service service.UserService
 }
 
 func (c *UserController) BeforeActivation(b mvc.BeforeActivation) {

web/router/routes.go

@@ -5,10 +5,7 @@ import (
 	"github.com/kataras/iris/v12"
 	"github.com/kataras/iris/v12/mvc"
 	"xps/bootstrap"
-	"xps/service/daas"
-	"xps/service/model"
-	"xps/service/paas"
-	"xps/service/system"
+	"xps/service"
 	"xps/web/controllers"
 	"xps/web/middleware"
 )
@@ -26,7 +23,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 	b.HandleDir("/", "./public")
 
 	// Login
-	loginService := system.NewLoginService()
+	loginService := service.NewLoginService()
 	loginApp := mvc.New(b.Party("/", crs).AllowMethods(iris.MethodOptions))
 	loginApp.Register(loginService)
 	loginApp.Handle(new(controllers.LoginController))
@@ -37,7 +34,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 		sys.Use(middleware.AuthToken)
 
 		// Role
-		roleService := system.NewRoleService()
+		roleService := service.NewRoleService()
 		roleApp := mvc.New(sys.Party("/role"))
 		roleApp.Register(roleService)
 		roleApp.Handle(new(controllers.RoleController))
@@ -48,7 +45,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 	company := b.Party("/company", crs).AllowMethods(iris.MethodOptions)
 	{
 		company.Use(middleware.AuthToken)
-		companyProfileService := system.NewCompanyProfileService()
+		companyProfileService := service.NewCompanyProfileService()
 		companyProfileApp := mvc.New(company.Party("/profile"))
 		companyProfileApp.Register(companyProfileService)
 		companyProfileApp.Handle(new(controllers.CompanyProfileController))
@@ -58,7 +55,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 	group := b.Party("/group", crs).AllowMethods(iris.MethodOptions)
 	{
 		group.Use(middleware.AuthToken)
-		groupService := system.NewGroupService()
+		groupService := service.NewGroupService()
 		groupApp := mvc.New(group.Party(""))
 		groupApp.Register(groupService)
 		groupApp.Handle(new(controllers.GroupController))
@@ -70,7 +67,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 		user.Use(middleware.AuthToken)
 
 		// user
-		userService := system.NewUserService()
+		userService := service.NewUserService()
 		userApp := mvc.New(user.Party(""))
 		userApp.Register(userService)
 		userApp.Handle(new(controllers.UserController))
@@ -80,7 +77,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 	position := b.Party("/position", crs).AllowMethods(iris.MethodOptions)
 	{
 		position.Use(middleware.AuthToken)
-		positionService := system.NewPositionService()
+		positionService := service.NewPositionService()
 		positionApp := mvc.New(position.Party(""))
 		positionApp.Register(positionService)
 		positionApp.Handle(new(controllers.PositionController))
@@ -90,7 +87,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 	groupCat := b.Party("/group", crs).AllowMethods(iris.MethodOptions)
 	{
 		groupCat.Use(middleware.AuthToken)
-		groupCatService := system.NewGroupCatService()
+		groupCatService := service.NewGroupCatService()
 		groupCatApp := mvc.New(groupCat.Party("/cat"))
 		groupCatApp.Register(groupCatService)
 		groupCatApp.Handle(new(controllers.GroupCatController))
@@ -100,17 +97,17 @@ func Configure(b *bootstrap.Bootstrapper) {
 	app := b.Party("/app", crs).AllowMethods(iris.MethodOptions)
 	{
 		app.Use(middleware.AuthToken)
-		appService := system.NewAppService()
+		appService := service.NewAppService()
 		appApp := mvc.New(app.Party(""))
 		appApp.Register(appService)
 		appApp.Handle(new(controllers.AppController))
 
-		appCatService := system.NewAppCatService()
+		appCatService := service.NewAppCatService()
 		appCatApp := mvc.New(app.Party("/cat"))
 		appCatApp.Register(appCatService)
 		appCatApp.Handle(new(controllers.AppCatController))
 		
-		appPermitService := system.NewAppPermitService()
+		appPermitService := service.NewAppPermitService()
 		appPermitApp := mvc.New(app.Party("/permit"))
 		appPermitApp.Register(appPermitService)
 		appPermitApp.Handle(new(controllers.AppPermitController))
@@ -120,7 +117,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 	taskCat := b.Party("/task", crs).AllowMethods(iris.MethodOptions)
 	{
 		taskCat.Use(middleware.AuthToken)
-		taskCatService := system.NewTaskCatService()
+		taskCatService := service.NewTaskCatService()
 		taskCatApp := mvc.New(taskCat.Party("/cat"))
 		taskCatApp.Register(taskCatService)
 		taskCatApp.Handle(new(controllers.TaskCatController))
@@ -130,7 +127,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 	entCat := b.Party("/ent", crs).AllowMethods(iris.MethodOptions)
 	{
 		entCat.Use(middleware.AuthToken)
-		entCatService := system.NewEntCatService()
+		entCatService := service.NewEntCatService()
 		entCatApp := mvc.New(entCat.Party("/cat"))
 		entCatApp.Register(entCatService)
 		entCatApp.Handle(new(controllers.EntCatController))
@@ -140,7 +137,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 	partnerCat := b.Party("/partner", crs).AllowMethods(iris.MethodOptions)
 	{
 		partnerCat.Use(middleware.AuthToken)
-		partnerCatService := system.NewPartnerCatService()
+		partnerCatService := service.NewPartnerCatService()
 		partnerCatApp := mvc.New(partnerCat.Party("/cat"))
 		partnerCatApp.Register(partnerCatService)
 		partnerCatApp.Handle(new(controllers.PartnerCatController))
@@ -150,17 +147,17 @@ func Configure(b *bootstrap.Bootstrapper) {
 	modelParty := b.Party("/model", crs).AllowMethods(iris.MethodOptions)
 	{
 		modelParty.Use(middleware.AuthToken)
-		modelService := model.NewModelService()
+		modelService := service.NewModelService()
 		modelApp := mvc.New(modelParty.Party(""))
 		modelApp.Register(modelService)
 		modelApp.Handle(new(controllers.ModelController))
 
-		objectService := model.NewObjectService()
+		objectService := service.NewObjectService()
 		objectApp := mvc.New(modelParty.Party("/object"))
 		objectApp.Register(objectService)
 		objectApp.Handle(new(controllers.ObjectController))
 
-		objectAttrService := model.NewObjectAttrService()
+		objectAttrService := service.NewObjectAttrService()
 		objectAttrApp := mvc.New(modelParty.Party("/object/attribute"))
 		objectAttrApp.Register(objectAttrService)
 		objectAttrApp.Handle(new(controllers.ObjectAttrController))
@@ -170,7 +167,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 	daasParty := b.Party("/daas", crs).AllowMethods(iris.MethodOptions)
 	{
 		daasParty.Use(middleware.AuthToken)
-		dbTypeService := daas.NewDbTypeService()
+		dbTypeService := service.NewDbTypeService()
 		dbTypeApp := mvc.New(daasParty.Party("/dbType"))
 		dbTypeApp.Register(dbTypeService)
 		dbTypeApp.Handle(new(controllers.DbTypeController))
@@ -180,17 +177,17 @@ func Configure(b *bootstrap.Bootstrapper) {
 	paasParty := b.Party("/paas", crs).AllowMethods(iris.MethodOptions)
 	{
 		paasParty.Use(middleware.AuthToken)
-		moduleService := paas.NewModuleService()
+		moduleService := service.NewModuleService()
 		moduleApp := mvc.New(paasParty.Party("/module"))
 		moduleApp.Register(moduleService)
 		moduleApp.Handle(new(controllers.ModuleController))
 		
-		apiService := paas.NewApiService()
+		apiService := service.NewApiService()
 		apiApp := mvc.New(paasParty.Party("/api"))
 		apiApp.Register(apiService)
 		apiApp.Handle(new(controllers.ApiController))
 		
-		reqService := paas.NewApiReqService()
+		reqService := service.NewApiReqService()
 		reqApp := mvc.New(paasParty.Party("/api/request"))
 		reqApp.Register(reqService)
 		reqApp.Handle(new(controllers.ApiReqController))