Optimize the directory structure

.gitignore

@@ -1 +1,2 @@
 .vscode/
+.idea/

components/footer.php

@@ -28,13 +28,13 @@
         <?php $this->need('components/sidebar.php'); ?>
         <?php $this->footer(); ?>
 
-        <script src="<?php echo G::staticUrl('static/js/pjax.min.js'); ?>?v=3.10012"></script>
-        <script src="<?php echo G::staticUrl('static/js/smoothscroll.js'); ?>?v=3.215"></script>
-        <script src="<?php echo G::staticUrl('static/js/toastify.min.js'); ?>?v=3.211"></script>
-        <script src="<?php echo G::staticUrl('static/js/tocbot.min.js'); ?>?v=3.211"></script>
-        <script src="<?php echo G::staticUrl('static/js/lib.js'); ?>?v=3.10018"></script>
-        <script src="<?php echo G::staticUrl('static/js/prism.js'); ?>?v=1.03" data-manual></script>
-        <script src="<?php echo G::staticUrl('static/js/G.js'); ?>?v=3.241"></script>
+        <script src="<?php echo G::staticUrl('assets/js/pjax.min.js'); ?>?v=3.10012"></script>
+        <script src="<?php echo G::staticUrl('assets/js/smoothscroll.js'); ?>?v=3.215"></script>
+        <script src="<?php echo G::staticUrl('assets/js/toastify.min.js'); ?>?v=3.211"></script>
+        <script src="<?php echo G::staticUrl('assets/js/tocbot.min.js'); ?>?v=3.211"></script>
+        <script src="<?php echo G::staticUrl('assets/js/lib.js'); ?>?v=3.10018"></script>
+        <script src="<?php echo G::staticUrl('assets/js/prism.js'); ?>?v=1.03" data-manual></script>
+        <script src="<?php echo G::staticUrl('assets/js/G.js'); ?>?v=3.241"></script>
         <script>
             <?php $this->options->customFooterJS(); ?>
         </script>

components/header.php

@@ -20,8 +20,8 @@
         /* 输出自定义主题色 */
         <?php echo G::setCSSValues(); ?>
     </style>
-    <link rel="stylesheet" href="<?php echo G::staticUrl('static/css/G.css'); ?>?v=3.2327">
-    <link rel="stylesheet <?php if (!isset($_COOKIE['night']) || $_COOKIE['night'] != '1') {echo 'alternate';} ?>" href="<?php echo G::staticUrl('static/css/dark.css'); ?>?v=3.227" title="dark">
+    <link rel="stylesheet" href="<?php echo G::staticUrl('assets/css/G.css'); ?>?v=3.2327">
+    <link rel="stylesheet <?php if (!isset($_COOKIE['night']) || $_COOKIE['night'] != '1') {echo 'alternate';} ?>" href="<?php echo G::staticUrl('assets/css/dark.css'); ?>?v=3.227" title="dark">
 
     <style>
         /* 设置自定义背景[颜色/图片] */
@@ -31,7 +31,7 @@
         <?php $this->options->customCSS(); ?>
     </style>
     <?php $this->header(); ?>
-    <script src="<?php echo G::staticUrl('static/js/DPlayer.min.js'); ?>"></script>
+    <script src="<?php echo G::staticUrl('assets/js/DPlayer.min.js'); ?>"></script>
     <script>
         <?php $this->options->customHeaderJS(); ?>
     </script>

functions.php

@@ -1,8 +1,8 @@
 <?php
 if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 
-require_once("lib/G.class.php");
-require_once("lib/GEditor.class.php");
+require_once("libs/G.class.php");
+require_once("libs/GEditor.class.php");
 G::init();
 Typecho_Plugin::factory('Widget_Abstract_Contents')->excerptEx = array('GEditor','reply2see');
 Typecho_Plugin::factory('Widget_Abstract_Contents')->contentEx = array('GEditor','reply2see');

lib/G.class.php → libs/G.class.php

@@ -228,7 +228,7 @@ public static function getArticlePath()
     public static function getFooterLogos()
     {
         if(self::$config['enableUPYUNLOGO'] == 1)
-            $logos = '<a href="https://www.upyun.com/?utm_source=lianmeng&utm_medium=referral"><img src="'.self::staticUrl('static/img/upyun.png').'"/></a>';
+            $logos = '<a href="https://www.upyun.com/?utm_source=lianmeng&utm_medium=referral"><img src="'.self::staticUrl('assets/img/upyun.png').'"/></a>';
         else
             $logos = '';
         $imgs = explode(',', self::$config["footerLOGO"]);