Merge branch 'cygx_3.3.1' of hongze/hongze_cygx into master

controllers/activity.go

@@ -1670,6 +1670,7 @@ func (this *ActivityCoAntroller) LabelList() {
 	pageSize = 16
 	//startSize = utils.StartIndex(currentIndex, pageSize)
 	var condition string
+	var sortTime string
 	var pars []interface{}
 	//活动可见限制
 	var sqlExport string
@@ -1703,14 +1704,15 @@ func (this *ActivityCoAntroller) LabelList() {
 	//conditionLaable := condition
 	//主题
 	if label != "" {
-
-		listAll, errList := models.GetActivityLabelListAll(condition, pars, startSize, 32)
+		sortTime = ` timesort DESC `
+		listAll, errList := models.GetActivityLabelListAll(condition, sortTime, pars, startSize, 32)
 		if errList != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败，Err:" + errList.Error()
 			return
 		}
-		list1, errList := models.GetActivityLabelListAll(condition, pars, startSize, 16)
+		condition += ` AND art.active_state = 1 `
+		list1, errList := models.GetActivityLabelListAll(condition, sortTime, pars, startSize, 16)
 		if errList != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败，Err:" + errList.Error()
@@ -1773,7 +1775,8 @@ func (this *ActivityCoAntroller) LabelList() {
 		conditionOr += `	OR ( art.is_limit_people = 0 	  ` + condition + `) `
 		condition += `AND art.is_limit_people = 1 ` + permissionSqlStr + sqlExport + conditionOr
 	}
-	list, errList := models.GetActivityLabelListAll(condition, pars, startSize, pageSize)
+	sortTime = ` mintimesort ASC `
+	list, errList := models.GetActivityLabelListAll(condition, sortTime, pars, startSize, pageSize)
 	if errList != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + errList.Error()

controllers/user.go

@@ -1186,7 +1186,7 @@ func (this *UserController) WhiteUser() {
 	}
 	keypd := this.GetString("Keypd")
 
-	if keypd != "888" {
+	if keypd != "888wqrerqesdfdsfsdwdsfasdqwerqwer" {
 		br.Msg = "密码错误"
 		return
 	}

models/activity.go

@@ -426,14 +426,14 @@ type CygxActivityLabelList struct {
 }
 
 //主题列表
-func GetActivityLabelListAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityLabelList, err error) {
+func GetActivityLabelListAll(condition, sortTime string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityLabelList, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT	label, 	MAX( art.activity_time ) AS timesort 
+	sql := `SELECT	label, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort 
 		FROM cygx_activity as art WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` GROUP BY art.label ORDER BY  timesort DESC ,art.activity_id DESC  LIMIT ?,? `
+	sql += ` GROUP BY art.label ORDER BY ` + sortTime + ` ,art.activity_id DESC  LIMIT ?,? `
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }

services/user.go

@@ -738,7 +738,7 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	title := time.Now().Format("2006-01-02") + "新增白名单用户"
 	content := time.Now().Format("2006-01-02") + "新增白名单用户"
 	fileName := downLoadnFilePath
-	go utils.SendEmailHaveFile(title, content, fileName, "cxzhang@hzinsights.com;tshen@hzinsights.com")
+	go utils.SendEmailHaveFile(title, content, fileName, utils.EmaiWhiteUserList)
 	//go utils.SendEmailHaveFile(title, content, fileName, "cxzhang@hzinsights.com")
 	//go utils.SendEmailHaveFile(title, content, fileName, "tshen@hzinsights.com")
 	time.Sleep(time.Duration(2) * time.Second) //延迟两秒，避免过多活动的时候邮件发送没有内容
@@ -854,7 +854,7 @@ func SendEmailUserWhiteListChange(cont context.Context) (err error) {
 	title = time.Now().Format("2006-01-02") + "删除白名单用户"
 	content = time.Now().Format("2006-01-02") + "删除白名单用户"
 	fileName = downLoadnFilePaths
-	go utils.SendEmailHaveFile(title, content, fileName, "cxzhang@hzinsights.com;tshen@hzinsights.com")
+	go utils.SendEmailHaveFile(title, content, fileName, utils.EmaiWhiteUserList)
 	//go utils.SendEmailHaveFile(title, content, fileName, "cxzhang@hzinsights.com")
 	time.Sleep(time.Duration(2) * time.Second) //延迟两秒，避免过多活动的时候邮件发送没有内容
 	defer func() {

utils/config.go

@@ -39,14 +39,15 @@ var (
 )
 
 var (
-	IndexName        string
-	OnlineTime       string
-	SummaryArticleId int
-	EmailTechnology  string //科技行业专家邮箱
-	EmailMedicine    string //医药行业专家邮箱
-	EmailConsumption string //消费行业专家邮箱
-	EmailZhizao      string //智造行业专家邮箱
-	EmailStrategy    string //策略行业专家邮箱
+	IndexName         string
+	OnlineTime        string
+	SummaryArticleId  int
+	EmailTechnology   string //科技行业专家邮箱
+	EmailMedicine     string //医药行业专家邮箱
+	EmailConsumption  string //消费行业专家邮箱
+	EmailZhizao       string //智造行业专家邮箱
+	EmailStrategy     string //策略行业专家邮箱
+	EmaiWhiteUserList string //白名单邮箱
 )
 
 func init() {
@@ -91,6 +92,7 @@ func init() {
 		EmailConsumption = "yrhuang@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com;jhwang@hzinsights.com"                                     //消费行业专家邮箱
 		EmailZhizao = "xfma@hzinsights.com;agne@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com;jhwang@hzinsights.com"                         //智造行业专家邮箱
 		EmailStrategy = "xfma@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com;jhwang@hzinsights.com"                                           //策略行业专家邮箱
+		EmaiWhiteUserList = "tshen@hzinsights.com;cxzhang@hzinsights.com;yyli@hzinsights.com"                                                             //白名单邮箱
 
 		//EmailTechnology = "jhwang@hzinsights.com;cxzhang@hzinsights.com" //科技行业专家邮箱
 		//EmailMedicine = "jhwang@hzinsights.com"                          //医药行业专家邮箱
@@ -119,6 +121,7 @@ func init() {
 		EmailConsumption = "jhwang@hzinsights.com;cxzhang@hzinsights.com" //消费行业专家邮箱
 		EmailZhizao = "jhwang@hzinsights.com;cxzhang@hzinsights.com"      //智造行业专家邮箱
 		EmailStrategy = "jhwang@hzinsights.com;cxzhang@hzinsights.com"    //策略行业专家邮箱
+		EmaiWhiteUserList = "cxzhang@hzinsights.com"
 	}
 }