diff --git a/app/hdl/cloud_bundle/hdl_img_base.go b/app/hdl/cloud_bundle/hdl_img_base.go index 9ffb5e2..78766f2 100644 --- a/app/hdl/cloud_bundle/hdl_img_base.go +++ b/app/hdl/cloud_bundle/hdl_img_base.go @@ -6,9 +6,9 @@ import ( ) // ImgBase -// @Summary 基本配置-云打包-图片配置 -// @Tags 基本配置 -// @Description 基本配置-图片配置 +// @Summary 云打包-云打包-图片配置 +// @Tags 云打包 +// @Description 云打包-图片配置 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" @@ -20,9 +20,9 @@ func ImgBase(c *gin.Context) { } // ImgBaseSave -// @Summary 基本配置-图片配置 -// @Tags 基本配置 -// @Description 基本配置-图片配置 +// @Summary 云打包-图片配置 +// @Tags 云打包 +// @Description 云打包-图片配置 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" diff --git a/app/hdl/cloud_bundle/hdl_list.go b/app/hdl/cloud_bundle/hdl_list.go index 04d476f..06a1587 100644 --- a/app/hdl/cloud_bundle/hdl_list.go +++ b/app/hdl/cloud_bundle/hdl_list.go @@ -6,9 +6,9 @@ import ( ) // List -// @Summary 基本设置-云打包版本列表 -// @Tags 基本设置 -// @Description 基本设置-云打包版本列表 +// @Summary 云打包-云打包版本列表 +// @Tags 云打包 +// @Description 云打包-云打包版本列表 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" @@ -21,9 +21,9 @@ func List(c *gin.Context) { } // Build -// @Summary 基本设置-云打包操作 -// @Tags 基本设置 -// @Description 基本设置-云打包操作 +// @Summary 云打包-云打包操作 +// @Tags 云打包 +// @Description 云打包-云打包操作 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" @@ -36,9 +36,9 @@ func Build(c *gin.Context) { } // Del -// @Summary 基本设置-云打包删除 -// @Tags 基本设置 -// @Description 基本设置-云打包删除 +// @Summary 云打包-云打包删除 +// @Tags 云打包 +// @Description 云打包-云打包删除 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" @@ -51,9 +51,9 @@ func Del(c *gin.Context) { } // AuditSet -// @Summary 基本设置-云打包-设置为审核模板 -// @Tags 基本设置 -// @Description 基本设置-云打包-设置为审核模板 +// @Summary 云打包-云打包-设置为审核模板 +// @Tags 云打包 +// @Description 云打包-云打包-设置为审核模板 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" @@ -66,9 +66,9 @@ func AuditSet(c *gin.Context) { } // AuditClear -// @Summary 基本设置-云打包-清除审核模板 -// @Tags 基本设置 -// @Description 基本设置-云打包-清除审核模板 +// @Summary 云打包-云打包-清除审核模板 +// @Tags 云打包 +// @Description 云打包-云打包-清除审核模板 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" diff --git a/app/hdl/cloud_bundle/hdl_version_info.go b/app/hdl/cloud_bundle/hdl_version_info.go index 9dadce7..a28ff06 100644 --- a/app/hdl/cloud_bundle/hdl_version_info.go +++ b/app/hdl/cloud_bundle/hdl_version_info.go @@ -6,9 +6,9 @@ import ( ) // VersionBase -// @Summary 基本配置-云打包-图片配置 -// @Tags 基本配置 -// @Description 基本配置-图片配置 +// @Summary 云打包-云打包-图片配置 +// @Tags 云打包 +// @Description 云打包-图片配置 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" @@ -20,9 +20,9 @@ func VersionBase(c *gin.Context) { } // VersionBaseSave -// @Summary 基本配置-图片配置 -// @Tags 基本配置 -// @Description 基本配置-图片配置 +// @Summary 云打包-图片配置 +// @Tags 云打包 +// @Description 云打包-图片配置 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" diff --git a/app/hdl/notice/hdl_aliyun_sms.go b/app/hdl/notice/hdl_aliyun_sms.go index 51976dd..f652422 100644 --- a/app/hdl/notice/hdl_aliyun_sms.go +++ b/app/hdl/notice/hdl_aliyun_sms.go @@ -20,50 +20,51 @@ func AliyunSmsFilePhone(c *gin.Context) { notice.AliyunSmsFilePhone(c) } -// AliyunSmsList -// @Summary 消息中心-短信推送记录-通知模板(跟app推送记录的通知模板一样的效果) -// @Tags 消息中心 -// @Description 短信推送记录-通知模板 -// @Accept json -// @Produce json -// @param Authorization header string true "验证参数Bearer和token空格拼接" -// @Param req body md.NoticeAliyunSmsListReq true "(分页信息必填)" -// @Success 200 {object} md.NoticeAliyunSmsListResp "具体数据" -// @Failure 400 {object} md.Response "具体错误" -// @Router /api/notice/aliyunSms/list [get] -func AliyunSmsList(c *gin.Context) { - notice.AliyunSmsList(c) -} - -// AliyunSmsSave -// @Summary 消息中心-短信推送记录-通知模板添加编辑 -// @Tags 消息中心 -// @Description 短信推送记录-通知模板添加编辑 -// @Accept json -// @Produce json -// @param Authorization header string true "验证参数Bearer和token空格拼接" -// @Param req body md.NoticeAliyunSmsSaveReq true "参数" -// @Success 200 {string} "具体数据" -// @Failure 400 {object} md.Response "具体错误" -// @Router /api/notice/aliyunSms/save [post] -func AliyunSmsSave(c *gin.Context) { - notice.AliyunSmsSave(c) -} - -// AliyunSmsDel -// @Summary 消息中心-短信推送记录-通知模板删除 -// @Tags 消息中心 -// @Description 短信推送记录-通知模板删除 -// @Accept json -// @Produce json -// @param Authorization header string true "验证参数Bearer和token空格拼接" -// @Param req body md.NoticeDelReq true "(分页信息必填)" -// @Success 200 {string} "具体数据" -// @Failure 400 {object} md.Response "具体错误" -// @Router /api/notice/aliyunSms/del [post] -func AliyunSmsDel(c *gin.Context) { - notice.AliyunSmsDel(c) -} +// +//// AliyunSmsList +//// @Summary 消息中心-短信推送记录-通知模板(跟app推送记录的通知模板一样的效果) +//// @Tags 消息中心 +//// @Description 短信推送记录-通知模板 +//// @Accept json +//// @Produce json +//// @param Authorization header string true "验证参数Bearer和token空格拼接" +//// @Param req body md.NoticeAliyunSmsListReq true "(分页信息必填)" +//// @Success 200 {object} md.NoticeAliyunSmsListResp "具体数据" +//// @Failure 400 {object} md.Response "具体错误" +//// @Router /api/notice/aliyunSms/list [get] +//func AliyunSmsList(c *gin.Context) { +// notice.AliyunSmsList(c) +//} +// +//// AliyunSmsSave +//// @Summary 消息中心-短信推送记录-通知模板添加编辑 +//// @Tags 消息中心 +//// @Description 短信推送记录-通知模板添加编辑 +//// @Accept json +//// @Produce json +//// @param Authorization header string true "验证参数Bearer和token空格拼接" +//// @Param req body md.NoticeAliyunSmsSaveReq true "参数" +//// @Success 200 {string} "具体数据" +//// @Failure 400 {object} md.Response "具体错误" +//// @Router /api/notice/aliyunSms/save [post] +//func AliyunSmsSave(c *gin.Context) { +// notice.AliyunSmsSave(c) +//} +// +//// AliyunSmsDel +//// @Summary 消息中心-短信推送记录-通知模板删除 +//// @Tags 消息中心 +//// @Description 短信推送记录-通知模板删除 +//// @Accept json +//// @Produce json +//// @param Authorization header string true "验证参数Bearer和token空格拼接" +//// @Param req body md.NoticeDelReq true "(分页信息必填)" +//// @Success 200 {string} "具体数据" +//// @Failure 400 {object} md.Response "具体错误" +//// @Router /api/notice/aliyunSms/del [post] +//func AliyunSmsDel(c *gin.Context) { +// notice.AliyunSmsDel(c) +//} // AliyunSmsSaleBase // @Summary 消息中心-短信推送记录-营销短信-通知模板 diff --git a/app/hdl/notice/hdl_notice.go b/app/hdl/notice/hdl_notice.go index 7cfb311..23783f1 100644 --- a/app/hdl/notice/hdl_notice.go +++ b/app/hdl/notice/hdl_notice.go @@ -6,54 +6,54 @@ import ( ) // List -// @Summary 消息中心-APP推送记录-通知模板 +// @Summary 消息中心-基本配置-通知模板 // @Tags 消息中心 -// @Description APP推送记录-通知模板 +// @Description 基本配置-通知模板 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" // @Param req body md.NoticeListReq true "(分页信息必填)" // @Success 200 {object} md.NoticeListResp "具体数据" // @Failure 400 {object} md.Response "具体错误" -// @Router /api/notice/jPush/list [post] +// @Router /api/notice/base/list [post] func List(c *gin.Context) { notice.List(c) } // Save -// @Summary 消息中心-APP推送记录-通知模板添加编辑 +// @Summary 消息中心-基本配置-通知模板添加编辑 // @Tags 消息中心 -// @Description APP推送记录-通知模板添加编辑 +// @Description 基本配置-通知模板添加编辑 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" // @Param req body md.NoticeSaveReq true "(分页信息必填)" // @Success 200 {string} "具体数据" // @Failure 400 {object} md.Response "具体错误" -// @Router /api/notice/jPush/save [post] +// @Router /api/notice/base/save [post] func Save(c *gin.Context) { notice.Save(c) } // Del -// @Summary 消息中心-APP推送记录-通知模板删除 +// @Summary 消息中心-基本配置-通知模板删除 // @Tags 消息中心 -// @Description APP推送记录-通知模板删除 +// @Description 基本配置-通知模板删除 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" // @Param req body md.NoticeDelReq true "(分页信息必填)" // @Success 200 {string} "具体数据" // @Failure 400 {object} md.Response "具体错误" -// @Router /api/notice/jPush/del [post] +// @Router /api/notice/base/del [post] func Del(c *gin.Context) { notice.Del(c) } // PushList -// @Summary 消息中心-APP推送记录-推送记录列表 +// @Summary 消息中心-基本配置-推送记录列表 // @Tags 消息中心 -// @Description APP推送记录-推送记录列表 +// @Description 基本配置-推送记录列表 // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" @@ -66,9 +66,9 @@ func PushList(c *gin.Context) { } // PushSave -// @Summary 消息中心-APP推送记录-推送记录添加-发送(不做编辑了) +// @Summary 消息中心-基本配置-推送记录添加-发送(不做编辑了) // @Tags 消息中心 -// @Description APP推送记录-推送记录添加-发送 (不做编辑了) +// @Description 基本配置-推送记录添加-发送 (不做编辑了) // @Accept json // @Produce json // @param Authorization header string true "验证参数Bearer和token空格拼接" diff --git a/app/md/md_advertising.go b/app/md/md_advertising.go index be96b6a..cf29b28 100644 --- a/app/md/md_advertising.go +++ b/app/md/md_advertising.go @@ -28,7 +28,7 @@ type AdvertisingList struct { Id string `json:"id" ` Name string `json:"name" example:"名称"` Kind string `json:"kind" example:"广告类型(1:开屏广告 2:插屏广告 3:激励视频 4:信息流广告 5:全屏视频)"` - Info string `json:"info" example:"广告位配置 {\"chuanshanjia\":{\"android_ad_id\":[\"\"],\"ios_ad_id\":[\"\"]}}"` + Info string `json:"info" example:"广告位配置 {\"chuanshanjia\":{\"android_ad_id\":[{\"id\":\"\",\"key\":\"\"}],\"ios_ad_id\":[{\"id\":\"\",\"key\":\"\"}}}"` CountingDown string `json:"counting_down" example:"倒计时 单位秒"` } type AdvertisingDelReq struct { @@ -38,7 +38,7 @@ type AdvertisingSaveReq struct { Id string `json:"id"` Name string `json:"name" example:"名称"` Kind string `json:"kind" example:"广告类型(1:开屏广告 2:插屏广告 3:激励视频 4:信息流广告 5:全屏视频)"` - Info string `json:"info" example:"广告位配置 {\"chuanshanjia\":{\"android_ad_id\":[\"\"],\"ios_ad_id\":[\"\"]}}"` + Info string `json:"info" example:"广告位配置 {\"chuanshanjia\":{\"android_ad_id\":[{\"id\":\"\",\"key\":\"\"}],\"ios_ad_id\":[{\"id\":\"\",\"key\":\"\"}}}"` CountingDown string `json:"counting_down" example:"倒计时 单位秒"` } type AdvertisingLimit struct { diff --git a/app/md/md_cloud_bundle.go b/app/md/md_cloud_bundle.go index 1a8985a..b36e47b 100644 --- a/app/md/md_cloud_bundle.go +++ b/app/md/md_cloud_bundle.go @@ -31,6 +31,7 @@ type CloudBundleBuildReq struct { Version string `json:"version"` Os string `json:"os"` Bit []string `json:"bit"` + Platform []string `json:"platform"` IsCombine string `json:"isCombine"` } type CloudBundleBase struct { diff --git a/app/md/md_notice.go b/app/md/md_notice.go index 61191e1..cc85c7f 100644 --- a/app/md/md_notice.go +++ b/app/md/md_notice.go @@ -11,22 +11,24 @@ type NoticeListResp struct { List []NoticeList `json:"list"` } type NoticeList struct { - Id string `json:"id"` - Title string `json:"title"` - Content string `json:"content"` - Type string `json:"type"` - IsShow string `json:"is_show"` - + Id string `json:"id"` + Title string `json:"title"` + Content string `json:"content"` + Type string `json:"type"` + JpushOpen string `json:"jpush_open" example:"app推送开启 0关 1开"` + SmsOpen string `json:"sms_open" example:"短信推送开启 0关 1开"` + SmsCode string `json:"sms_code" example:"短信模板id"` Day string `json:"day" example:" xxx小时(未签到/未登录) 隔 xx小时通知一次 (这里是 X小时,type=sign/login 的时候要显示前面的话填写 sign是未签到 login是未登录)"` NoticeDay string `json:"notice_day" example:" xxx小时(未签到/未登录) 隔 xx小时通知一次 (这里是 隔 xx小时,type=sign/login 的时候要显示前面的话填写 sign是未签到 login是未登录)"` } type NoticeSaveReq struct { - Id string `json:"id"` - Title string `json:"title"` - Content string `json:"content"` - Type string `json:"type"` - IsShow string `json:"is_show"` - + Id string `json:"id"` + Title string `json:"title"` + Content string `json:"content"` + Type string `json:"type"` + JpushOpen string `json:"jpush_open" example:"app推送开启 0关 1开"` + SmsOpen string `json:"sms_open" example:"短信推送开启 0关 1开"` + SmsCode string `json:"sms_code" example:"短信模板id"` Day string `json:"day" example:" xxx小时(未签到/未登录) 隔 xx小时通知一次 (这里是 X小时,type=sign/login 的时候要显示前面的话填写 sign是未签到 login是未登录)"` NoticeDay string `json:"notice_day" example:" xxx小时(未签到/未登录) 隔 xx小时通知一次 (这里是 隔 xx小时,type=sign/login 的时候要显示前面的话填写 sign是未签到 login是未登录)"` } diff --git a/app/router/router.go b/app/router/router.go index 09c5536..1a82c6b 100644 --- a/app/router/router.go +++ b/app/router/router.go @@ -108,20 +108,20 @@ func rAdvertising(r *gin.RouterGroup) { r.POST("/function/del", advertising.FunctionDel) } func rNotice(r *gin.RouterGroup) { + rBase := r.Group("/base") //极光 + { + rBase.POST("/list", notice.List) + rBase.POST("/save", notice.Save) + rBase.POST("/del", notice.Del) + } rJpush := r.Group("/jPush") //极光 { - rJpush.POST("/list", notice.List) - rJpush.POST("/save", notice.Save) - rJpush.POST("/del", notice.Del) rJpush.POST("/push/list", notice.PushList) rJpush.POST("/push/save", notice.PushSave) } rAliyunSms := r.Group("/aliyunSms") //阿里云短信 { rAliyunSms.POST("/file/phone", notice.AliyunSmsFilePhone) - rAliyunSms.POST("/list", notice.AliyunSmsList) - rAliyunSms.POST("/save", notice.AliyunSmsSave) - rAliyunSms.POST("/del", notice.AliyunSmsDel) rAliyunSms.GET("/sale/base", notice.AliyunSmsSaleBase) rAliyunSms.POST("/sale/save", notice.AliyunSmsSaleSave) rAliyunSms.POST("/push/list", notice.AliyunSmsPushList) diff --git a/app/svc/advertising/svc_base.go b/app/svc/advertising/svc_base.go index 63620bf..1bda5fe 100644 --- a/app/svc/advertising/svc_base.go +++ b/app/svc/advertising/svc_base.go @@ -20,7 +20,7 @@ func GetBasic(c *gin.Context) { } selsctData := []map[string]string{ {"name": "穿山甲", "value": "chuanshanjia"}, - {"name": "广点通", "value": "guangdiantong"}, + {"name": "优量汇", "value": "youlianghui"}, } AdvertisingBase := md.AdvertisingBase{ AndroidAdIsOpen: utils.IntToStr(data.AndroidAdIsOpen), diff --git a/app/svc/advertising/svc_function.go b/app/svc/advertising/svc_function.go index 65eda5d..99a5bba 100644 --- a/app/svc/advertising/svc_function.go +++ b/app/svc/advertising/svc_function.go @@ -19,11 +19,14 @@ func FunctionList(c *gin.Context) { var resp md.AdvertisingFunctionListResp noticeList := make([]md.AdvertisingFunctionList, 0) resp.SelectData = []map[string]string{ - {"name": "首页砸蛋", "value": "egg"}, - {"name": "首页签到", "value": "egg_sign"}, + {"name": "首页砸蛋(激励视频)", "value": "incentive_eggSmash"}, + {"name": "首页签到(激励视频)", "value": "incentive_eggSign"}, + {"name": "提现(激励视频)", "value": "incentive_withdraw"}, + {"name": "积分兑换(插屏)", "value": "interstitial_integralExchange"}, + {"name": "动态IM(信息流)", "value": "information_im"}, } NewAdvertisingSpaceDb := implement.NewAdvertisingSpaceDb(db.Db) - adv, _, _ := NewAdvertisingSpaceDb.FindUserFeedbackCateAndTotal("1", "1000", "", "3") + adv, _, _ := NewAdvertisingSpaceDb.FindUserFeedbackCateAndTotal("1", "1000", "", "") advList := make([]map[string]string, 0) if adv != nil { for _, v := range *adv { diff --git a/app/svc/cloud_bundle/svc_list.go b/app/svc/cloud_bundle/svc_list.go index f425baa..1dae796 100644 --- a/app/svc/cloud_bundle/svc_list.go +++ b/app/svc/cloud_bundle/svc_list.go @@ -1,6 +1,7 @@ package cloud_bundle import ( + "applet/app/cfg" "applet/app/db" "applet/app/e" "applet/app/md" @@ -8,7 +9,10 @@ import ( "applet/app/utils" "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" "code.fnuoos.com/EggPlanet/egg_models.git/src/model" + "fmt" "github.com/gin-gonic/gin" + "io" + "net/http" "strings" "time" ) @@ -84,19 +88,72 @@ func Build(c *gin.Context) { IsCombine: req.IsCombine, NewBit: strings.Join(req.Bit, ","), } + //TODO 调用打包机 + keys := "CloudBuild" + if req.Os == "2" { + keys = "CloudBuild-iOS" + } + token := "aaaaaa" + masterKey := "master" + domain := "" + if cfg.Prd == false { + masterKey = "dev" + domain = "" + } + url := "http://120.76.175.204:8080/job/" + keys + "/buildWithParameters?timestamp=" + utils.Int64ToStr(time.Now().Unix()) + "&token=" + token + "&branch=" + masterKey + "&domain=" + domain tmp.Bit = strings.Join(req.Bit, ",") - if req.IsCombine != "1" { - for _, v := range req.Bit { - tmp.Bit = v - db.Db.Insert(&tmp) - } - } else { + if req.Os == "2" { db.Db.Insert(&tmp) + url += "&id=" + utils.IntToStr(tmp.Id) + getcurl(url) + } else { + if req.IsCombine != "1" { + for _, v := range req.Bit { + for _, v1 := range req.Platform { + tmp.Bit = v + tmp.Platform = v1 + db.Db.Insert(&tmp) + url += "&id=" + utils.IntToStr(tmp.Id) + getcurl(url) + } + } + } else { + for _, v1 := range req.Platform { + tmp.Platform = v1 + db.Db.Insert(&tmp) + url += "&id=" + utils.IntToStr(tmp.Id) + getcurl(url) + } + } } - //TODO 调用打包机 + e.OutSuc(c, "success", nil) return } +func getcurl(url string) (string, error) { + client := &http.Client{} + // 创建请求 + request, err := http.NewRequest("GET", url, nil) + if err != nil { + return "", err + } + // 设置用户名和密码,这里的"user:password"是用户名和密码的组合,中间不能有空格 + request.SetBasicAuth("fnuoos", "11ad0050eef8521bc85f1c06ebf018654b") + // 发送请求 + response, err := client.Do(request) + if err != nil { + return "", err + + } + // 读取响应内容 + defer response.Body.Close() + body, err := io.ReadAll(response.Body) + if err != nil { + return "", err + } + fmt.Println(string(body)) + return string(body), nil +} func Del(c *gin.Context) { var req *md.ArticleDelReq if err := c.ShouldBindJSON(&req); err != nil { diff --git a/app/svc/notice/svc_aliyun_sms.go b/app/svc/notice/svc_aliyun_sms.go index f2367ed..dbc99be 100644 --- a/app/svc/notice/svc_aliyun_sms.go +++ b/app/svc/notice/svc_aliyun_sms.go @@ -102,7 +102,6 @@ func AliyunSmsSave(c *gin.Context) { data.Title = req.Title data.Day = utils.StrToInt(req.Day) data.NoticeDay = utils.StrToInt(req.NoticeDay) - data.IsShow = utils.StrToInt(req.IsShow) db.Db.Where("id=?", data.Id).Update(data) e.OutSuc(c, "success", nil) return diff --git a/app/svc/notice/svc_notice.go b/app/svc/notice/svc_notice.go index 4541c5d..578948c 100644 --- a/app/svc/notice/svc_notice.go +++ b/app/svc/notice/svc_notice.go @@ -27,7 +27,7 @@ func List(c *gin.Context) { {"name": "手机号", "value": "{手机号}"}, {"name": "金额", "value": "{金额}"}, {"name": "时间", "value": "{时间}"}, - {"name": "未登陆天数", "value": "{未登陆天数}"}, + {"name": "小时", "value": "{小时}"}, {"name": "升级后等级", "value": "{升级后等级}"}, } resp.SelectData = []map[string]string{ @@ -42,7 +42,9 @@ func List(c *gin.Context) { Id: utils.IntToStr(v.Id), Day: utils.IntToStr(v.Day), NoticeDay: utils.IntToStr(v.NoticeDay), - IsShow: utils.IntToStr(v.IsShow), + JpushOpen: utils.IntToStr(v.JpushOpen), + SmsOpen: utils.IntToStr(v.SmsOpen), + SmsCode: v.SmsCode, Title: v.Title, Content: v.Content, Type: v.Type, @@ -79,7 +81,6 @@ func Save(c *gin.Context) { data.Title = req.Title data.Day = utils.StrToInt(req.Day) data.NoticeDay = utils.StrToInt(req.NoticeDay) - data.IsShow = utils.StrToInt(req.IsShow) db.Db.Where("id=?", data.Id).Update(data) e.OutSuc(c, "success", nil) return diff --git a/docs/docs.go b/docs/docs.go index d6dfbed..b4f2ca9 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -1,4 +1,5 @@ -// Package docs Code generated by swaggo/swag. DO NOT EDIT +// Code generated by swaggo/swag. DO NOT EDIT. + package docs import "github.com/swaggo/swag" @@ -760,7 +761,7 @@ const docTemplate = `{ }, "/api/cloudBundle/audit/clear": { "post": { - "description": "基本设置-云打包-清除审核模板", + "description": "云打包-云打包-清除审核模板", "consumes": [ "application/json" ], @@ -768,9 +769,9 @@ const docTemplate = `{ "application/json" ], "tags": [ - "基本设置" + "云打包" ], - "summary": "基本设置-云打包-清除审核模板", + "summary": "云打包-云打包-清除审核模板", "parameters": [ { "type": "string", @@ -807,7 +808,7 @@ const docTemplate = `{ }, "/api/cloudBundle/audit/set": { "post": { - "description": "基本设置-云打包-设置为审核模板", + "description": "云打包-云打包-设置为审核模板", "consumes": [ "application/json" ], @@ -815,9 +816,9 @@ const docTemplate = `{ "application/json" ], "tags": [ - "基本设置" + "云打包" ], - "summary": "基本设置-云打包-设置为审核模板", + "summary": "云打包-云打包-设置为审核模板", "parameters": [ { "type": "string", @@ -892,7 +893,7 @@ const docTemplate = `{ }, "/api/cloudBundle/build": { "post": { - "description": "基本设置-云打包操作", + "description": "云打包-云打包操作", "consumes": [ "application/json" ], @@ -900,9 +901,9 @@ const docTemplate = `{ "application/json" ], "tags": [ - "基本设置" + "云打包" ], - "summary": "基本设置-云打包操作", + "summary": "云打包-云打包操作", "parameters": [ { "type": "string", @@ -939,7 +940,7 @@ const docTemplate = `{ }, "/api/cloudBundle/del": { "post": { - "description": "基本设置-云打包删除", + "description": "云打包-云打包删除", "consumes": [ "application/json" ], @@ -947,9 +948,9 @@ const docTemplate = `{ "application/json" ], "tags": [ - "基本设置" + "云打包" ], - "summary": "基本设置-云打包删除", + "summary": "云打包-云打包删除", "parameters": [ { "type": "string", @@ -986,7 +987,7 @@ const docTemplate = `{ }, "/api/cloudBundle/img/base": { "get": { - "description": "基本配置-图片配置", + "description": "云打包-图片配置", "consumes": [ "application/json" ], @@ -994,9 +995,9 @@ const docTemplate = `{ "application/json" ], "tags": [ - "基本配置" + "云打包" ], - "summary": "基本配置-云打包-图片配置", + "summary": "云打包-云打包-图片配置", "parameters": [ { "type": "string", @@ -1024,7 +1025,7 @@ const docTemplate = `{ }, "/api/cloudBundle/img/base/save": { "post": { - "description": "基本配置-图片配置", + "description": "云打包-图片配置", "consumes": [ "application/json" ], @@ -1032,9 +1033,9 @@ const docTemplate = `{ "application/json" ], "tags": [ - "基本配置" + "云打包" ], - "summary": "基本配置-图片配置", + "summary": "云打包-图片配置", "parameters": [ { "type": "string", @@ -1071,7 +1072,7 @@ const docTemplate = `{ }, "/api/cloudBundle/list": { "post": { - "description": "基本设置-云打包版本列表", + "description": "云打包-云打包版本列表", "consumes": [ "application/json" ], @@ -1079,9 +1080,9 @@ const docTemplate = `{ "application/json" ], "tags": [ - "基本设置" + "云打包" ], - "summary": "基本设置-云打包版本列表", + "summary": "云打包-云打包版本列表", "parameters": [ { "type": "string", @@ -1165,7 +1166,7 @@ const docTemplate = `{ }, "/api/cloudBundle/version/base": { "get": { - "description": "基本配置-图片配置", + "description": "云打包-图片配置", "consumes": [ "application/json" ], @@ -1173,9 +1174,9 @@ const docTemplate = `{ "application/json" ], "tags": [ - "基本配置" + "云打包" ], - "summary": "基本配置-云打包-图片配置", + "summary": "云打包-云打包-图片配置", "parameters": [ { "type": "string", @@ -1203,7 +1204,7 @@ const docTemplate = `{ }, "/api/cloudBundle/version/base/save": { "post": { - "description": "基本配置-图片配置", + "description": "云打包-图片配置", "consumes": [ "application/json" ], @@ -1211,9 +1212,9 @@ const docTemplate = `{ "application/json" ], "tags": [ - "基本配置" + "云打包" ], - "summary": "基本配置-图片配置", + "summary": "云打包-图片配置", "parameters": [ { "type": "string", @@ -1352,7 +1353,9 @@ const docTemplate = `{ "name": "req", "in": "body", "required": true, - "schema": {} + "schema": { + "type": "object" + } } ], "responses": { @@ -5282,53 +5285,6 @@ const docTemplate = `{ } } }, - "/api/notice/aliyunSms/del": { - "post": { - "description": "短信推送记录-通知模板删除", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "消息中心" - ], - "summary": "消息中心-短信推送记录-通知模板删除", - "parameters": [ - { - "type": "string", - "description": "验证参数Bearer和token空格拼接", - "name": "Authorization", - "in": "header", - "required": true - }, - { - "description": "(分页信息必填)", - "name": "req", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/md.NoticeDelReq" - } - } - ], - "responses": { - "200": { - "description": "具体数据", - "schema": { - "type": "string" - } - }, - "400": { - "description": "具体错误", - "schema": { - "$ref": "#/definitions/md.Response" - } - } - } - } - }, "/api/notice/aliyunSms/file/phone": { "post": { "description": "短信推送记录-通知模板", @@ -5374,53 +5330,6 @@ const docTemplate = `{ } } }, - "/api/notice/aliyunSms/list": { - "get": { - "description": "短信推送记录-通知模板", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "消息中心" - ], - "summary": "消息中心-短信推送记录-通知模板(跟app推送记录的通知模板一样的效果)", - "parameters": [ - { - "type": "string", - "description": "验证参数Bearer和token空格拼接", - "name": "Authorization", - "in": "header", - "required": true - }, - { - "description": "(分页信息必填)", - "name": "req", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/md.NoticeAliyunSmsListReq" - } - } - ], - "responses": { - "200": { - "description": "具体数据", - "schema": { - "$ref": "#/definitions/md.NoticeAliyunSmsListResp" - } - }, - "400": { - "description": "具体错误", - "schema": { - "$ref": "#/definitions/md.Response" - } - } - } - } - }, "/api/notice/aliyunSms/push/list": { "post": { "description": "短信推送记录-推送记录列表", @@ -5600,9 +5509,9 @@ const docTemplate = `{ } } }, - "/api/notice/aliyunSms/save": { + "/api/notice/base/del": { "post": { - "description": "短信推送记录-通知模板添加编辑", + "description": "基本配置-通知模板删除", "consumes": [ "application/json" ], @@ -5612,54 +5521,7 @@ const docTemplate = `{ "tags": [ "消息中心" ], - "summary": "消息中心-短信推送记录-通知模板添加编辑", - "parameters": [ - { - "type": "string", - "description": "验证参数Bearer和token空格拼接", - "name": "Authorization", - "in": "header", - "required": true - }, - { - "description": "参数", - "name": "req", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/md.NoticeAliyunSmsSaveReq" - } - } - ], - "responses": { - "200": { - "description": "具体数据", - "schema": { - "type": "string" - } - }, - "400": { - "description": "具体错误", - "schema": { - "$ref": "#/definitions/md.Response" - } - } - } - } - }, - "/api/notice/jPush/del": { - "post": { - "description": "APP推送记录-通知模板删除", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "消息中心" - ], - "summary": "消息中心-APP推送记录-通知模板删除", + "summary": "消息中心-基本配置-通知模板删除", "parameters": [ { "type": "string", @@ -5694,9 +5556,9 @@ const docTemplate = `{ } } }, - "/api/notice/jPush/list": { + "/api/notice/base/list": { "post": { - "description": "APP推送记录-通知模板", + "description": "基本配置-通知模板", "consumes": [ "application/json" ], @@ -5706,7 +5568,7 @@ const docTemplate = `{ "tags": [ "消息中心" ], - "summary": "消息中心-APP推送记录-通知模板", + "summary": "消息中心-基本配置-通知模板", "parameters": [ { "type": "string", @@ -5741,9 +5603,9 @@ const docTemplate = `{ } } }, - "/api/notice/jPush/push/list": { + "/api/notice/base/save": { "post": { - "description": "APP推送记录-推送记录列表", + "description": "基本配置-通知模板添加编辑", "consumes": [ "application/json" ], @@ -5753,7 +5615,7 @@ const docTemplate = `{ "tags": [ "消息中心" ], - "summary": "消息中心-APP推送记录-推送记录列表", + "summary": "消息中心-基本配置-通知模板添加编辑", "parameters": [ { "type": "string", @@ -5768,7 +5630,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/md.NoticeListReq" + "$ref": "#/definitions/md.NoticeSaveReq" } } ], @@ -5776,7 +5638,7 @@ const docTemplate = `{ "200": { "description": "具体数据", "schema": { - "$ref": "#/definitions/md.NoticePushListResp" + "type": "string" } }, "400": { @@ -5788,9 +5650,9 @@ const docTemplate = `{ } } }, - "/api/notice/jPush/push/save": { + "/api/notice/jPush/push/list": { "post": { - "description": "APP推送记录-推送记录添加-发送 (不做编辑了)", + "description": "基本配置-推送记录列表", "consumes": [ "application/json" ], @@ -5800,7 +5662,7 @@ const docTemplate = `{ "tags": [ "消息中心" ], - "summary": "消息中心-APP推送记录-推送记录添加-发送(不做编辑了)", + "summary": "消息中心-基本配置-推送记录列表", "parameters": [ { "type": "string", @@ -5815,7 +5677,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/md.NoticeSaveReq" + "$ref": "#/definitions/md.NoticeListReq" } } ], @@ -5823,7 +5685,7 @@ const docTemplate = `{ "200": { "description": "具体数据", "schema": { - "type": "string" + "$ref": "#/definitions/md.NoticePushListResp" } }, "400": { @@ -5835,9 +5697,9 @@ const docTemplate = `{ } } }, - "/api/notice/jPush/save": { + "/api/notice/jPush/push/save": { "post": { - "description": "APP推送记录-通知模板添加编辑", + "description": "基本配置-推送记录添加-发送 (不做编辑了)", "consumes": [ "application/json" ], @@ -5847,7 +5709,7 @@ const docTemplate = `{ "tags": [ "消息中心" ], - "summary": "消息中心-APP推送记录-通知模板添加编辑", + "summary": "消息中心-基本配置-推送记录添加-发送(不做编辑了)", "parameters": [ { "type": "string", @@ -7029,7 +6891,7 @@ const docTemplate = `{ }, "info": { "type": "string", - "example": "广告位配置 {\"chuanshanjia\":{\"android_ad_id\":[\"\"],\"ios_ad_id\":[\"\"]}}" + "example": "广告位配置 {\"chuanshanjia\":{\"android_ad_id\":[{\"id\":\"\",\"key\":\"\"}],\"ios_ad_id\":[{\"id\":\"\",\"key\":\"\"}}}" }, "kind": { "type": "string", @@ -7093,7 +6955,7 @@ const docTemplate = `{ }, "info": { "type": "string", - "example": "广告位配置 {\"chuanshanjia\":{\"android_ad_id\":[\"\"],\"ios_ad_id\":[\"\"]}}" + "example": "广告位配置 {\"chuanshanjia\":{\"android_ad_id\":[{\"id\":\"\",\"key\":\"\"}],\"ios_ad_id\":[{\"id\":\"\",\"key\":\"\"}}}" }, "kind": { "type": "string", @@ -7503,6 +7365,12 @@ const docTemplate = `{ "os": { "type": "string" }, + "platform": { + "type": "array", + "items": { + "type": "string" + } + }, "version": { "type": "string" } @@ -9876,13 +9744,22 @@ const docTemplate = `{ "id": { "type": "string" }, - "is_show": { - "type": "string" + "jpush_open": { + "type": "string", + "example": "app推送开启 0关 1开" }, "notice_day": { "type": "string", "example": " xxx小时(未签到/未登录) 隔 xx小时通知一次 (这里是 隔 xx小时,type=sign/login 的时候要显示前面的话填写 sign是未签到 login是未登录)" }, + "sms_code": { + "type": "string", + "example": "短信模板id" + }, + "sms_open": { + "type": "string", + "example": "短信推送开启 0关 1开" + }, "title": { "type": "string" }, @@ -10017,13 +9894,22 @@ const docTemplate = `{ "id": { "type": "string" }, - "is_show": { - "type": "string" + "jpush_open": { + "type": "string", + "example": "app推送开启 0关 1开" }, "notice_day": { "type": "string", "example": " xxx小时(未签到/未登录) 隔 xx小时通知一次 (这里是 隔 xx小时,type=sign/login 的时候要显示前面的话填写 sign是未签到 login是未登录)" }, + "sms_code": { + "type": "string", + "example": "短信模板id" + }, + "sms_open": { + "type": "string", + "example": "短信推送开启 0关 1开" + }, "title": { "type": "string" }, @@ -12265,8 +12151,6 @@ var SwaggerInfo = &swag.Spec{ Description: "管理后台接口文档", InfoInstanceName: "swagger", SwaggerTemplate: docTemplate, - LeftDelim: "{{", - RightDelim: "}}", } func init() { diff --git a/docs/swagger.json b/docs/swagger.json index 8659767..077144a 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -753,7 +753,7 @@ }, "/api/cloudBundle/audit/clear": { "post": { - "description": "基本设置-云打包-清除审核模板", + "description": "云打包-云打包-清除审核模板", "consumes": [ "application/json" ], @@ -761,9 +761,9 @@ "application/json" ], "tags": [ - "基本设置" + "云打包" ], - "summary": "基本设置-云打包-清除审核模板", + "summary": "云打包-云打包-清除审核模板", "parameters": [ { "type": "string", @@ -800,7 +800,7 @@ }, "/api/cloudBundle/audit/set": { "post": { - "description": "基本设置-云打包-设置为审核模板", + "description": "云打包-云打包-设置为审核模板", "consumes": [ "application/json" ], @@ -808,9 +808,9 @@ "application/json" ], "tags": [ - "基本设置" + "云打包" ], - "summary": "基本设置-云打包-设置为审核模板", + "summary": "云打包-云打包-设置为审核模板", "parameters": [ { "type": "string", @@ -885,7 +885,7 @@ }, "/api/cloudBundle/build": { "post": { - "description": "基本设置-云打包操作", + "description": "云打包-云打包操作", "consumes": [ "application/json" ], @@ -893,9 +893,9 @@ "application/json" ], "tags": [ - "基本设置" + "云打包" ], - "summary": "基本设置-云打包操作", + "summary": "云打包-云打包操作", "parameters": [ { "type": "string", @@ -932,7 +932,7 @@ }, "/api/cloudBundle/del": { "post": { - "description": "基本设置-云打包删除", + "description": "云打包-云打包删除", "consumes": [ "application/json" ], @@ -940,9 +940,9 @@ "application/json" ], "tags": [ - "基本设置" + "云打包" ], - "summary": "基本设置-云打包删除", + "summary": "云打包-云打包删除", "parameters": [ { "type": "string", @@ -979,7 +979,7 @@ }, "/api/cloudBundle/img/base": { "get": { - "description": "基本配置-图片配置", + "description": "云打包-图片配置", "consumes": [ "application/json" ], @@ -987,9 +987,9 @@ "application/json" ], "tags": [ - "基本配置" + "云打包" ], - "summary": "基本配置-云打包-图片配置", + "summary": "云打包-云打包-图片配置", "parameters": [ { "type": "string", @@ -1017,7 +1017,7 @@ }, "/api/cloudBundle/img/base/save": { "post": { - "description": "基本配置-图片配置", + "description": "云打包-图片配置", "consumes": [ "application/json" ], @@ -1025,9 +1025,9 @@ "application/json" ], "tags": [ - "基本配置" + "云打包" ], - "summary": "基本配置-图片配置", + "summary": "云打包-图片配置", "parameters": [ { "type": "string", @@ -1064,7 +1064,7 @@ }, "/api/cloudBundle/list": { "post": { - "description": "基本设置-云打包版本列表", + "description": "云打包-云打包版本列表", "consumes": [ "application/json" ], @@ -1072,9 +1072,9 @@ "application/json" ], "tags": [ - "基本设置" + "云打包" ], - "summary": "基本设置-云打包版本列表", + "summary": "云打包-云打包版本列表", "parameters": [ { "type": "string", @@ -1158,7 +1158,7 @@ }, "/api/cloudBundle/version/base": { "get": { - "description": "基本配置-图片配置", + "description": "云打包-图片配置", "consumes": [ "application/json" ], @@ -1166,9 +1166,9 @@ "application/json" ], "tags": [ - "基本配置" + "云打包" ], - "summary": "基本配置-云打包-图片配置", + "summary": "云打包-云打包-图片配置", "parameters": [ { "type": "string", @@ -1196,7 +1196,7 @@ }, "/api/cloudBundle/version/base/save": { "post": { - "description": "基本配置-图片配置", + "description": "云打包-图片配置", "consumes": [ "application/json" ], @@ -1204,9 +1204,9 @@ "application/json" ], "tags": [ - "基本配置" + "云打包" ], - "summary": "基本配置-图片配置", + "summary": "云打包-图片配置", "parameters": [ { "type": "string", @@ -1345,7 +1345,9 @@ "name": "req", "in": "body", "required": true, - "schema": {} + "schema": { + "type": "object" + } } ], "responses": { @@ -5275,53 +5277,6 @@ } } }, - "/api/notice/aliyunSms/del": { - "post": { - "description": "短信推送记录-通知模板删除", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "消息中心" - ], - "summary": "消息中心-短信推送记录-通知模板删除", - "parameters": [ - { - "type": "string", - "description": "验证参数Bearer和token空格拼接", - "name": "Authorization", - "in": "header", - "required": true - }, - { - "description": "(分页信息必填)", - "name": "req", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/md.NoticeDelReq" - } - } - ], - "responses": { - "200": { - "description": "具体数据", - "schema": { - "type": "string" - } - }, - "400": { - "description": "具体错误", - "schema": { - "$ref": "#/definitions/md.Response" - } - } - } - } - }, "/api/notice/aliyunSms/file/phone": { "post": { "description": "短信推送记录-通知模板", @@ -5367,53 +5322,6 @@ } } }, - "/api/notice/aliyunSms/list": { - "get": { - "description": "短信推送记录-通知模板", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "消息中心" - ], - "summary": "消息中心-短信推送记录-通知模板(跟app推送记录的通知模板一样的效果)", - "parameters": [ - { - "type": "string", - "description": "验证参数Bearer和token空格拼接", - "name": "Authorization", - "in": "header", - "required": true - }, - { - "description": "(分页信息必填)", - "name": "req", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/md.NoticeAliyunSmsListReq" - } - } - ], - "responses": { - "200": { - "description": "具体数据", - "schema": { - "$ref": "#/definitions/md.NoticeAliyunSmsListResp" - } - }, - "400": { - "description": "具体错误", - "schema": { - "$ref": "#/definitions/md.Response" - } - } - } - } - }, "/api/notice/aliyunSms/push/list": { "post": { "description": "短信推送记录-推送记录列表", @@ -5593,9 +5501,9 @@ } } }, - "/api/notice/aliyunSms/save": { + "/api/notice/base/del": { "post": { - "description": "短信推送记录-通知模板添加编辑", + "description": "基本配置-通知模板删除", "consumes": [ "application/json" ], @@ -5605,54 +5513,7 @@ "tags": [ "消息中心" ], - "summary": "消息中心-短信推送记录-通知模板添加编辑", - "parameters": [ - { - "type": "string", - "description": "验证参数Bearer和token空格拼接", - "name": "Authorization", - "in": "header", - "required": true - }, - { - "description": "参数", - "name": "req", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/md.NoticeAliyunSmsSaveReq" - } - } - ], - "responses": { - "200": { - "description": "具体数据", - "schema": { - "type": "string" - } - }, - "400": { - "description": "具体错误", - "schema": { - "$ref": "#/definitions/md.Response" - } - } - } - } - }, - "/api/notice/jPush/del": { - "post": { - "description": "APP推送记录-通知模板删除", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "消息中心" - ], - "summary": "消息中心-APP推送记录-通知模板删除", + "summary": "消息中心-基本配置-通知模板删除", "parameters": [ { "type": "string", @@ -5687,9 +5548,9 @@ } } }, - "/api/notice/jPush/list": { + "/api/notice/base/list": { "post": { - "description": "APP推送记录-通知模板", + "description": "基本配置-通知模板", "consumes": [ "application/json" ], @@ -5699,7 +5560,7 @@ "tags": [ "消息中心" ], - "summary": "消息中心-APP推送记录-通知模板", + "summary": "消息中心-基本配置-通知模板", "parameters": [ { "type": "string", @@ -5734,9 +5595,9 @@ } } }, - "/api/notice/jPush/push/list": { + "/api/notice/base/save": { "post": { - "description": "APP推送记录-推送记录列表", + "description": "基本配置-通知模板添加编辑", "consumes": [ "application/json" ], @@ -5746,7 +5607,7 @@ "tags": [ "消息中心" ], - "summary": "消息中心-APP推送记录-推送记录列表", + "summary": "消息中心-基本配置-通知模板添加编辑", "parameters": [ { "type": "string", @@ -5761,7 +5622,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/md.NoticeListReq" + "$ref": "#/definitions/md.NoticeSaveReq" } } ], @@ -5769,7 +5630,7 @@ "200": { "description": "具体数据", "schema": { - "$ref": "#/definitions/md.NoticePushListResp" + "type": "string" } }, "400": { @@ -5781,9 +5642,9 @@ } } }, - "/api/notice/jPush/push/save": { + "/api/notice/jPush/push/list": { "post": { - "description": "APP推送记录-推送记录添加-发送 (不做编辑了)", + "description": "基本配置-推送记录列表", "consumes": [ "application/json" ], @@ -5793,7 +5654,7 @@ "tags": [ "消息中心" ], - "summary": "消息中心-APP推送记录-推送记录添加-发送(不做编辑了)", + "summary": "消息中心-基本配置-推送记录列表", "parameters": [ { "type": "string", @@ -5808,7 +5669,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/md.NoticeSaveReq" + "$ref": "#/definitions/md.NoticeListReq" } } ], @@ -5816,7 +5677,7 @@ "200": { "description": "具体数据", "schema": { - "type": "string" + "$ref": "#/definitions/md.NoticePushListResp" } }, "400": { @@ -5828,9 +5689,9 @@ } } }, - "/api/notice/jPush/save": { + "/api/notice/jPush/push/save": { "post": { - "description": "APP推送记录-通知模板添加编辑", + "description": "基本配置-推送记录添加-发送 (不做编辑了)", "consumes": [ "application/json" ], @@ -5840,7 +5701,7 @@ "tags": [ "消息中心" ], - "summary": "消息中心-APP推送记录-通知模板添加编辑", + "summary": "消息中心-基本配置-推送记录添加-发送(不做编辑了)", "parameters": [ { "type": "string", @@ -7022,7 +6883,7 @@ }, "info": { "type": "string", - "example": "广告位配置 {\"chuanshanjia\":{\"android_ad_id\":[\"\"],\"ios_ad_id\":[\"\"]}}" + "example": "广告位配置 {\"chuanshanjia\":{\"android_ad_id\":[{\"id\":\"\",\"key\":\"\"}],\"ios_ad_id\":[{\"id\":\"\",\"key\":\"\"}}}" }, "kind": { "type": "string", @@ -7086,7 +6947,7 @@ }, "info": { "type": "string", - "example": "广告位配置 {\"chuanshanjia\":{\"android_ad_id\":[\"\"],\"ios_ad_id\":[\"\"]}}" + "example": "广告位配置 {\"chuanshanjia\":{\"android_ad_id\":[{\"id\":\"\",\"key\":\"\"}],\"ios_ad_id\":[{\"id\":\"\",\"key\":\"\"}}}" }, "kind": { "type": "string", @@ -7496,6 +7357,12 @@ "os": { "type": "string" }, + "platform": { + "type": "array", + "items": { + "type": "string" + } + }, "version": { "type": "string" } @@ -9869,13 +9736,22 @@ "id": { "type": "string" }, - "is_show": { - "type": "string" + "jpush_open": { + "type": "string", + "example": "app推送开启 0关 1开" }, "notice_day": { "type": "string", "example": " xxx小时(未签到/未登录) 隔 xx小时通知一次 (这里是 隔 xx小时,type=sign/login 的时候要显示前面的话填写 sign是未签到 login是未登录)" }, + "sms_code": { + "type": "string", + "example": "短信模板id" + }, + "sms_open": { + "type": "string", + "example": "短信推送开启 0关 1开" + }, "title": { "type": "string" }, @@ -10010,13 +9886,22 @@ "id": { "type": "string" }, - "is_show": { - "type": "string" + "jpush_open": { + "type": "string", + "example": "app推送开启 0关 1开" }, "notice_day": { "type": "string", "example": " xxx小时(未签到/未登录) 隔 xx小时通知一次 (这里是 隔 xx小时,type=sign/login 的时候要显示前面的话填写 sign是未签到 login是未登录)" }, + "sms_code": { + "type": "string", + "example": "短信模板id" + }, + "sms_open": { + "type": "string", + "example": "短信推送开启 0关 1开" + }, "title": { "type": "string" }, diff --git a/docs/swagger.yaml b/docs/swagger.yaml index cedb6fe..fd6a939 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -481,7 +481,7 @@ definitions: id: type: string info: - example: 广告位配置 {"chuanshanjia":{"android_ad_id":[""],"ios_ad_id":[""]}} + example: 广告位配置 {"chuanshanjia":{"android_ad_id":[{"id":"","key":""}],"ios_ad_id":[{"id":"","key":""}}} type: string kind: example: 广告类型(1:开屏广告 2:插屏广告 3:激励视频 4:信息流广告 5:全屏视频) @@ -524,7 +524,7 @@ definitions: id: type: string info: - example: 广告位配置 {"chuanshanjia":{"android_ad_id":[""],"ios_ad_id":[""]}} + example: 广告位配置 {"chuanshanjia":{"android_ad_id":[{"id":"","key":""}],"ios_ad_id":[{"id":"","key":""}}} type: string kind: example: 广告类型(1:开屏广告 2:插屏广告 3:激励视频 4:信息流广告 5:全屏视频) @@ -807,6 +807,10 @@ definitions: type: string os: type: string + platform: + items: + type: string + type: array version: type: string type: object @@ -2459,12 +2463,19 @@ definitions: type: string id: type: string - is_show: + jpush_open: + example: app推送开启 0关 1开 type: string notice_day: example: ' xxx小时(未签到/未登录) 隔 xx小时通知一次 (这里是 隔 xx小时,type=sign/login 的时候要显示前面的话填写 sign是未签到 login是未登录)' type: string + sms_code: + example: 短信模板id + type: string + sms_open: + example: 短信推送开启 0关 1开 + type: string title: type: string type: @@ -2556,12 +2567,19 @@ definitions: type: string id: type: string - is_show: + jpush_open: + example: app推送开启 0关 1开 type: string notice_day: example: ' xxx小时(未签到/未登录) 隔 xx小时通知一次 (这里是 隔 xx小时,type=sign/login 的时候要显示前面的话填写 sign是未签到 login是未登录)' type: string + sms_code: + example: 短信模板id + type: string + sms_open: + example: 短信推送开启 0关 1开 + type: string title: type: string type: @@ -4609,7 +4627,7 @@ paths: post: consumes: - application/json - description: 基本设置-云打包-清除审核模板 + description: 云打包-云打包-清除审核模板 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -4633,14 +4651,14 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 基本设置-云打包-清除审核模板 + summary: 云打包-云打包-清除审核模板 tags: - - 基本设置 + - 云打包 /api/cloudBundle/audit/set: post: consumes: - application/json - description: 基本设置-云打包-设置为审核模板 + description: 云打包-云打包-设置为审核模板 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -4664,9 +4682,9 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 基本设置-云打包-设置为审核模板 + summary: 云打包-云打包-设置为审核模板 tags: - - 基本设置 + - 云打包 /api/cloudBundle/base: get: consumes: @@ -4696,7 +4714,7 @@ paths: post: consumes: - application/json - description: 基本设置-云打包操作 + description: 云打包-云打包操作 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -4720,14 +4738,14 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 基本设置-云打包操作 + summary: 云打包-云打包操作 tags: - - 基本设置 + - 云打包 /api/cloudBundle/del: post: consumes: - application/json - description: 基本设置-云打包删除 + description: 云打包-云打包删除 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -4751,14 +4769,14 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 基本设置-云打包删除 + summary: 云打包-云打包删除 tags: - - 基本设置 + - 云打包 /api/cloudBundle/img/base: get: consumes: - application/json - description: 基本配置-图片配置 + description: 云打包-图片配置 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -4776,14 +4794,14 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 基本配置-云打包-图片配置 + summary: 云打包-云打包-图片配置 tags: - - 基本配置 + - 云打包 /api/cloudBundle/img/base/save: post: consumes: - application/json - description: 基本配置-图片配置 + description: 云打包-图片配置 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -4807,14 +4825,14 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 基本配置-图片配置 + summary: 云打包-图片配置 tags: - - 基本配置 + - 云打包 /api/cloudBundle/list: post: consumes: - application/json - description: 基本设置-云打包版本列表 + description: 云打包-云打包版本列表 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -4838,9 +4856,9 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 基本设置-云打包版本列表 + summary: 云打包-云打包版本列表 tags: - - 基本设置 + - 云打包 /api/cloudBundle/upload: post: consumes: @@ -4876,7 +4894,7 @@ paths: get: consumes: - application/json - description: 基本配置-图片配置 + description: 云打包-图片配置 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -4894,14 +4912,14 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 基本配置-云打包-图片配置 + summary: 云打包-云打包-图片配置 tags: - - 基本配置 + - 云打包 /api/cloudBundle/version/base/save: post: consumes: - application/json - description: 基本配置-图片配置 + description: 云打包-图片配置 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -4925,9 +4943,9 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 基本配置-图片配置 + summary: 云打包-图片配置 tags: - - 基本配置 + - 云打包 /api/comm/getOssUrl: post: consumes: @@ -4994,7 +5012,8 @@ paths: in: body name: req required: true - schema: {} + schema: + type: object produces: - application/json responses: @@ -7595,37 +7614,6 @@ paths: summary: 制度中心-会员中心-用户管理-会员明细概况(获取) tags: - 会员中心 - /api/notice/aliyunSms/del: - post: - consumes: - - application/json - description: 短信推送记录-通知模板删除 - parameters: - - description: 验证参数Bearer和token空格拼接 - in: header - name: Authorization - required: true - type: string - - description: (分页信息必填) - in: body - name: req - required: true - schema: - $ref: '#/definitions/md.NoticeDelReq' - produces: - - application/json - responses: - "200": - description: 具体数据 - schema: - type: string - "400": - description: 具体错误 - schema: - $ref: '#/definitions/md.Response' - summary: 消息中心-短信推送记录-通知模板删除 - tags: - - 消息中心 /api/notice/aliyunSms/file/phone: post: consumes: @@ -7656,37 +7644,6 @@ paths: summary: 消息中心-短信推送记录-通知模板 tags: - 消息中心 - /api/notice/aliyunSms/list: - get: - consumes: - - application/json - description: 短信推送记录-通知模板 - parameters: - - description: 验证参数Bearer和token空格拼接 - in: header - name: Authorization - required: true - type: string - - description: (分页信息必填) - in: body - name: req - required: true - schema: - $ref: '#/definitions/md.NoticeAliyunSmsListReq' - produces: - - application/json - responses: - "200": - description: 具体数据 - schema: - $ref: '#/definitions/md.NoticeAliyunSmsListResp' - "400": - description: 具体错误 - schema: - $ref: '#/definitions/md.Response' - summary: 消息中心-短信推送记录-通知模板(跟app推送记录的通知模板一样的效果) - tags: - - 消息中心 /api/notice/aliyunSms/push/list: post: consumes: @@ -7805,42 +7762,11 @@ paths: summary: 消息中心-短信推送记录-营销短信-通知模板添加编辑 tags: - 消息中心 - /api/notice/aliyunSms/save: - post: - consumes: - - application/json - description: 短信推送记录-通知模板添加编辑 - parameters: - - description: 验证参数Bearer和token空格拼接 - in: header - name: Authorization - required: true - type: string - - description: 参数 - in: body - name: req - required: true - schema: - $ref: '#/definitions/md.NoticeAliyunSmsSaveReq' - produces: - - application/json - responses: - "200": - description: 具体数据 - schema: - type: string - "400": - description: 具体错误 - schema: - $ref: '#/definitions/md.Response' - summary: 消息中心-短信推送记录-通知模板添加编辑 - tags: - - 消息中心 - /api/notice/jPush/del: + /api/notice/base/del: post: consumes: - application/json - description: APP推送记录-通知模板删除 + description: 基本配置-通知模板删除 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -7864,14 +7790,14 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 消息中心-APP推送记录-通知模板删除 + summary: 消息中心-基本配置-通知模板删除 tags: - 消息中心 - /api/notice/jPush/list: + /api/notice/base/list: post: consumes: - application/json - description: APP推送记录-通知模板 + description: 基本配置-通知模板 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -7895,14 +7821,14 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 消息中心-APP推送记录-通知模板 + summary: 消息中心-基本配置-通知模板 tags: - 消息中心 - /api/notice/jPush/push/list: + /api/notice/base/save: post: consumes: - application/json - description: APP推送记录-推送记录列表 + description: 基本配置-通知模板添加编辑 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -7914,26 +7840,26 @@ paths: name: req required: true schema: - $ref: '#/definitions/md.NoticeListReq' + $ref: '#/definitions/md.NoticeSaveReq' produces: - application/json responses: "200": description: 具体数据 schema: - $ref: '#/definitions/md.NoticePushListResp' + type: string "400": description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 消息中心-APP推送记录-推送记录列表 + summary: 消息中心-基本配置-通知模板添加编辑 tags: - 消息中心 - /api/notice/jPush/push/save: + /api/notice/jPush/push/list: post: consumes: - application/json - description: APP推送记录-推送记录添加-发送 (不做编辑了) + description: 基本配置-推送记录列表 parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -7945,26 +7871,26 @@ paths: name: req required: true schema: - $ref: '#/definitions/md.NoticeSaveReq' + $ref: '#/definitions/md.NoticeListReq' produces: - application/json responses: "200": description: 具体数据 schema: - type: string + $ref: '#/definitions/md.NoticePushListResp' "400": description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 消息中心-APP推送记录-推送记录添加-发送(不做编辑了) + summary: 消息中心-基本配置-推送记录列表 tags: - 消息中心 - /api/notice/jPush/save: + /api/notice/jPush/push/save: post: consumes: - application/json - description: APP推送记录-通知模板添加编辑 + description: 基本配置-推送记录添加-发送 (不做编辑了) parameters: - description: 验证参数Bearer和token空格拼接 in: header @@ -7988,7 +7914,7 @@ paths: description: 具体错误 schema: $ref: '#/definitions/md.Response' - summary: 消息中心-APP推送记录-通知模板添加编辑 + summary: 消息中心-基本配置-推送记录添加-发送(不做编辑了) tags: - 消息中心 /api/settCenter/oss/aliYun/getBasic: diff --git a/go.mod b/go.mod index a2d097e..f323fbd 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( ) require ( - code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241127101621-1959e539cc1f + code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241127120416-8ffcaa9a33d7 code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241127101803-8cd39f7b84b2 code.fnuoos.com/go_rely_warehouse/zyos_go_es.git v1.0.1-0.20241118083738-0f22da9ba0be code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.5 @@ -46,7 +46,7 @@ require ( github.com/shopspring/decimal v1.3.1 github.com/tidwall/gjson v1.14.1 google.golang.org/grpc v1.32.0 - google.golang.org/protobuf v1.33.0 + google.golang.org/protobuf v1.34.0 ) require (