token验证修改

@@ -14,8 +14,10 @@ type SearchDividendsEstimatesCommand struct {
 	PageNumber int `json:"pageIndex" valid:"Required"`
 	PageNumber int `json:"pageIndex" valid:"Required"`
 	// 查询限制
 	// 查询限制
 	PageSize int `json:"pageSize" valid:"Required"`
 	PageSize int `json:"pageSize" valid:"Required"`
-	//审核状态
+	//状态
 	Status int `json:"status"`
 	Status int `json:"status"`
+	// 组织Id
+	OrgId int64 `json:"orgId" valid:"Required"`
 }
 }
 
 
 func (cmd *SearchDividendsEstimatesCommand) Valid(validation *validation.Validation) {
 func (cmd *SearchDividendsEstimatesCommand) Valid(validation *validation.Validation) {

@@ -58,8 +58,8 @@ func (srv PersonDividendsService) SearchDividendsEstimates(cmd *command.SearchDi
 	gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
 	gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
 		cmd.Operator)
 		cmd.Operator)
 	result, err := gateway.CooperationStatistics(allied_creation_cooperation.SearchDividendsEstimates, map[string]interface{}{
 	result, err := gateway.CooperationStatistics(allied_creation_cooperation.SearchDividendsEstimates, map[string]interface{}{
-		"companyId": cmd.Operator.CompanyId,
-		//"orgId":cmd.Operator.OrgId,
+		//"companyId": cmd.Operator.CompanyId,
+		"orgId":                  cmd.OrgId,
 		"userBaseId":             cmd.Operator.UserBaseId,
 		"userBaseId":             cmd.Operator.UserBaseId,
 		"dividendsAccountStatus": cmd.Status,
 		"dividendsAccountStatus": cmd.Status,
 		"offset":                 (cmd.PageNumber - 1) * cmd.PageSize,
 		"offset":                 (cmd.PageNumber - 1) * cmd.PageSize,

@@ -34,7 +34,9 @@ func init() {
 	filters.SecureKeyMap["token"] = "x-mmm-accesstoken"
 	filters.SecureKeyMap["token"] = "x-mmm-accesstoken"
 	web.InsertFilter("/*", web.BeforeRouter, filters.AllowCors())
 	web.InsertFilter("/*", web.BeforeRouter, filters.AllowCors())
 	web.InsertFilter("/*", web.BeforeRouter, filters.CreateRequstLogFilter(log.Logger))
 	web.InsertFilter("/*", web.BeforeRouter, filters.CreateRequstLogFilter(log.Logger))
-	web.InsertFilter("/*", web.BeforeExec, middleware.CheckAccessToken2())
+	web.InsertFilter("/v1/web/*", web.BeforeExec, middleware.CheckAccessToken2())
+	web.InsertFilter("/v1/app/*", web.BeforeExec, middleware.CheckAccessToken2())
+	web.InsertFilter("/v1/user/*", web.BeforeExec, middleware.CheckAccessToken2())
 	web.InsertFilter("/*", web.AfterExec, filters.CreateResponseLogFilter(log.Logger), web.WithReturnOnOutput(false))
 	web.InsertFilter("/*", web.AfterExec, filters.CreateResponseLogFilter(log.Logger), web.WithReturnOnOutput(false))
 	web.InsertFilter("/v1/app11/*", web.BeforeExec, filters.SecureHandler(
 	web.InsertFilter("/v1/app11/*", web.BeforeExec, filters.SecureHandler(
 		filters.WithEnableCheckTimestamp(false),
 		filters.WithEnableCheckTimestamp(false),