重命名资源套餐相关结构体和数据库表，新增长效套餐类型

web/services/channel.go

@@ -286,13 +286,13 @@ func (s *channelService) CreateChannel(
 func findResource(q *q.Query, resourceId int32, authCtx *auth.Context, count int) (*ResourceInfo, error) {
 	var resource = new(ResourceInfo)
 	data := q.Resource.As("data")
-	pss := q.ResourcePss.As("pss")
+	short := q.ResourceShort.As("short")
 	err := data.Scopes(orm.Alias(data)).
 		Select(
 			data.ID, data.UserID, data.Active,
-			pss.Type, pss.Live, pss.DailyUsed, pss.DailyLimit, pss.DailyLast, pss.Quota, pss.Used, pss.Expire,
+			short.Type, short.Live, short.DailyUsed, short.DailyLimit, short.DailyLast, short.Quota, short.Used, short.Expire,
 		).
-		LeftJoin(q.ResourcePss.As("pss"), pss.ResourceID.EqCol(data.ID)).
+		LeftJoin(q.ResourceShort.As("short"), short.ResourceID.EqCol(data.ID)).
 		Where(
 			data.ID.Eq(resourceId),
 			data.UserID.Eq(authCtx.Payload.Id),
@@ -565,7 +565,7 @@ func calcChannels(
 }
 
 func updateResource(rid string, resource *ResourceInfo, count int, now time.Time) (err error) {
-	toUpdate := m.ResourcePss{
+	toUpdate := m.ResourceShort{
 		Used:      resource.Used + int32(count),
 		DailyLast: orm.LocalDateTime(now),
 	}
@@ -575,12 +575,12 @@ func updateResource(rid string, resource *ResourceInfo, count int, now time.Time
 	} else {
 		toUpdate.DailyUsed = resource.DailyUsed + int32(count)
 	}
-	_, err = q.ResourcePss.
-		Where(q.ResourcePss.ResourceID.Eq(resource.Id)).
+	_, err = q.ResourceShort.
+		Where(q.ResourceShort.ResourceID.Eq(resource.Id)).
 		Select(
-			q.ResourcePss.Used,
-			q.ResourcePss.DailyUsed,
-			q.ResourcePss.DailyLast,
+			q.ResourceShort.Used,
+			q.ResourceShort.DailyUsed,
+			q.ResourceShort.DailyLast,
 		).
 		Updates(toUpdate)
 	if err != nil {

web/services/resource.go

@@ -246,8 +246,8 @@ func createResource(q *q.Query, data *CreateResourceData, uid int32) (*m.Resourc
 		UserID:     uid,
 		ResourceNo: ID.GenReadable("res"),
 		Active:     true,
-		Type:       int32(resource2.TypeDynamic),
-		Pss: &m.ResourcePss{
+		Type:       int32(resource2.TypeShort),
+		Short: &m.ResourceShort{
 			Type:       data.Type,
 			Live:       data.Live,
 			Quota:      data.Quota,