From 616102db910c360eafdcd1ad920c91e096cff403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 2 Feb 2023 18:30:54 +0800 Subject: [PATCH] 1 --- business/app_version/version.go | 32 ++++++++++++++ business/model/model.go | 2 +- business/model/new_config.go | 1 + controllers/version_config_controller.go | 54 ++++++++++++++++++++++++ routers/commentsRouter_controllers.go | 25 +++++++++++ routers/router.go | 5 +++ 6 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 business/app_version/version.go create mode 100644 controllers/version_config_controller.go diff --git a/business/app_version/version.go b/business/app_version/version.go new file mode 100644 index 000000000..bd7f2d578 --- /dev/null +++ b/business/app_version/version.go @@ -0,0 +1,32 @@ +package app_version + +import ( + "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/model/dao" +) + +// AddApplicationVersion 添加app版本控制 +func AddApplicationVersion(userName, appId, version string) error { + config := &model.NewConfig{ + Type: model.ConfigTypeApplication, + Key: appId, + Value: version, + } + dao.WrapAddIDCULDEntity(config, userName) + return dao.CreateEntity(dao.GetDB(), config) +} + +// UpdateApplicationVersion 修改app版本 +func UpdateApplicationVersion(appId, version string) error { + sql := ` UPDATE new_config c SET c.value = ? WHERE c.key = ? AND c.deleted_at = ? ` + param := []interface{}{version, appId, utils.DefaultTimeValue} + + _, err := dao.ExecuteSQL(dao.GetDB(), sql, param...) + return err +} + +// GetApplicationVersion 查询小程序版本控制 +func GetApplicationVersion(appId string) ([]*model.NewConfig, error) { + return dao.QueryConfigs(dao.GetDB(), appId, model.ConfigTypeApplication, "") +} diff --git a/business/model/model.go b/business/model/model.go index bd40a0331..9ef7718b4 100644 --- a/business/model/model.go +++ b/business/model/model.go @@ -68,7 +68,7 @@ type ModelIDCULD struct { ID int `orm:"column(id)" json:"id"` CreatedAt time.Time `orm:"auto_now_add;type(datetime)" json:"createdAt"` UpdatedAt time.Time `orm:"auto_now;type(datetime)" json:"updatedAt"` - LastOperator string `orm:"size(32)" json:"lastOperator"` // 最后操作员 + LastOperator string `orm:"size(32)" json:"lastOperator"` // 最后操作员1 DeletedAt time.Time `orm:"type(datetime);null" json:"deletedAt"` } diff --git a/business/model/new_config.go b/business/model/new_config.go index ba3e57598..99f89f466 100644 --- a/business/model/new_config.go +++ b/business/model/new_config.go @@ -10,6 +10,7 @@ const ( ConfigTypeCookie = "Cookie" ConfigTypeDiscountCard = "DiscountCard" ConfigTypeReply = "Reply" + ConfigTypeApplication = "App" ) const ( diff --git a/controllers/version_config_controller.go b/controllers/version_config_controller.go new file mode 100644 index 000000000..aa80bc61e --- /dev/null +++ b/controllers/version_config_controller.go @@ -0,0 +1,54 @@ +package controllers + +import ( + "git.rosy.net.cn/jx-callback/business/app_version" + "github.com/astaxie/beego/server/web" +) + +type VersionController struct { + web.Controller +} + +// @Title 添加小程序的版本控制 +// @Description 添加小程序的版本控制 +// @Param token header string true "认证token" +// @Param appId header string true "小程序id" +// @Param version header string true "小程序版本" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /AddVersionController [post] +func (c *VersionController) AddVersionController() { + c.callAddVersionController(func(params *tVersionAddVersionControllerParams) (interface{}, string, error) { + err := app_version.AddApplicationVersion(params.Ctx.GetUserName(), params.AppId, params.Version) + return nil, "", err + }) +} + +// @Title 修改小程序的版本控制 +// @Description 修改小程序的版本控制 +// @Param token header string true "认证token" +// @Param appId header string true "小程序id" +// @Param version header string true "小程序版本" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /UpdateVersionController [post] +func (c *VersionController) UpdateVersionController() { + c.callUpdateVersionController(func(params *tVersionUpdateVersionControllerParams) (interface{}, string, error) { + err := app_version.UpdateApplicationVersion(params.AppId, params.Version) + return nil, "", err + }) +} + +// @Title 获取版本控制 +// @Description 获取版本控制 +// @Param token header string false "认证token" +// @Param appId header string false "小程序id" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /GetVersionController [get] +func (c *VersionController) GetVersionController() { + c.callGetVersionController(func(params *tVersionGetVersionControllerParams) (interface{}, string, error) { + configs, err := app_version.GetApplicationVersion(params.AppId) + return configs, "", err + }) +} diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 2e2136836..90d95cbdf 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -4198,6 +4198,31 @@ func init() { Filters: nil, Params: nil}) + // 版本设置 + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:VersionController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:VersionController"], + web.ControllerComments{ + Method: "AddVersionController", + Router: `/AddVersionController`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:VersionController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:VersionController"], + web.ControllerComments{ + Method: "GetVersionController", + Router: `/GetVersionController`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:VersionController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:VersionController"], + web.ControllerComments{ + Method: "UpdateVersionController", + Router: `/UpdateVersionController`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) // 创建会话,客户群 web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SessionController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SessionController"], web.ControllerComments{ diff --git a/routers/router.go b/routers/router.go index bb52cff46..ef6e2191d 100644 --- a/routers/router.go +++ b/routers/router.go @@ -161,6 +161,11 @@ func init() { &controllers.SessionController{}, ), ), + web.NSNamespace("/version", + web.NSInclude( + &controllers.VersionController{}, + ), + ), ) web.AddNamespace(ns)