Merge branch 'master' into develop

# Conflicts:
#	app/controller/IndexController.php

app/controller/IndexController.php

@@ -55,7 +55,7 @@ class IndexController
                 ]);
             }
 
-            Cache::delete("user_resources_{".$data['user_id']."}");
+            Cache::delete("user_resources_{$data['user_id']}");
             return json(['code' => 0, 'msg' => 'success']);
         } catch (\Throwable $e) {
             return json(['code' => 1, 'msg' => $e->getMessage()]);