Merge branch 'master' of http://git.shengws.com/xmg123/scrm

conf/app.conf

@@ -82,7 +82,7 @@ redisdb = 0
 
 [dev]
 httpdomain = http://api.test1.sgjyun.com
-sso_domain = https://testsso.sgjyun.com
+sso_domain = http://testsso.sgjyun.com
 front_end_domain = "http://test1.sgjyun.com/#"
 
 openwechattoken = dwqofqon2e12en2o

controllers/login/login_controller.go

@@ -3,11 +3,13 @@ package login
 import (
 	base_ctl "SCRM/controllers"
 	"SCRM/enums"
+	"SCRM/models"
 	"SCRM/service/admin_service"
-	"SCRM/service/org_service"
 	"SCRM/utils"
 	"fmt"
 	"net/url"
+	"strconv"
+	"strings"
 
 	"github.com/astaxie/beego"
 )
@@ -72,18 +74,18 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 		ip := utils.GetIP(this.Ctx.Request)
 		sessionID := this.Ctx.GetCookie("s")
 		utils.TraceLog("cookie session id: %v %v", ip, sessionID)
-		adminUserInfo, err, errCode := admin_service.VerifyToken(token, ip, sessionID)
+		adminUserInfo, err, _ := admin_service.VerifyToken(token, ip, sessionID)
 		if err != nil {
-			if errCode == 903 { // 未创建应用
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNeverCreateTypeApp)
-
-			} else if errCode == 904 { // 联系超管来开通
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeContactSuperAdminCreateTypeApp)
-
-			} else {
-				utils.ErrorLog("令牌验证失败：%v", err)
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInvalidToken)
-			}
+			//if errCode == 903 { // 未创建应用
+			//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNeverCreateTypeApp)
+			//
+			//} else if errCode == 904 { // 联系超管来开通
+			//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeContactSuperAdminCreateTypeApp)
+			//
+			//} else {
+			utils.ErrorLog("令牌验证失败：%v", err)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInvalidToken)
+			//}
 			return
 
 		} else {
@@ -112,41 +114,54 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 				"district":       curOrg.District,
 				"address":        curOrg.Address,
 			}
-			curAppUrlfors := adminUserInfo.AppUrlfors[adminUserInfo.CurrentAppId]
 
-			subscibe := adminUserInfo.Subscibes[adminUserInfo.CurrentOrgId]
-			if err := org_service.GetOrgSubscibeState(subscibe); err != nil {
-				this.ErrorLog("没有机构订阅信息，数据有误")
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
+			var pruviews []*models.Purview
+			var curAppUrlfors []string
 
-			orgApps := adminUserInfo.OrgApps[curOrg.Id]
-			didRegistedForXT := false
-			didRegistedForMall := false
-			didRegistedForCDM := false
-			for _, app := range orgApps {
-				if app.AppType == 3 && app.OpenStatus == 1 {
-					didRegistedForXT = true
-				}
-				if app.AppType == 4 && app.OpenStatus == 1 {
-					didRegistedForCDM = true
+			if len(curAppUrlfors) == 0 {
+				if adminUser.Id == curOrg.Creator { //超级管理员
+					urlfors, _, _ := admin_service.GetSuperAdminUsersPurviewTreeAndUrlfors(6)
+					curAppUrlfors = urlfors
 				}
-				if app.AppType == 5 && app.OpenStatus == 1 {
-					didRegistedForMall = true
+
+			} else {
+				appRole, _ := admin_service.FindAdminUserIDA(appRole.Id)
+				if appRole.Id > 0 && len(appRole.RoleIds) > 0 {
+					role_arr := strings.Split(appRole.RoleIds, ",")
+					var ids string
+					for _, role_id := range role_arr {
+						id, _ := strconv.ParseInt(role_id, 10, 64)
+						purview_ids, _ := admin_service.GetRolePurviewIds(id)
+						if len(ids) == 0 {
+							ids = purview_ids
+						} else {
+							ids = ids + "," + purview_ids
+						}
+					}
+					if len(ids) != 0 {
+						pruviews, _ = admin_service.GetPurviewById(ids)
+						for _, item := range pruviews {
+							if item.Module == 3 && item.Parentid > 0 {
+								fmt.Println(item.Urlfor)
+								curAppUrlfors = append(curAppUrlfors, item.Urlfor)
+							}
+						}
+					} else {
+						curAppUrlfors = append(curAppUrlfors, "")
+					}
+				} else {
+					curAppUrlfors = append(curAppUrlfors, "")
 				}
 			}
 
+			subscibe, _ := admin_service.GetOrgSubscibe(adminUserInfo.CurrentOrgId)
 			this.ServeSuccessJSON(map[string]interface{}{
-				"user":            userInfo,
-				"org":             org,
-				"urlfors":         curAppUrlfors,
-				"current_org_id":  adminUserInfo.CurrentOrgId,
-				"current_app_id":  adminUserInfo.CurrentAppId,
-				"subscibe":        subscibe,
-				"xt_role_exist":   didRegistedForXT,
-				"cdm_role_exist":  didRegistedForCDM,
-				"mall_role_exist": didRegistedForMall,
+				"user":           userInfo,
+				"org":            org,
+				"urlfors":        curAppUrlfors,
+				"current_org_id": adminUserInfo.CurrentOrgId,
+				"current_app_id": adminUserInfo.CurrentAppId,
+				"subscibe":       subscibe,
 			})
 			return
 		}

models/role_models.go

@@ -31,6 +31,10 @@ type App_Role struct {
 	Status      int8   `json:"status"`                              // 状态 0.无效 1.有效
 	CreateTime  int64  `gorm:"column:ctime" json:"ctime"`           // 创建时间
 	ModifyTime  int64  `gorm:"column:mtime" json:"mtime"`           // 修改时间
+	RoleIds     string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
+	Message     string `gorm:"column:message" json:"message" form:"message"`
+	Sex         int64  `gorm:"column:sex" json:"sex" form:"sex"`
+	Birthday    int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
 }
 
 func (App_Role) TableName() string {

service/admin_service/verify_login_token_service.go

@@ -2,6 +2,8 @@ package admin_service
 
 import (
 	"encoding/json"
+	"fmt"
+	"github.com/jinzhu/gorm"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -144,9 +146,9 @@ func processAdminUserInfo(data map[string]interface{}) *AdminUserInfo {
 	currentOrgId, currentAppId := processCurrentOrgIDAndAppID(data)
 	orgIds := processOrgIds(data)
 	orgs := processOrgs(data)
-	//orgAppIds := processOrgAppIds(data)
+	orgAppIds := processOrgAppIds(data)
 	orgApps := processOrgApps(data)
-	app2OrgIds := processApp2OrgIds(data)
+	//app2OrgIds := processApp2OrgIds(data)
 	appRoles := processAppRoles(data)
 	appPurviews := processPurviews(data)
 	appUrlfors := processPurviewUrlfors(data)
@@ -157,9 +159,9 @@ func processAdminUserInfo(data map[string]interface{}) *AdminUserInfo {
 		CurrentAppId: currentAppId,
 		OrgIds:       orgIds,
 		Orgs:         orgs,
-		//OrgAppIds:    orgAppIds,
-		OrgApps:     orgApps,
-		App2OrgIds:  app2OrgIds,
+		OrgAppIds:    orgAppIds,
+		OrgApps:      orgApps,
+		//App2OrgIds:   app2OrgIds,
 		AppRoles:    appRoles,
 		AppPurviews: appPurviews,
 		AppUrlfors:  appUrlfors,
@@ -381,3 +383,86 @@ func ModifyPassword(adminID int64, password string) error {
 	err := service.UserWriteDB().Model(&models.AdminUser{}).Where("id = ? AND status = 1", adminID).Updates(map[string]interface{}{"password": password, "mtime": time.Now().Unix()}).Error
 	return err
 }
+
+func GetPurviewById(ids string) ([]*models.Purview, error) {
+	var originPurviews []*models.Purview
+	getPurviewErr := service.UserReadDB().Model(&models.Purview{}).Where(fmt.Sprintf("id in (%v) and status = 1", ids)).Order("listorder asc").Order("id asc").Find(&originPurviews).Error
+	return originPurviews, getPurviewErr
+}
+
+func FindAdminUserIDA(id int64) (role models.App_Role, err error) {
+	err = service.UserReadDB().Model(&models.App_Role{}).Where("id = ?", id).First(&role).Error
+	return
+}
+
+func GetSuperAdminUsersPurviewTreeAndUrlfors(appType int) ([]string, []*models.Purview, error) {
+	originPurviews, getPurviewErr := getAllOriginPurviews(appType)
+	if getPurviewErr != nil {
+		return nil, nil, getPurviewErr
+	}
+	urlfors, processedPurviews := getUrlforsAndProcessPurviews2Tree(originPurviews)
+	return urlfors, processedPurviews, nil
+}
+
+// 加工这些规则：树形化；以及从中取出不为空的 urlfor
+// 正确结果的前提是 originPurviews 以 parentid asc 排好序了的
+func getUrlforsAndProcessPurviews2Tree(originPurviews []*models.Purview) ([]string, []*models.Purview) {
+	processedPurviews := make([]*models.Purview, 0)
+	pid_childs := make(map[int][]*models.Purview)
+	urlfors := make([]string, 0, len(originPurviews))
+	for _, purview := range originPurviews {
+		if len(purview.Urlfor) != 0 {
+			urlfors = append(urlfors, purview.Urlfor)
+		}
+
+		// warning：下面这个算法只适用最多两层树形结构的菜单，对于两层以上的会丢失掉第三层及其以下的节点
+		// 因为取出 originPurviews 的时候已经排过序了，所以顶级节点肯定最先处理，不需要担心子节点比父节点先处理
+		if purview.Parentid == 0 {
+			processedPurviews = append(processedPurviews, purview)
+		} else {
+			childs := pid_childs[int(purview.Parentid)]
+			if pid_childs[int(purview.Parentid)] == nil {
+				childs = make([]*models.Purview, 0)
+			}
+			childs = append(childs, purview)
+			pid_childs[int(purview.Parentid)] = childs
+		}
+	}
+
+	for _, proPurview := range processedPurviews {
+		proPurview.Childs = pid_childs[int(proPurview.Id)]
+	}
+
+	return urlfors, processedPurviews
+}
+
+func getAllOriginPurviews(appType int) ([]*models.Purview, error) {
+	var purviews []*models.Purview
+	getPurviewErr := service.UserReadDB().Model(models.Purview{}).Where("module = ? AND status = 1", appType).Order("listorder asc").Order("id asc").Find(&purviews).Error
+	if getPurviewErr != nil {
+		if getPurviewErr == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, getPurviewErr
+		}
+	}
+	return purviews, nil
+}
+
+func GetRolePurviewIds(roleID int64) (string, error) {
+	var rolePurview models.RolePurview
+	err := service.UserReadDB().Where("role_id = ?", roleID).First(&rolePurview).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return "", nil
+		} else {
+			return "", err
+		}
+	}
+	return rolePurview.PurviewIds, nil
+}
+
+func GetOrgSubscibe(org_id int64) (subscibe models.ServeSubscibe, err error) {
+	err = service.UserReadDB().Model(&models.ServeSubscibe{}).Where("org_id = ? AND status = 1", org_id).First(&subscibe).Error
+	return
+}