Merge branch 'feat/1.1.0/report' of github.com:answerdev/answer into feat/1.1.0/report

This commit is contained in:
aichy126 2023-05-25 11:27:03 +08:00
commit 36c93f546c
2 changed files with 1 additions and 2 deletions

View File

@ -112,7 +112,6 @@ func (a *AnswerAPIRouter) RegisterMustUnAuthAnswerAPIRouter(r *gin.RouterGroup)
routerGroup.POST("/user/password/reset", a.userController.RetrievePassWord) routerGroup.POST("/user/password/reset", a.userController.RetrievePassWord)
routerGroup.POST("/user/password/replacement", a.userController.UseRePassWord) routerGroup.POST("/user/password/replacement", a.userController.UseRePassWord)
routerGroup.PUT("/user/email/notification", a.userController.UserUnsubscribeEmailNotification) routerGroup.PUT("/user/email/notification", a.userController.UserUnsubscribeEmailNotification)
routerGroup.GET("/user/info/search", a.userController.SearchUserListByName)
} }
func (a *AnswerAPIRouter) RegisterUnAuthAnswerAPIRouter(r *gin.RouterGroup) { func (a *AnswerAPIRouter) RegisterUnAuthAnswerAPIRouter(r *gin.RouterGroup) {
@ -213,6 +212,7 @@ func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {
r.PUT("/user/info", a.userController.UserUpdateInfo) r.PUT("/user/info", a.userController.UserUpdateInfo)
r.PUT("/user/interface", a.userController.UserUpdateInterface) r.PUT("/user/interface", a.userController.UserUpdateInterface)
r.POST("/user/notice/set", a.userController.UserNoticeSet) r.POST("/user/notice/set", a.userController.UserNoticeSet)
r.GET("/user/info/search", a.userController.SearchUserListByName)
// vote // vote
r.GET("/personal/vote/page", a.voteController.UserVotes) r.GET("/personal/vote/page", a.voteController.UserVotes)

View File

@ -1,6 +1,5 @@
package service_config package service_config
type ServiceConfig struct { type ServiceConfig struct {
SecretKey string `json:"secret_key" mapstructure:"secret_key" yaml:"secret_key"`
UploadPath string `json:"upload_path" mapstructure:"upload_path" yaml:"upload_path"` UploadPath string `json:"upload_path" mapstructure:"upload_path" yaml:"upload_path"`
} }