1

dao/project_account_dao.go

@@ -55,6 +55,19 @@ func (d *ProjectAccountDao) GetAccount(account string) *models.CmProjectAccount
 	}
 }
 
+func (d *ProjectAccountDao) GetAccountProjectId(account string, projectId int) *models.CmProjectAccount {
+	data := &models.CmProjectAccount{}
+	ok, err := d.engine.
+		Where("account = ? and project_id = ?", account, projectId).
+		Get(data)
+	if ok && err == nil {
+		return data
+	} else {
+		data.Id = 0
+		return data
+	}
+}
+
 //id获得数据
 func (d *ProjectAccountDao) Get(id int, projectId int) *models.CmProjectAccount {
 	data := &models.CmProjectAccount{Id: id, ProjectId: projectId}

services/login_service.go

@@ -76,7 +76,7 @@ func (s *loginService) ValidProjectAccount(loginData viewmodels.Login, writer ht
 	}
 
 	// 2.验证登陆-临时
-	projectAccountInfo := s.projectAccountDao.GetAccount(loginData.Account)
+	projectAccountInfo := s.projectAccountDao.GetAccountProjectId(loginData.Account, projectInfo.Id)
 	if projectAccountInfo.Id == 0 {
 		return nil, errors.New("未找到该账号")
 	}

services/project_account_service.go

@@ -294,9 +294,10 @@ func (s *projectAccountService) Search(name string, projectId int) []viewmodels.
 func (s *projectAccountService) AddBs(viewAccount viewmodels.ProjectAccount, projectId int) error {
 
 	// 验证该项目下是否有同名账号
-	accountValid := s.dao.GetAccount(viewAccount.Account)
+	// accountValid := s.dao.GetAccount(viewAccount.Account)
+	accountValid := s.dao.GetAccountProjectId(viewAccount.Account, projectId)
 	if accountValid.Id != 0 {
-		return errors.New("已存在相同的账号")
+		return errors.New("项目下已存在相同的账号")
 	}
 
 	account := models.CmProjectAccount{}

web/routes/routes.go

@@ -35,6 +35,7 @@ func Configure(b *bootstrap.Bootstrapper) {
 	VersionService := services.NewVersionService()
 	backstageService := services.NewBackstageService()
 	managerService := services.NewManagerService()
+	groupService := services.NewGroupService()
 
 	//CSRF相关
 	b.Use(middleware.SetCsrf)
@@ -230,4 +231,9 @@ func Configure(b *bootstrap.Bootstrapper) {
 	managerCM.Register(managerService)
 	managerCM.Router.Use(middleware.SessionsBackstageAuth)
 	managerCM.Handle(new(backstage.ManagerBs))
+
+	groupCM := mvc.New(b.Party("/api/backstage/group"))
+	groupCM.Register(groupService)
+	groupCM.Router.Use(middleware.SessionsBackstageAuth)
+	groupCM.Handle(new(backstage.GroupBs))
 }