+
+
+
+
+
+ 
+ |
+
+
+ |
+
+
+ |
+
+
+
+
+
+ |
+ 亲爱的{{.name}}，您好：
+ |
+
+
+ | 请点击下面的链接，完成用户邮箱的激活： |
+
+
+ | {{.link}} |
+
+
+ |
+
+
+ | *为了确保您的帐号安全，该链接仅48小时内访问有效，请勿直接回复此邮件。 |
+
+
+ | 版权所有 © 北京云联万维科技有限公司 2018 保留一切权利 京ICP备17065753号 |
+
+
+
+
diff --git a/cmd/climc/shell/contacts.go b/cmd/climc/shell/contacts.go
index 8f37c44645..57c8817b78 100644
--- a/cmd/climc/shell/contacts.go
+++ b/cmd/climc/shell/contacts.go
@@ -167,17 +167,10 @@ func init() {
}
R(&ContactsVerifyOptions{}, "contact-verify-trigger", "Trigger contact verify", func(s *mcclient.ClientSession, args *ContactsVerifyOptions) error {
params := jsonutils.NewDict()
- params.Add(jsonutils.NewString(args.CONTACT_TYPE), "contact_type")
- params.Add(jsonutils.NewString(args.CONTACT), "contact")
- /*
- if len(args.Email) > 0 {
- params.Add(jsonutils.NewString(args.Email), "email")
- }
- if len(args.Mobile) > 0 {
- params.Add(jsonutils.NewString(args.Mobile), "mobile")
- }
- */
-
+ tmpDict := jsonutils.NewDict()
+ tmpDict.Add(jsonutils.NewString(args.CONTACT_TYPE), "contact_type")
+ tmpDict.Add(jsonutils.NewString(args.CONTACT), "contact")
+ params.Add(tmpDict, "contact")
_, err := modules.Contacts.PerformAction(s, args.UID, "verify", params)
if err != nil {
return err
diff --git a/cmd/climc/shell/notification.go b/cmd/climc/shell/notification.go
index a3d0320809..adffdb4d94 100644
--- a/cmd/climc/shell/notification.go
+++ b/cmd/climc/shell/notification.go
@@ -37,7 +37,9 @@ func init() {
Remark string `help:"Remark or description of the notification"`
Group bool `help:"Send to group"`
}
- R(&NotificationCreateOptions{}, "notify", "Send a notification to sb", func(s *mcclient.ClientSession, args *NotificationCreateOptions) error {
+ R(&NotificationCreateOptions{}, "notify", "Send a notification to someones", func(s *mcclient.ClientSession,
+ args *NotificationCreateOptions) error {
+
msg := notify.SNotifyMessage{}
if args.Group {
msg.Gid = args.Uid
diff --git a/cmd/climc/shell/notify_template.go b/cmd/climc/shell/notify_template.go
new file mode 100644
index 0000000000..b635e8eac6
--- /dev/null
+++ b/cmd/climc/shell/notify_template.go
@@ -0,0 +1,90 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package shell
+
+import (
+ "yunion.io/x/jsonutils"
+
+ "yunion.io/x/onecloud/pkg/mcclient"
+ "yunion.io/x/onecloud/pkg/mcclient/modules"
+ "yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+ type NotifyTemplateUpdateOptions struct {
+ CONTACTTYPE string `help:"the contanct type, such as 'email', 'mobile'"`
+ Topic string `help:"the topic of temlate, such as 'VERIFY', 'ALARM'"`
+ TemplateType string `help:"the type of template" choices:"content|title|remote"`
+ Content string `help:"the content of template"`
+ }
+ R(&NotifyTemplateUpdateOptions{}, "notify-template-update", "Create, update contact for user", func(s *mcclient.ClientSession,
+ args *NotifyTemplateUpdateOptions) error {
+ arr := jsonutils.NewArray()
+ tmpObj := jsonutils.NewDict()
+ tmpObj.Add(jsonutils.NewString(args.Topic), "topic")
+ tmpObj.Add(jsonutils.NewString(args.TemplateType), "template_type")
+ tmpObj.Add(jsonutils.NewString(args.Content), "content")
+ arr.Add(tmpObj)
+
+ params := jsonutils.NewDict()
+ params.Add(arr, "notifytemplates")
+
+ contact, err := modules.NotifyTemplates.PerformAction(s, args.CONTACTTYPE, "update-template", params)
+
+ if err != nil {
+ return err
+ }
+
+ printObject(contact)
+ return nil
+ })
+
+ type NotifyTemplateDeleteOptions struct {
+ CONTACTTYPE string `help:"the contanct type, such as 'email', 'mobile'"`
+ Topic string `help:"the topic of temlate, such as 'VERIFY', 'ALARM'"`
+ }
+
+ R(&NotifyTemplateDeleteOptions{}, "notify-template-delete", "delete notify template",
+ func(s *mcclient.ClientSession, args *NotifyTemplateDeleteOptions) error {
+
+ tmpObj := jsonutils.NewDict()
+ tmpObj.Add(jsonutils.NewString(args.CONTACTTYPE), "contact_type")
+ tmpObj.Add(jsonutils.NewString(args.Topic), "topic")
+ _, err := modules.NotifyTemplates.DeleteContents(s, tmpObj)
+ if err != nil {
+ return err
+ }
+ return nil
+ })
+
+ type NotifyTemplateListOptions struct {
+ options.BaseListOptions
+ }
+
+ R(&NotifyTemplateListOptions{}, "notify-template-list", "List all notify template",
+ func(s *mcclient.ClientSession, args *NotifyTemplateListOptions) error {
+
+ params, err := args.BaseListOptions.Params()
+ if err != nil {
+ return err
+ }
+ result, err := modules.NotifyTemplates.List(s, params)
+ if err != nil {
+ return err
+ }
+ printList(result, modules.NotifyTemplates.GetColumns(s))
+ return nil
+ })
+}
diff --git a/pkg/cloudcommon/db/usercache.go b/pkg/cloudcommon/db/usercache.go
index 6a89f46b91..2a76b4587a 100644
--- a/pkg/cloudcommon/db/usercache.go
+++ b/pkg/cloudcommon/db/usercache.go
@@ -103,10 +103,10 @@ func (manager *SUserCacheManager) fetchUser(
return user, nil
}
}
- return manager.fetchUserFromKeystone(ctx, idStr)
+ return manager.FetchUserFromKeystone(ctx, idStr)
}
-func (manager *SUserCacheManager) fetchUserFromKeystone(ctx context.Context, idStr string) (*SUser, error) {
+func (manager *SUserCacheManager) FetchUserFromKeystone(ctx context.Context, idStr string) (*SUser, error) {
if len(idStr) == 0 {
log.Debugf("fetch empty user!!!!\n%s", debug.Stack())
return nil, fmt.Errorf("Empty idStr")
diff --git a/pkg/mcclient/modules/mod_contacts.go b/pkg/mcclient/modules/mod_contacts.go
index 6f8480d440..609f8dd94a 100644
--- a/pkg/mcclient/modules/mod_contacts.go
+++ b/pkg/mcclient/modules/mod_contacts.go
@@ -16,6 +16,7 @@ package modules
import (
"fmt"
+ "net/url"
"yunion.io/x/jsonutils"
@@ -44,6 +45,21 @@ func (this *ContactsManager) DoBatchDeleteContacts(s *mcclient.ClientSession, pa
return modulebase.Post(this.ResourceManager, s, path, params, this.Keyword)
}
+func (this *ContactsManager) PerformAction(session *mcclient.ClientSession, id string, action string,
+ params jsonutils.JSONObject) (jsonutils.JSONObject, error) {
+
+ path := fmt.Sprintf("/%s/%s/%s?uname=true", this.ContextPath(nil), url.PathEscape(id), url.PathEscape(action))
+ return modulebase.Post(this.ResourceManager, session, path, params, this.KeywordPlural)
+}
+
+func (this *ContactsManager) Get(session *mcclient.ClientSession, id string, params jsonutils.JSONObject) (jsonutils.JSONObject,
+ error) {
+
+ q := params.(*jsonutils.JSONDict)
+ q.Add(jsonutils.JSONTrue, "uname")
+ return this.ResourceManager.Get(session, id, params)
+}
+
var (
Contacts ContactsManager
)
diff --git a/pkg/mcclient/modules/mod_notify_template.go b/pkg/mcclient/modules/mod_notify_template.go
new file mode 100644
index 0000000000..7017473305
--- /dev/null
+++ b/pkg/mcclient/modules/mod_notify_template.go
@@ -0,0 +1,43 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package modules
+
+import (
+ "yunion.io/x/jsonutils"
+
+ "yunion.io/x/onecloud/pkg/mcclient"
+ "yunion.io/x/onecloud/pkg/mcclient/modulebase"
+)
+
+type NotifyTemplateManager struct {
+ modulebase.ResourceManager
+}
+
+func (nm *NotifyTemplateManager) DeleteContents(s *mcclient.ClientSession, params jsonutils.JSONObject) (jsonutils.JSONObject, error) {
+ path := "/templates/delete-template"
+ return modulebase.Post(nm.ResourceManager, s, path, params, "")
+}
+
+var (
+ NotifyTemplates NotifyTemplateManager
+)
+
+func init() {
+ NotifyTemplates = NotifyTemplateManager{NewNotifyManager("notifytemplate", "notifytemplates",
+ []string{"Contact_Type", "Topic", "Template_Type"},
+ []string{})}
+
+ register(&NotifyTemplates)
+}
diff --git a/pkg/mcclient/modules/notify/mod_notification.go b/pkg/mcclient/modules/notify/mod_notification.go
index 330ba34b3c..21ffb8f5f5 100644
--- a/pkg/mcclient/modules/notify/mod_notification.go
+++ b/pkg/mcclient/modules/notify/mod_notification.go
@@ -42,7 +42,8 @@ type NotificationManager struct {
}
func (manager *NotificationManager) Send(s *mcclient.ClientSession, msg SNotifyMessage) error {
- _, err := manager.Create(s, jsonutils.Marshal(&msg))
+ path := "/" + manager.KeywordPlural
+ _, err := modulebase.Post(manager.ResourceManager, s, path, jsonutils.Marshal(&msg), manager.KeywordPlural)
return err
}
diff --git a/pkg/notify/cache/usercache.go b/pkg/notify/cache/usercache.go
index 90303ca9aa..2ee25e96e4 100644
--- a/pkg/notify/cache/usercache.go
+++ b/pkg/notify/cache/usercache.go
@@ -18,26 +18,21 @@ import (
"context"
"database/sql"
"fmt"
- "time"
- "yunion.io/x/log"
"yunion.io/x/pkg/errors"
- "yunion.io/x/onecloud/pkg/cloudcommon/consts"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
- "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/mcclient/auth"
- "yunion.io/x/onecloud/pkg/mcclient/modules"
"yunion.io/x/onecloud/pkg/util/httputils"
)
type SUserCacheManager struct {
- db.SKeystoneCacheObjectManager
+ db.SUserCacheManager
}
type SUser struct {
- db.SKeystoneCacheObject
+ db.SUser
}
func (user *SUser) GetModelManager() db.IModelManager {
@@ -46,13 +41,6 @@ func (user *SUser) GetModelManager() db.IModelManager {
var UserCacheManager *SUserCacheManager
-func init() {
- UserCacheManager = &SUserCacheManager{
- db.NewKeystoneCacheObjectManager(SUser{}, "users_cache_tbl", "user", "users")}
- // log.Debugf("initialize user cache manager %s", UserCacheManager.KeywordPlural())
- UserCacheManager.SetVirtualObject(UserCacheManager)
-}
-
func RegistUserCredCacheUpdater() {
auth.RegisterAuthHook(onAuthCompleteUpdateCache)
}
@@ -63,97 +51,18 @@ func onAuthCompleteUpdateCache(userCred mcclient.TokenCredential) {
func (ucm *SUserCacheManager) updateUserCache(userCred mcclient.TokenCredential) {
ucm.Save(context.Background(), userCred.GetUserId(), userCred.GetUserName(),
- userCred.GetDomainId())
+ userCred.GetDomainId(), userCred.GetDomainName())
}
-func (ucm *SUserCacheManager) FetchUserByIdOrName(idStr string) (*SUser, error) {
- obj, err := ucm.SKeystoneCacheObjectManager.FetchByIdOrName(nil, idStr)
- if err != nil {
- return nil, err
- }
- return obj.(*SUser), nil
-}
-
-func (ucm *SUserCacheManager) FetchUserById(idStr string) (*SUser, error) {
- obj, err := ucm.SKeystoneCacheObjectManager.FetchById(idStr)
- if err != nil {
- return nil, err
- }
- return obj.(*SUser), nil
-}
-
-func (ucm *SUserCacheManager) FetchUserByName(idStr string) (*SUser, error) {
- obj, err := ucm.SKeystoneCacheObjectManager.FetchByName(nil, idStr)
- if err != nil {
- return nil, err
- }
- return obj.(*SUser), nil
-}
-
-func (ucm *SUserCacheManager) Save(ctx context.Context, idStr string, name string, domainId string) (*SUser, error) {
- lockman.LockRawObject(ctx, ucm.KeywordPlural(), idStr)
- defer lockman.ReleaseRawObject(ctx, ucm.KeywordPlural(), idStr)
-
- objo, err := ucm.FetchById(idStr)
- if err != nil && err != sql.ErrNoRows {
- log.Errorf("FetchTenantbyId fail %s", err)
- return nil, err
- }
- now := time.Now().UTC()
- if err == nil {
- obj := objo.(*SUser)
- if obj.Id == idStr && obj.Name == name && obj.DomainId == domainId {
- db.Update(obj, func() error {
- obj.LastCheck = now
- return nil
- })
- return obj, nil
- }
- _, err = db.Update(obj, func() error {
- obj.Id = idStr
- obj.Name = name
- obj.DomainId = domainId
- obj.LastCheck = now
- return nil
- })
- if err != nil {
- return nil, err
- } else {
- return obj, nil
- }
- } else {
- objm, err := db.NewModelObject(ucm)
- obj := objm.(*SUser)
- obj.Id = idStr
- obj.Name = name
- obj.DomainId = domainId
- obj.LastCheck = now
- err = ucm.TableSpec().Insert(obj)
- if err != nil {
- return nil, err
- } else {
- return obj, nil
- }
- }
-}
-
-func (ucm *SUserCacheManager) fetchUserFromKeystone(ctx context.Context, idStr string) (*SUser, error) {
- if len(idStr) == 0 {
- return nil, fmt.Errorf("Empty idStr")
- }
- s := auth.GetAdminSession(ctx, consts.GetRegion(), "v3")
- user, err := modules.UsersV3.GetById(s, idStr, nil)
+func (ucm *SUserCacheManager) dealErrFromKeystone(err error) error {
if err != nil {
if je, ok := err.(*httputils.JSONClientError); ok && je.Code == 404 {
- return nil, sql.ErrNoRows
+ return sql.ErrNoRows
+ } else {
+ return errors.Wrap(err, "fetch User info from keystone")
}
- log.Errorf("fetch project %s fail %s", idStr, err)
- return nil, errors.Wrap(err, "modules.Projects.Get")
}
- userId, _ := user.GetString("id")
- userName, _ := user.GetString("name")
- domainId, _ := user.GetString("domain_id")
- return ucm.Save(ctx, userId, userName, domainId)
+ return nil
}
func (ucm *SUserCacheManager) FetchUsersByIDs(ctx context.Context, ids []string) (map[string]SUser, error) {
@@ -174,32 +83,21 @@ func (ucm *SUserCacheManager) FetchUsersByIDs(ctx context.Context, ids []string)
if _, ok := ret[id]; ok {
continue
}
- user, err := ucm.fetchUserFromKeystone(ctx, id)
+ user, err := ucm.FetchUserFromKeystone(ctx, id)
if err != nil {
continue
}
- ret[id] = *user
+ ret[id] = SUser{*user}
}
return ret, nil
}
-func (ucm *SUserCacheManager) FetchUserByID(ctx context.Context, idStr string, noExpireCheck bool) (*SUser, error) {
-
- q := ucm.Query().Equals("id", idStr)
- uobj, err := db.NewModelObject(ucm)
+func (ucm *SUserCacheManager) FetchUserByIDOrName(ctx context.Context, idStr string) (*SUser, error) {
+ user, err := ucm.SUserCacheManager.FetchUserByIdOrName(ctx, idStr)
if err != nil {
- return nil, errors.Wrap(err, "NewModelObject")
+ return nil, err
}
- err = q.First(uobj)
- if err != nil && err != sql.ErrNoRows {
- return nil, errors.Wrap(err, "query")
- } else if uobj != nil {
- user := uobj.(*SUser)
- if noExpireCheck || !user.IsExpired() {
- return user, nil
- }
- }
- return ucm.fetchUserFromKeystone(ctx, idStr)
+ return &SUser{*user}, nil
}
func (ucm *SUserCacheManager) FetchUserLikeName(ctx context.Context, name string, noExpireCheck bool) ([]SUser,
diff --git a/pkg/notify/dispatcher.go b/pkg/notify/dispatcher.go
index e3e6139528..c45d9a8a8b 100644
--- a/pkg/notify/dispatcher.go
+++ b/pkg/notify/dispatcher.go
@@ -24,6 +24,7 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
+ "yunion.io/x/pkg/util/sets"
"yunion.io/x/pkg/utils"
"yunion.io/x/sqlchemy"
@@ -228,8 +229,8 @@ func (self *NotifyModelDispatcher) VerifyTrigger(ctx context.Context, params map
contact, _ := data.GetString("contact")
contactType, _ := data.GetString("contact_type")
contacts, err := models.ContactManager.FetchByMore(uid, contact, contactType)
- if err != nil {
- return nil, errors.Error(fmt.Sprintf(`uid %q don't have contact %q of contact_type %q'`, uid, contact, contactType))
+ if err != nil || len(contacts) == 0 {
+ return nil, errors.Error(fmt.Sprintf("uid '%s' don't have contact '%s' of contact_type '%s'", uid, contact, contactType))
}
userCred := policy.FetchUserCredential(ctx)
scontact := contacts[0]
@@ -262,12 +263,16 @@ func (self *NotifyModelDispatcher) VerifyTrigger(ctx context.Context, params map
}
if scontact.Status == models.CONTACT_VERIFYING {
verifications, err := models.VerifyManager.FetchByCID(scontact.ID, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
- q = q.Equals("status", models.VERIFICATION_SENT).Desc("created_at")
+ q = q.In("status", []string{models.VERIFICATION_SENT, "init"}).Desc("created_at")
return q
})
if err != nil {
return nil, httperrors.NewGeneralError(err)
}
+ if len(verifications) == 0 {
+ // no verifications in status "sent"
+ return makeNewVerify()
+ }
current := time.Now()
for _, verification := range verifications {
if current.After(verification.ExpireAt) {
@@ -292,8 +297,11 @@ func (self *NotifyModelDispatcher) DeleteContacts(ctx context.Context, uids2 []j
for i := range uids2 {
uids[i] = strings.Trim(uids2[i].String(), `"`)
}
-
- contacts, err := models.ContactManager.FetchByUIDs(uids)
+ uname := false
+ if v := ctx.Value("uname"); v != nil {
+ uname = true
+ }
+ contacts, err := models.ContactManager.FetchByUIDs(uids, uname)
if err != nil {
return httperrors.NewGeneralError(err)
}
@@ -425,6 +433,91 @@ func (self *NotifyModelDispatcher) UpdateContacts(ctx context.Context, idstr str
return nil
}
+func (self *NotifyModelDispatcher) UpdateTemplate(ctx context.Context, ctype string, query jsonutils.JSONObject,
+ datas []jsonutils.JSONObject) error {
+
+ type sTemplate struct {
+ ContactType string
+ Topic string
+ TemplateType string
+ Content string
+ }
+ templates := make([]sTemplate, 0, len(datas))
+ topics := sets.NewString()
+ for _, data := range datas {
+ var tem sTemplate
+ err := data.Unmarshal(&tem)
+ if err != nil {
+ return errors.Wrap(err, "data.Unmarshal")
+ }
+ if tem.TemplateType != models.TEMPLATE_TYPE_REMOTE && tem.TemplateType != models.
+ TEMPLATE_TYPE_CONTENT && tem.TemplateType != models.TEMPLATE_TYPE_TITLE {
+
+ return httperrors.NewInputParameterError("no support for such template type '%s'", tem.TemplateType)
+ }
+ tem.ContactType = ctype
+ tem.Topic = strings.ToUpper(tem.Topic)
+ templates = append(templates, tem)
+ topics.Insert(tem.Topic)
+ }
+
+ q := models.TemplateManager.Query().Equals("contact_type", ctype).In("topic", topics.List())
+ templateModels := make([]models.STemplate, 0, 1)
+ err := db.FetchModelObjects(models.ContactManager, q, &templateModels)
+ if err != nil {
+ log.Errorf("db.FetchModelObjects sql: %s", q.String())
+ return errors.Wrap(err, "db.FetchModelObjects")
+ }
+
+ templateMaps := make(map[string]*models.STemplate)
+ for i := range templateModels {
+ k := fmt.Sprintf("%s/%s/%s", templateModels[i].ContactType, templateModels[i].Topic, templateModels[i].TemplateType)
+ templateMaps[k] = &templateModels[i]
+ }
+
+ userCred := policy.FetchUserCredential(ctx)
+ for _, tem := range templates {
+ k := fmt.Sprintf("%s/%s/%s", tem.ContactType, tem.Topic, tem.TemplateType)
+ if tmod, ok := templateMaps[k]; ok {
+ updateData := jsonutils.NewDict()
+ updateData.Add(jsonutils.NewString(tem.Content), "content")
+ err = UpdateItem(models.TemplateManager, tmod, ctx, userCred, query, updateData)
+ if err != nil {
+ return errors.Wrapf(err, "fail to update template '%s'", tmod.ID)
+ }
+ continue
+ }
+ _, err = self.Create(ctx, query, jsonutils.Marshal(tem), nil)
+ if err != nil {
+ return errors.Wrapf(err, "fail to create template(contact_type: %s, topic: %s, template_type: %s)",
+ tem.ContactType, tem.Topic, tem.TemplateType)
+ }
+ }
+ return nil
+}
+
+func (self *NotifyModelDispatcher) DeleteTemplate(ctx context.Context, query jsonutils.JSONObject, ctype, topic string) error {
+
+ q := models.TemplateManager.Query().Equals("contact_type", ctype)
+ if len(topic) != 0 {
+ q = q.Equals("topic", topic)
+ }
+ templates := make([]models.STemplate, 0, 1)
+ err := db.FetchModelObjects(models.TemplateManager, q, &templates)
+ if err != nil {
+ log.Errorf("db.FetchModelObjects sql: %s", q.String())
+ return errors.Wrap(err, "db.FetchModelObjects")
+ }
+ userCred := policy.FetchUserCredential(ctx)
+ for i := range templates {
+ err = DeleteItem(&templates[i], ctx, userCred, query, jsonutils.JSONNull)
+ if err != nil {
+ return errors.Wrapf(err, "fail to delete template '%s'", templates[i].ID)
+ }
+ }
+ return nil
+}
+
// fetchEnv fetch handler, params, query and body from ctx(context.Context)
func fetchEnv(ctx context.Context, w http.ResponseWriter, r *http.Request) (*NotifyModelDispatcher, map[string]string, jsonutils.JSONObject, jsonutils.JSONObject) {
params, query, body := appsrv.FetchEnv(ctx, w, r)
diff --git a/pkg/notify/handlers.go b/pkg/notify/handlers.go
index a7b58c0dc0..b0d0990029 100644
--- a/pkg/notify/handlers.go
+++ b/pkg/notify/handlers.go
@@ -18,12 +18,15 @@ import (
"context"
"fmt"
"net/http"
+ "net/url"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
+ "yunion.io/x/onecloud/pkg/appctx"
"yunion.io/x/onecloud/pkg/appsrv"
+ "yunion.io/x/onecloud/pkg/cloudcommon/consts"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/policy"
"yunion.io/x/onecloud/pkg/httperrors"
@@ -44,9 +47,35 @@ func InitHandlers(app *appsrv.Application) {
db.RegisterModelManager(models.ConfigManager)
db.RegisterModelManager(cache.UserCacheManager)
db.RegisterModelManager(cache.UserGroupCacheManager)
+ db.RegisterModelManager(models.TemplateManager)
AddNotifyDispatcher("/api/v1/", app)
}
+// Middleware
+func middleware(f appsrv.FilterHandler) appsrv.FilterHandler {
+ hander := func(ctx context.Context, w http.ResponseWriter, r *http.Request) {
+ if _, ok := r.URL.Query()["uname"]; ok {
+ // Uname
+ params := appctx.AppContextParams(ctx)
+ if uid, ok := params["