|
@@ -152,7 +152,7 @@ class CloudStorageView(View):
|
|
print(uid)
|
|
print(uid)
|
|
now_time = int(time.time())
|
|
now_time = int(time.time())
|
|
ubqs = UID_Bucket.objects.filter(uid=uid, channel=channel, endTime__gte=now_time). \
|
|
ubqs = UID_Bucket.objects.filter(uid=uid, channel=channel, endTime__gte=now_time). \
|
|
- values("bucket__mold", "bucket__bucket", "bucket__endpoint", "bucket__region","endTime")
|
|
|
|
|
|
+ values("bucket__mold", "bucket__bucket", "bucket__endpoint", "bucket__region", "endTime")
|
|
if ubqs.exists():
|
|
if ubqs.exists():
|
|
if ubqs[0]["bucket__mold"] == 0:
|
|
if ubqs[0]["bucket__mold"] == 0:
|
|
# 阿里云 oss sts
|
|
# 阿里云 oss sts
|
|
@@ -281,7 +281,8 @@ class CloudStorageView(View):
|
|
if sts_qs.exists():
|
|
if sts_qs.exists():
|
|
sts_qs.update(data=json.dumps(res), addTime=now_time)
|
|
sts_qs.update(data=json.dumps(res), addTime=now_time)
|
|
else:
|
|
else:
|
|
- StsCrdModel.objects.create(uid=uid, channel=channel, data=json.dumps(res,default=str), addTime=now_time, type=1)
|
|
|
|
|
|
+ StsCrdModel.objects.create(uid=uid, channel=channel, data=json.dumps(res, default=str),
|
|
|
|
+ addTime=now_time, type=1)
|
|
return JsonResponse(status=200, data=res)
|
|
return JsonResponse(status=200, data=res)
|
|
else:
|
|
else:
|
|
res = {'code': 404, 'msg': 'data not exists!'}
|
|
res = {'code': 404, 'msg': 'data not exists!'}
|
|
@@ -372,7 +373,8 @@ class CloudStorageView(View):
|
|
print(channel)
|
|
print(channel)
|
|
now_time = int(time.time())
|
|
now_time = int(time.time())
|
|
ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel, endTime__gte=now_time). \
|
|
ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel, endTime__gte=now_time). \
|
|
- values("bucket__mold", "bucket__bucket", "bucket__endpoint", "bucket__region", "status", "bucket__storeDay","bucket__id")
|
|
|
|
|
|
+ values("bucket__mold", "bucket__bucket", "bucket__endpoint",
|
|
|
|
+ "bucket__region", "status", "bucket__storeDay", "bucket__id")
|
|
if ubqs.exists():
|
|
if ubqs.exists():
|
|
ub_qs_data = ubqs[0]
|
|
ub_qs_data = ubqs[0]
|
|
store_day = ub_qs_data['bucket__storeDay']
|
|
store_day = ub_qs_data['bucket__storeDay']
|
|
@@ -702,12 +704,12 @@ class CloudStorageView(View):
|
|
ubq = ubqs[ubqs_count - 1]
|
|
ubq = ubqs[ubqs_count - 1]
|
|
print(ubq)
|
|
print(ubq)
|
|
new_starTime = ubq['endTime'] + 1
|
|
new_starTime = ubq['endTime'] + 1
|
|
- ub_cqs = UID_Bucket.objects.create\
|
|
|
|
|
|
+ ub_cqs = UID_Bucket.objects.create \
|
|
(uid=UID, channel=channel, bucket_id=bucketId,
|
|
(uid=UID, channel=channel, bucket_id=bucketId,
|
|
- endTime=new_starTime + addTime)
|
|
|
|
|
|
+ endTime=new_starTime + addTime)
|
|
uid_bucket_id = ub_cqs.id
|
|
uid_bucket_id = ub_cqs.id
|
|
else:
|
|
else:
|
|
- ub_cqs = UID_Bucket.objects.create\
|
|
|
|
|
|
+ ub_cqs = UID_Bucket.objects.create \
|
|
(uid=UID, channel=channel, bucket_id=bucketId, endTime=nowTime + addTime)
|
|
(uid=UID, channel=channel, bucket_id=bucketId, endTime=nowTime + addTime)
|
|
uid_bucket_id = ub_cqs.id
|
|
uid_bucket_id = ub_cqs.id
|
|
order_qs.update(status=1, updTime=nowTime, uid_bucket_id=uid_bucket_id)
|
|
order_qs.update(status=1, updTime=nowTime, uid_bucket_id=uid_bucket_id)
|
|
@@ -784,7 +786,8 @@ class CloudStorageView(View):
|
|
total_amount=price,
|
|
total_amount=price,
|
|
subject=subject,
|
|
subject=subject,
|
|
return_url="{SERVER_DOMAIN_SSL}cloudstorage/payOK".format(SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL),
|
|
return_url="{SERVER_DOMAIN_SSL}cloudstorage/payOK".format(SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL),
|
|
- notify_url="{SERVER_DOMAIN_SSL}cloudstorage/doalicallback".format(SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL)
|
|
|
|
|
|
+ notify_url="{SERVER_DOMAIN_SSL}cloudstorage/doalicallback".format(
|
|
|
|
+ SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL)
|
|
# return_url="http://192.168.136.40/cloudstorage/payOK",
|
|
# return_url="http://192.168.136.40/cloudstorage/payOK",
|
|
# notify_url="http://192.168.136.40/cloudstorage/aliPayCallback"
|
|
# notify_url="http://192.168.136.40/cloudstorage/aliPayCallback"
|
|
)
|
|
)
|