|  | @@ -8,6 +8,7 @@ package services
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  import (
 | 
	
		
			
				|  |  |  	"errors"
 | 
	
		
			
				|  |  | +	"fmt"
 | 
	
		
			
				|  |  |  	"log"
 | 
	
		
			
				|  |  |  	"net/http"
 | 
	
		
			
				|  |  |  	"net/url"
 | 
	
	
		
			
				|  | @@ -194,7 +195,10 @@ func (s *backstageService) ValidCldStaff(loginData viewmodels.StaffCld, writer h
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	// 1.cld账号写入管理员表
 | 
	
		
			
				|  |  |  	managerData := s.managerDao.GetUserName(loginData.StaffName)
 | 
	
		
			
				|  |  | -	result := &lib.Result{}
 | 
	
		
			
				|  |  | +	// result := &lib.Result{}
 | 
	
		
			
				|  |  | +	// 1.验证CLD账号密码
 | 
	
		
			
				|  |  | +	cld := lib.NewCld()
 | 
	
		
			
				|  |  | +	result, err := cld.LoginValid(loginData)
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	if managerData.Id != 0 && managerData.GroupId == 1 {
 | 
	
		
			
				|  |  |  		result.Data.UserName = "admin"
 | 
	
	
		
			
				|  | @@ -206,16 +210,14 @@ func (s *backstageService) ValidCldStaff(loginData viewmodels.StaffCld, writer h
 | 
	
		
			
				|  |  |  		}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	} else {
 | 
	
		
			
				|  |  | -		// 1.验证CLD账号密码
 | 
	
		
			
				|  |  | -		cld := lib.NewCld()
 | 
	
		
			
				|  |  | -		result, err := cld.LoginValid(loginData)
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  		if err != nil {
 | 
	
		
			
				|  |  |  			return nil, err
 | 
	
		
			
				|  |  |  		}
 | 
	
		
			
				|  |  |  		if result.Code != 0 {
 | 
	
		
			
				|  |  |  			return nil, errors.New(result.Msg)
 | 
	
		
			
				|  |  |  		}
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | +		fmt.Println(result)
 | 
	
		
			
				|  |  |  		if managerData.Id == 0 {
 | 
	
		
			
				|  |  |  			// 写入管理表
 | 
	
		
			
				|  |  |  			manager := &models.CmManager{}
 |