Modify: clean useless codes

This commit is contained in:
HFO4
2020-03-11 15:45:00 +08:00
parent 09de05548f
commit 45b54b3455
28 changed files with 8 additions and 1802 deletions

View File

@@ -87,39 +87,6 @@ func AdminSendTestMail(c *gin.Context) {
}
}
// AdminListRedeems 列出激活码
func AdminListRedeems(c *gin.Context) {
var service admin.AdminListService
if err := c.ShouldBindJSON(&service); err == nil {
res := service.Redeems()
c.JSON(200, res)
} else {
c.JSON(200, ErrorResponse(err))
}
}
// AdminGenerateRedeems 生成激活码
func AdminGenerateRedeems(c *gin.Context) {
var service admin.GenerateRedeemsService
if err := c.ShouldBindJSON(&service); err == nil {
res := service.Generate()
c.JSON(200, res)
} else {
c.JSON(200, ErrorResponse(err))
}
}
// AdminDeleteRedeem 删除激活码
func AdminDeleteRedeem(c *gin.Context) {
var service admin.SingleIDService
if err := c.ShouldBindUri(&service); err == nil {
res := service.DeleteRedeem()
c.JSON(200, res)
} else {
c.JSON(200, ErrorResponse(err))
}
}
// AdminTestAria2 测试aria2连接
func AdminTestAria2(c *gin.Context) {
var service admin.Aria2TestService
@@ -392,28 +359,6 @@ func AdminDeleteShare(c *gin.Context) {
}
}
// AdminListOrder 列出订单
func AdminListOrder(c *gin.Context) {
var service admin.AdminListService
if err := c.ShouldBindJSON(&service); err == nil {
res := service.Orders()
c.JSON(200, res)
} else {
c.JSON(200, ErrorResponse(err))
}
}
// AdminDeleteOrder 批量删除订单
func AdminDeleteOrder(c *gin.Context) {
var service admin.OrderBatchService
if err := c.ShouldBindJSON(&service); err == nil {
res := service.Delete(c)
c.JSON(200, res)
} else {
c.JSON(200, ErrorResponse(err))
}
}
// AdminListDownload 列出离线下载任务
func AdminListDownload(c *gin.Context) {
var service admin.AdminListService

View File

@@ -172,17 +172,6 @@ func GetShareDocPreview(c *gin.Context) {
}
}
// SaveShare 转存他人分享
func SaveShare(c *gin.Context) {
var service share.Service
if err := c.ShouldBindJSON(&service); err == nil {
res := service.SaveToMyFile(c)
c.JSON(200, res)
} else {
c.JSON(200, ErrorResponse(err))
}
}
// ListSharedFolder 列出分享的目录下的对象
func ListSharedFolder(c *gin.Context) {
var service share.Service

View File

@@ -14,7 +14,6 @@ func SiteConfig(c *gin.Context) {
siteConfig := model.GetSettingByNames(
"siteName",
"login_captcha",
"qq_login",
"reg_captcha",
"email_active",
"forget_captcha",

View File

@@ -5,7 +5,6 @@ import (
"fmt"
model "github.com/HFO4/cloudreve/models"
"github.com/HFO4/cloudreve/pkg/authn"
"github.com/HFO4/cloudreve/pkg/qq"
"github.com/HFO4/cloudreve/pkg/request"
"github.com/HFO4/cloudreve/pkg/serializer"
"github.com/HFO4/cloudreve/pkg/thumb"
@@ -213,24 +212,6 @@ func UserActivate(c *gin.Context) {
}
}
// UserQQLogin 初始化QQ登录
func UserQQLogin(c *gin.Context) {
// 新建绑定
res, err := qq.NewLoginRequest()
if err != nil {
c.JSON(200, serializer.Err(serializer.CodeNotSet, "无法使用QQ登录", err))
return
}
// 设定QQ登录会话Secret
util.SetSession(c, map[string]interface{}{"qq_login_secret": res.SecretKey})
c.JSON(200, serializer.Response{
Data: res.URL,
})
}
// UserSignOut 用户退出登录
func UserSignOut(c *gin.Context) {
util.DeleteSession(c, "user_id")
@@ -251,17 +232,6 @@ func UserStorage(c *gin.Context) {
c.JSON(200, res)
}
// UserAvailablePolicies 用户存储策略设置
func UserAvailablePolicies(c *gin.Context) {
var service user.SettingService
if err := c.ShouldBindUri(&service); err == nil {
res := service.Policy(c, CurrentUser(c))
c.JSON(200, res)
} else {
c.JSON(200, ErrorResponse(err))
}
}
// UserTasks 获取任务队列
func UserTasks(c *gin.Context) {
var service user.SettingListService
@@ -368,12 +338,6 @@ func UpdateOption(c *gin.Context) {
switch service.Option {
case "nick":
subService = &user.ChangerNick{}
case "vip":
subService = &user.VIPUnsubscribe{}
case "qq":
subService = &user.QQBind{}
case "policy":
subService = &user.PolicyChange{}
case "homepage":
subService = &user.HomePage{}
case "password":

View File

@@ -1,144 +0,0 @@
package controllers
import (
"github.com/HFO4/cloudreve/pkg/payment"
"github.com/HFO4/cloudreve/pkg/util"
"github.com/HFO4/cloudreve/service/vas"
"github.com/gin-gonic/gin"
"github.com/qingwg/payjs/notify"
"github.com/smartwalle/alipay/v3"
)
// GetQuota 获取容量配额信息
func GetQuota(c *gin.Context) {
var service vas.GeneralVASService
if err := c.ShouldBindUri(&service); err == nil {
res := service.Quota(c, CurrentUser(c))
c.JSON(200, res)
} else {
c.JSON(200, ErrorResponse(err))
}
}
// GetProduct 获取商品信息
func GetProduct(c *gin.Context) {
var service vas.GeneralVASService
if err := c.ShouldBindUri(&service); err == nil {
res := service.Products(c, CurrentUser(c))
c.JSON(200, res)
} else {
c.JSON(200, ErrorResponse(err))
}
}
// NewOrder 新建支付订单
func NewOrder(c *gin.Context) {
var service vas.CreateOrderService
if err := c.ShouldBindJSON(&service); err == nil {
res := service.Create(c, CurrentUser(c))
c.JSON(200, res)
} else {
c.JSON(200, ErrorResponse(err))
}
}
// OrderStatus 查询订单状态
func OrderStatus(c *gin.Context) {
var service vas.OrderService
if err := c.ShouldBindUri(&service); err == nil {
res := service.Status(c, CurrentUser(c))
c.JSON(200, res)
} else {
c.JSON(200, ErrorResponse(err))
}
}
// GetRedeemInfo 获取兑换码信息
func GetRedeemInfo(c *gin.Context) {
var service vas.RedeemService
if err := c.ShouldBindUri(&service); err == nil {
res := service.Query(c)
c.JSON(200, res)
} else {
c.JSON(200, ErrorResponse(err))
}
}
// DoRedeem 获取兑换码信息
func DoRedeem(c *gin.Context) {
var service vas.RedeemService
if err := c.ShouldBindUri(&service); err == nil {
res := service.Redeem(c, CurrentUser(c))
c.JSON(200, res)
} else {
c.JSON(200, ErrorResponse(err))
}
}
// AlipayCallback 支付宝回调
func AlipayCallback(c *gin.Context) {
pay, err := payment.NewPaymentInstance("alipay")
if err != nil {
util.Log().Debug("[支付宝回调] 无法创建支付宝客户端, %s", err)
c.Status(400)
return
}
res, err := pay.(*payment.Alipay).Client.GetTradeNotification(c.Request)
if err != nil {
util.Log().Debug("[支付宝回调] 回调验证失败, %s", err)
c.Status(403)
return
}
if res != nil && res.TradeStatus == "TRADE_SUCCESS" {
// 支付成功
if err := payment.OrderPaid(res.OutTradeNo); err != nil {
util.Log().Debug("[支付宝回调] 支付处理失败, %s", err)
}
}
// 确认收到通知消息
alipay.AckNotification(c.Writer)
}
// PayJSCallback PayJS回调
func PayJSCallback(c *gin.Context) {
pay, err := payment.NewPaymentInstance("payjs")
if err != nil {
util.Log().Debug("[PayJS回调] 无法创建支付宝客户端, %s", err)
c.Status(400)
return
}
payNotify := pay.(*payment.PayJSClient).Client.GetNotify(c.Request, c.Writer)
//设置接收消息的处理方法
payNotify.SetMessageHandler(func(msg notify.Message) {
if err := payment.OrderPaid(msg.OutTradeNo); err != nil {
util.Log().Debug("[PayJS回调] 支付处理失败, %s", err)
}
})
//处理消息接收以及回复
err = payNotify.Serve()
if err != nil {
util.Log().Debug("[PayJS回调] 回调处理失败, %s", err)
return
}
//发送回复的消息
payNotify.SendResponseMsg()
}
// QQCallback QQ互联回调
func QQCallback(c *gin.Context) {
var service vas.QQCallbackService
if err := c.ShouldBindJSON(&service); err == nil {
res := service.Callback(c, CurrentUser(c))
c.JSON(200, res)
} else {
c.JSON(200, ErrorResponse(err))
}
}

View File

@@ -64,17 +64,6 @@ func DeleteWebDAVAccounts(c *gin.Context) {
}
}
// DeleteWebDAVMounts 删除WebDAV挂载
func DeleteWebDAVMounts(c *gin.Context) {
var service setting.WebDAVListService
if err := c.ShouldBindUri(&service); err == nil {
res := service.Unmount(c, CurrentUser(c))
c.JSON(200, res)
} else {
c.JSON(200, ErrorResponse(err))
}
}
// CreateWebDAVAccounts 创建WebDAV账户
func CreateWebDAVAccounts(c *gin.Context) {
var service setting.WebDAVAccountCreateService
@@ -85,14 +74,3 @@ func CreateWebDAVAccounts(c *gin.Context) {
c.JSON(200, ErrorResponse(err))
}
}
// CreateWebDAVMounts 创建WebDAV目录挂载
func CreateWebDAVMounts(c *gin.Context) {
var service setting.WebDAVMountCreateService
if err := c.ShouldBindJSON(&service); err == nil {
res := service.Create(c, CurrentUser(c))
c.JSON(200, res)
} else {
c.JSON(200, ErrorResponse(err))
}
}

View File

@@ -132,8 +132,6 @@ func InitMasterRouter() *gin.Engine {
middleware.HashID(hashid.UserID),
controllers.UserActivate,
)
// 初始化QQ登录
user.POST("qq", controllers.UserQQLogin)
// WebAuthn登陆初始化
user.GET("authn/:username",
middleware.IsFunctionEnabled("authn_enabled"),
@@ -174,21 +172,6 @@ func InitMasterRouter() *gin.Engine {
// 回调接口
callback := v3.Group("callback")
{
// QQ互联回调
callback.POST(
"qq",
controllers.QQCallback,
)
// PAYJS回调
callback.POST(
"payjs",
controllers.PayJSCallback,
)
// 支付宝回调
callback.POST(
"alipay",
controllers.AlipayCallback,
)
// 远程策略上传回调
callback.POST(
"remote/:key",
@@ -312,17 +295,6 @@ func InitMasterRouter() *gin.Engine {
// 重新加载子服务
admin.POST("mailTest", controllers.AdminSendTestMail)
// 兑换码相关
redeem := admin.Group("redeem")
{
// 列出激活码
redeem.POST("list", controllers.AdminListRedeems)
// 生成激活码
redeem.POST("", controllers.AdminGenerateRedeems)
// 删除激活码
redeem.DELETE(":id", controllers.AdminDeleteRedeem)
}
// 离线下载相关
aria2 := admin.Group("aria2")
{
@@ -398,14 +370,6 @@ func InitMasterRouter() *gin.Engine {
share.POST("delete", controllers.AdminDeleteShare)
}
order := admin.Group("order")
{
// 列出订单
order.POST("list", controllers.AdminListOrder)
// 删除
order.POST("delete", controllers.AdminDeleteOrder)
}
download := admin.Group("download")
{
// 列出任务
@@ -445,8 +409,6 @@ func InitMasterRouter() *gin.Engine {
// 用户设置
setting := user.Group("setting")
{
// 获取用户可选存储策略
setting.GET("policies", controllers.UserAvailablePolicies)
// 任务队列
setting.GET("tasks", controllers.UserTasks)
// 获取当前用户设定
@@ -541,13 +503,6 @@ func InitMasterRouter() *gin.Engine {
share.GET("", controllers.ListShare)
// 搜索公共分享
share.GET("search", controllers.SearchShare)
// 转存他人分享
share.POST("save/:id",
middleware.ShareAvailable(),
middleware.CheckShareUnlocked(),
middleware.BeforeShareDownload(),
controllers.SaveShare,
)
// 更新分享属性
share.PATCH(":id",
middleware.ShareAvailable(),
@@ -571,23 +526,6 @@ func InitMasterRouter() *gin.Engine {
tag.DELETE(":id", middleware.HashID(hashid.TagID), controllers.DeleteTag)
}
// 增值服务相关
vas := auth.Group("vas")
{
// 获取容量包及配额信息
vas.GET("pack", controllers.GetQuota)
// 获取商品信息,同时返回支付信息
vas.GET("product", controllers.GetProduct)
// 新建支付订单
vas.POST("order", controllers.NewOrder)
// 查询订单状态
vas.GET("order/:id", controllers.OrderStatus)
// 获取兑换码信息
vas.GET("redeem/:code", controllers.GetRedeemInfo)
// 执行兑换
vas.POST("redeem/:code", controllers.DoRedeem)
}
// WebDAV管理相关
webdav := auth.Group("webdav")
{
@@ -597,13 +535,6 @@ func InitMasterRouter() *gin.Engine {
webdav.POST("accounts", controllers.CreateWebDAVAccounts)
// 删除账号
webdav.DELETE("accounts/:id", controllers.DeleteWebDAVAccounts)
// 删除目录挂载
webdav.DELETE("mount/:id",
middleware.HashID(hashid.FolderID),
controllers.DeleteWebDAVMounts,
)
// 创建目录挂载
webdav.POST("mount", controllers.CreateWebDAVMounts)
}
}