Merge branch 'dev' of http://192.168.136.45:3000/SERVER/AnsjerServer into dev

Controller/EquipmentManagerV3.py

@@ -195,10 +195,14 @@ class EquipmentManagerV3(View):
             else:
                 # print('去缓存找数据')
                 redis_value = redis_value.replace("'", '"')
-                null = ''
-                redis_value = redis_value.replace('True', 'true')
-                redis_value = redis_value.replace('False', 'false')
-                redis_value = json.loads(redis_value)
+                redis_value = redis_value.replace('"isShare": True', '"isShare": true')
+                redis_value = redis_value.replace('"isShare": False', '"isShare": false')
+                redis_value = redis_value.replace('"version": null', '"version": ""')
+                try:
+                    redis_value = json.loads(redis_value)
+                except Exception as e:
+                    print(repr(e))
+                    return response.json(0, {'da': redis_value});
                 if NickName:
                     # print('NickName搜索缓存')
                     for index, item in enumerate(redis_value):