|
|
@@ -87,56 +87,6 @@ class FeedBackView(View):
|
|
|
fb['FS__name'] = sm['name']
|
|
|
res.append(fb)
|
|
|
return response.json(0, res)
|
|
|
- # for fb in fb_qs:
|
|
|
- # if
|
|
|
- # if fb['id'] in res:
|
|
|
- # if fb['FS__name']:
|
|
|
- # img_url = bucket.sign_url('GET', fb['FS__name'], 600)
|
|
|
- # res[fb['id']]['img_url'].append(img_url)
|
|
|
- # else:
|
|
|
- # print(fb['FS__name'])
|
|
|
- # if fb['FS__name']:
|
|
|
- # img_url = bucket.sign_url('GET', fb['FS__name'], 600)
|
|
|
- # fb['img_url'] = []
|
|
|
- # fb['img_url'].append(img_url)
|
|
|
- # res[fb['id']] = fb
|
|
|
-
|
|
|
- # print(fb_qs.FS_set.all())
|
|
|
-
|
|
|
- return response.json(0, res)
|
|
|
-
|
|
|
- # def do_query2(self, userID, request_dict, response):
|
|
|
- # page = request_dict.get('page', None)
|
|
|
- # line = request_dict.get('line', None)
|
|
|
- # if page and line:
|
|
|
- # page = int(page)
|
|
|
- # line = int(line)
|
|
|
- # else:
|
|
|
- # return response.json(444, 'page,line')
|
|
|
- # fb_qs = FeedBackModel.objects.filter(userID_id=userID)[(page - 1) * line:page * line].values('id', 'status',
|
|
|
- # 'content',
|
|
|
- # 'addTime',
|
|
|
- # 'updTime',
|
|
|
- # 'FS__name')
|
|
|
- # res = {}
|
|
|
- # auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
|
|
|
- # bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
|
|
|
- # for fb in fb_qs:
|
|
|
- # if fb['id'] in res:
|
|
|
- # if fb['FS__name']:
|
|
|
- # img_url = bucket.sign_url('GET', fb['FS__name'], 600)
|
|
|
- # res[fb['id']]['img_url'].append(img_url)
|
|
|
- # else:
|
|
|
- # print(fb['FS__name'])
|
|
|
- # if fb['FS__name']:
|
|
|
- # img_url = bucket.sign_url('GET', fb['FS__name'], 600)
|
|
|
- # fb['img_url'] = []
|
|
|
- # fb['img_url'].append(img_url)
|
|
|
- # res[fb['id']] = fb
|
|
|
- #
|
|
|
- # # print(fb_qs.FS_set.all())
|
|
|
- #
|
|
|
- # return response.json(0, res)
|
|
|
|
|
|
def do_add(self, userID, request_dict, response):
|
|
|
nowTime = int(time.time())
|
|
|
@@ -229,7 +179,8 @@ class FeedBackView(View):
|
|
|
sm_qs = StatResModel.objects.filter(feedbackmodel__id__in=sid_list). \
|
|
|
values('id', 'name', 'feedbackmodel__id')
|
|
|
auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
|
|
|
- bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
|
|
|
+ bucket = oss2.Bucket(auth, 'static.zositech.xyz', 'statres')
|
|
|
+ # bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
|
|
|
res = []
|
|
|
for fb in fb_qs:
|
|
|
fb['img_url'] = []
|
chenjunkai