获取验证码时校验账号

controllers/sys_admin.go

@@ -520,10 +520,12 @@ func (this *SysAdminController) Add() {
 	}
 
 	// 同步用户缓存
-	var syncData system.SyncAdminData
-	syncData.Source = utils.SOURCE_ETA_FLAG
-	syncData.AdminName = admin.AdminName
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncAdminData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.AdminName = admin.AdminName
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
+	}
 
 	err = services.UpdateResearcherTagGroup(admin.AdminId, req.ResearchGroupIds)
 	if err != nil {
@@ -739,10 +741,12 @@ func (this *SysAdminController) Edit() {
 	}
 
 	// 同步用户缓存
-	var syncData system.SyncAdminData
-	syncData.Source = utils.SOURCE_ETA_FLAG
-	syncData.AdminName = adminInfo.AdminName
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncAdminData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.AdminName = adminInfo.AdminName
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
+	}
 
 	// 用户登出
 	logOutSystemUser(adminInfo.AdminId)
@@ -811,10 +815,12 @@ func (this *SysAdminController) EditEnabled() {
 	}
 
 	// 同步用户缓存
-	var syncData system.SyncAdminData
-	syncData.Source = utils.SOURCE_ETA_FLAG
-	syncData.AdminName = adminItem.AdminName
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncAdminData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.AdminName = adminItem.AdminName
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
+	}
 
 	//用户被禁用的情况下，需要将他对应的token给过期
 	if adminItem.Enabled == 1 && req.Enabled == 0 {
@@ -873,10 +879,12 @@ func (this *SysAdminController) Delete() {
 	}
 
 	// 同步用户缓存
-	var syncData system.SyncAdminData
-	syncData.Source = utils.SOURCE_ETA_FLAG
-	syncData.AdminName = adminInfo.AdminName
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncAdminData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.AdminName = adminInfo.AdminName
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
+	}
 
 	// 删除手工数据关联用户
 	{
@@ -1114,10 +1122,12 @@ func (this *SysAdminController) Move() {
 	}
 
 	// 同步用户缓存
-	var syncData system.SyncAdminData
-	syncData.Source = utils.SOURCE_ETA_FLAG
-	syncData.AdminName = adminInfo.AdminName
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncAdminData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.AdminName = adminInfo.AdminName
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
+	}
 
 	// 清除系统用户列表缓存key
 	_ = utils.Rc.Delete(utils.CACHE_KEY_ADMIN)
@@ -1199,10 +1209,12 @@ func (this *SysAdminController) ResetPass() {
 	}
 
 	// 同步用户缓存
-	var syncData system.SyncAdminData
-	syncData.Source = utils.SOURCE_ETA_FLAG
-	syncData.AdminName = adminInfo.AdminName
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncAdminData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.AdminName = adminInfo.AdminName
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
+	}
 
 	// 清除系统用户列表缓存key
 	_ = utils.Rc.Delete(utils.CACHE_KEY_ADMIN)

controllers/sys_department.go

@@ -56,10 +56,12 @@ func (this *SysDepartmentController) Add() {
 	}
 
 	// 同步部门缓存
-	var syncData system.SyncDepartmentData
-	syncData.Source = utils.SOURCE_ETA_FLAG
-	syncData.DepartmentId = int(departmentId)
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_DEPARTMENT, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncDepartmentData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.DepartmentId = int(departmentId)
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_DEPARTMENT, syncData)
+	}
 
 	br.Ret = 200
 	br.Success = true
@@ -113,10 +115,12 @@ func (this *SysDepartmentController) Edit() {
 	}
 
 	// 同步部门缓存
-	var syncData system.SyncDepartmentData
-	syncData.Source = utils.SOURCE_ETA_FLAG
-	syncData.DepartmentId = req.DepartmentId
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_DEPARTMENT, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncDepartmentData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.DepartmentId = req.DepartmentId
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_DEPARTMENT, syncData)
+	}
 
 	br.Ret = 200
 	br.Success = true
@@ -154,10 +158,12 @@ func (this *SysDepartmentController) Delete() {
 	}
 
 	// 同步部门缓存
-	var syncData system.SyncDepartmentData
-	syncData.Source = utils.SOURCE_ETA_FLAG
-	syncData.DepartmentId = req.DepartmentId
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_DEPARTMENT, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncDepartmentData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.DepartmentId = req.DepartmentId
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_DEPARTMENT, syncData)
+	}
 
 	br.Ret = 200
 	br.Success = true

controllers/sys_group.go

@@ -62,10 +62,12 @@ func (this *SysGroupController) Add() {
 			}
 
 			// 同步分组缓存
-			var syncData system.SyncGroupData
-			syncData.Source = utils.SOURCE_ETA_FLAG
-			syncData.GroupId = int(groupId)
-			_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
+			if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+				var syncData system.SyncGroupData
+				syncData.Source = utils.SOURCE_ETA_FLAG
+				syncData.GroupId = int(groupId)
+				_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
+			}
 		}
 	}
 	br.Ret = 200
@@ -120,10 +122,12 @@ func (this *SysGroupController) Edit() {
 	}
 
 	// 同步分组缓存
-	var syncData system.SyncGroupData
-	syncData.Source = utils.SOURCE_ETA_FLAG
-	syncData.GroupId = req.GroupId
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncGroupData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.GroupId = req.GroupId
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
+	}
 
 	br.Ret = 200
 	br.Success = true
@@ -167,10 +171,12 @@ func (this *SysGroupController) Delete() {
 	}
 
 	// 同步分组缓存
-	var syncData system.SyncGroupData
-	syncData.Source = utils.SOURCE_ETA_FLAG
-	syncData.GroupId = req.GroupId
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncGroupData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.GroupId = req.GroupId
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
+	}
 
 	br.Ret = 200
 	br.Success = true
@@ -244,11 +250,13 @@ func (this *SysGroupController) SetSort() {
 			}
 
 			// 同步分组缓存
-			for _, g := range updateArr {
-				var syncData system.SyncGroupData
-				syncData.Source = utils.SOURCE_ETA_FLAG
-				syncData.GroupId = g.GroupId
-				_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
+			if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+				for _, g := range updateArr {
+					var syncData system.SyncGroupData
+					syncData.Source = utils.SOURCE_ETA_FLAG
+					syncData.GroupId = g.GroupId
+					_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
+				}
 			}
 		}
 	}

controllers/sys_role.go

@@ -2,12 +2,12 @@ package controllers
 
 import (
 	"encoding/json"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"eta/eta_api/models"
 	"eta/eta_api/models/system"
 	"eta/eta_api/services"
 	"eta/eta_api/utils"
+	"fmt"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"strconv"
 	"strings"
 	"time"
@@ -63,10 +63,12 @@ func (this *SysRoleController) Add() {
 	}
 
 	// 同步角色缓存
-	var syncData system.SyncRoleData
-	syncData.Source = utils.SOURCE_ETA_FLAG
-	syncData.RoleId = int(roleId)
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_ROLE, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncRoleData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.RoleId = int(roleId)
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_ROLE, syncData)
+	}
 
 	br.Ret = 200
 	br.Success = true
@@ -121,10 +123,12 @@ func (this *SysRoleController) Edit() {
 	}
 
 	// 同步角色缓存
-	var syncData system.SyncRoleData
-	syncData.Source = utils.SOURCE_ETA_FLAG
-	syncData.RoleId = item.RoleId
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_ROLE, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncRoleData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.RoleId = item.RoleId
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_ROLE, syncData)
+	}
 
 	br.Ret = 200
 	br.Success = true
@@ -175,10 +179,12 @@ func (this *SysRoleController) Delete() {
 	}
 
 	// 同步角色缓存
-	var syncData system.SyncRoleData
-	syncData.Source = utils.SOURCE_ETA_FLAG
-	syncData.RoleId = role.RoleId
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_ROLE, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncRoleData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.RoleId = role.RoleId
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_ROLE, syncData)
+	}
 
 	br.Ret = 200
 	br.Success = true

controllers/sys_team.go

@@ -63,10 +63,12 @@ func (this *SysTeamController) Add() {
 			}
 
 			// 同步分组缓存
-			var syncData system.SyncGroupData
-			syncData.Source = utils.SOURCE_ETA_FLAG
-			syncData.GroupId = int(groupId)
-			_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
+			if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+				var syncData system.SyncGroupData
+				syncData.Source = utils.SOURCE_ETA_FLAG
+				syncData.GroupId = int(groupId)
+				_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
+			}
 		}
 	}
 	br.Ret = 200
@@ -121,10 +123,12 @@ func (this *SysTeamController) Edit() {
 	}
 
 	// 同步分组缓存
-	var syncData system.SyncGroupData
-	syncData.Source = utils.SOURCE_ETA_FLAG
-	syncData.GroupId = item.GroupId
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncGroupData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.GroupId = item.GroupId
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
+	}
 
 	br.Ret = 200
 	br.Success = true
@@ -168,10 +172,12 @@ func (this *SysTeamController) Delete() {
 	}
 
 	// 同步分组缓存
-	var syncData system.SyncGroupData
-	syncData.Source = utils.SOURCE_ETA_FLAG
-	syncData.GroupId = req.TeamId
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncGroupData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.GroupId = req.TeamId
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_GROUP, syncData)
+	}
 
 	br.Ret = 200
 	br.Success = true

controllers/user_login.go

@@ -143,10 +143,40 @@ func (this *UserLoginController) GetVerifyCode() {
 			br.Msg = "请输入手机号"
 			return
 		}
+		if req.TelAreaCode == "86" && !utils.ValidateMobileFormatat(req.Mobile) {
+			br.Msg = "您的手机号输入有误, 请检查"
+			return
+		}
+		_, e := system.GetSysUserByMobile(req.Mobile)
+		if e != nil {
+			if e.Error() == utils.ErrNoRow() {
+				br.Msg = "您的手机号未绑定账号, 请检查"
+				return
+			}
+			br.Msg = "您的手机号未绑定账号, 请检查"
+			br.ErrMsg = "手机号获取用户失败, Err:" + e.Error()
+			return
+		}
 	}
-	if req.VerifyType == 2 && req.Email == "" {
-		br.Msg = "请输入邮箱"
-		return
+	if req.VerifyType == 2 {
+		if req.Email == "" {
+			br.Msg = "请输入邮箱"
+			return
+		}
+		if !utils.ValidateEmailFormatat(req.Email) {
+			br.Msg = "您的邮箱输入有误, 请检查"
+			return
+		}
+		_, e := system.GetSysUserByEmail(req.Email)
+		if e != nil {
+			if e.Error() == utils.ErrNoRow() {
+				br.Msg = "您的邮箱未绑定账号, 请检查"
+				return
+			}
+			br.Msg = "您的邮箱未绑定账号, 请检查"
+			br.ErrMsg = "邮箱获取用户失败, Err:" + e.Error()
+			return
+		}
 	}
 	if req.Source != 3 {
 		store := services.CaptchaRedis{}
@@ -845,10 +875,12 @@ func (this *UserLoginController) ForgetResetPass() {
 	_ = utils.Rc.Delete(successKey)
 
 	// 同步ETA用户缓存
-	var syncData system.SyncAdminData
-	syncData.Source = utils.SOURCE_CRM_FLAG
-	syncData.AdminName = sysUser.AdminName
-	_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
+	if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
+		var syncData system.SyncAdminData
+		syncData.Source = utils.SOURCE_ETA_FLAG
+		syncData.AdminName = sysUser.AdminName
+		_ = utils.Rc.LPush(utils.CACHE_SYNC_ADMIN, syncData)
+	}
 
 	br.Data = true
 	br.Ret = 200

utils/constants.go

@@ -296,7 +296,6 @@ const (
 
 // 系统来源
 const (
-	SOURCE_CRM_FLAG = 1
 	SOURCE_ETA_FLAG = 2
 )