Merge branch 'shield-videos-update-2023021514' into test

config.py

@@ -652,7 +652,7 @@ class BaseConfig(object):
         '台湾省': '710000', '香港': '810000', '澳门': '820000',
     }
     CITY_CODE = {
-        '广州': '440100', '深圳': '440300', '成都': '510100',
+        '广州': '440100', '深圳': '440300', '成都': '510100', '长沙': '430100',
     }
 
     # 本山祝福视频redis存储key
@@ -665,6 +665,8 @@ class BaseConfig(object):
         CITY_CODE['广州']: [SPECIAL_AREA_LIMIT_KEY_NAME, ],
         CITY_CODE['深圳']: [SPECIAL_AREA_LIMIT_KEY_NAME, ],
         CITY_CODE['成都']: [SPECIAL_AREA_LIMIT_KEY_NAME, ],
+        CITY_CODE['长沙']: [SPECIAL_AREA_LIMIT_KEY_NAME, ],
+        REGION_CODE['北京']: [SPECIAL_AREA_LIMIT_KEY_NAME, ],
     }
     # 涉政视频可分发的端
     POLITICAL_RECOMMEND_APP_TYPE_LIST = [

utils.py

@@ -346,18 +346,18 @@ class FilterVideos(object):
                     filtered_shield_video_ids = self.filter_shield_video(
                         video_ids=filtered_viewed_videos, shield_key_name_list=shield_key_name_list
                     )
-                    # log_.info({
-                    #     'logTimestamp': int(time.time() * 1000),
-                    #     'pool_type': pool_type,
-                    #     'request_id': self.request_id,
-                    #     'app_type': self.app_type,
-                    #     'mid': self.mid,
-                    #     'uid': self.uid,
-                    #     'operation': 'shield_filter',
-                    #     'request_videos': filtered_viewed_videos,
-                    #     'shield_filter_result': filtered_shield_video_ids,
-                    #     'executeTime': (time.time() - st_viewed) * 1000
-                    # })
+                    log_.info({
+                        'logTimestamp': int(time.time() * 1000),
+                        'pool_type': pool_type,
+                        'request_id': self.request_id,
+                        'app_type': self.app_type,
+                        'mid': self.mid,
+                        'uid': self.uid,
+                        'operation': 'shield_filter',
+                        'request_videos': filtered_viewed_videos,
+                        'shield_filter_result': filtered_shield_video_ids,
+                        'executeTime': (time.time() - st_viewed) * 1000
+                    })
                     return filtered_shield_video_ids
                 else:
                     return filtered_viewed_videos