..

README.md

@@ -1,3 +1,98 @@
 # blog_tp6
 
-thinkphp6 个人博客
+thinkphp6 个人博客
+
+修改 UEditor.all.js 配置 
+```
+me.commands['insertcode'] = {
+    execCommand : function(cmd,lang){
+        // ... 省略
+        if(pre){
+            pre.className = lang; /*'brush:'+lang+';toolbar:false;';*/
+        }else{
+            // ... 省略
+            me.execCommand('inserthtml','<pre id="coder" class="'+lang+'">'+code+'</pre>',true);
+            // ... 省略
+        }
+    },
+    // ... 省略
+};
+```
+
+修改 Parsedown.php
+
+24 行
+```
+    function text($text)
+    {
+       // ... 省略
+    }
+
+// ===> 改为
+        function text($text)
+    {
+        $Elements = $this->textElements($text);
+
+        # convert to markup
+        $markup = $this->elements($Elements);
+
+        # trim line breaks
+        $markup = trim($markup, "\n");
+
+        return $markup;
+    }
+
+    protected function textElements($text)
+    {
+        # make sure no definitions are set
+        $this->DefinitionData = array();
+
+        # standardize line breaks
+        $text = str_replace(array("\r\n", "\r"), "\n", $text);
+
+        # remove surrounding line breaks
+        $text = trim($text, "\n");
+
+        # split text into lines
+        $lines = explode("\n", $text);
+
+        # iterate through lines to identify blocks
+        return $this->linesElements($lines);
+    }
+```
+blockHeader 修改
+```
+    protected function blockHeader($Line)
+    {
+        $level = strspn($Line['text'], '#');
+
+        if ($level > 6)
+        {
+            return;
+        }
+
+        $text = trim($Line['text'], '#');
+
+        if ($this->strictMode and isset($text[0]) and $text[0] !== ' ')
+        {
+            return;
+        }
+
+        $text = trim($text, ' ');
+
+        $Block = array(
+            'element' => array(
+                'name' => 'h' . $level,
+                'handler' => array(
+                    'function' => 'lineElements',
+                    'argument' => $text,
+                    'destination' => 'elements',
+                )
+            ),
+        );
+
+        return $Block;
+    }
+```
+
+

view/sys/article/save.html

@@ -129,9 +129,9 @@
 </article>
 
 <!--请在下方写此页面业务相关的脚本-->
-<script type="text/javascript" src="/static/plugins/lib/ueditor/1.4.3/ueditor.config.js"></script>
-<script type="text/javascript" src="/static/plugins/lib/ueditor/1.4.3/ueditor.all.js"></script>
-<script type="text/javascript" src="/static/plugins/lib/ueditor/1.4.3/lang/zh-cn/zh-cn.js"></script>
+<script type="text/javascript" src="/static/plugins/ueditor/1.4.3/ueditor.config.js"></script>
+<script type="text/javascript" src="/static/plugins/ueditor/1.4.3/ueditor.all.js"></script>
+<script type="text/javascript" src="/static/plugins/ueditor/1.4.3/lang/zh-cn/zh-cn.js"></script>
 <script type="text/javascript" src="/static/plugins/jquery.validation/1.14.0/jquery.validate.js"></script>
 <script type="text/javascript" src="/static/plugins/jquery.validation/1.14.0/messages_zh.js"></script>
 <script type="text/javascript" src="/static/plugins/jquery.validation/1.14.0/validate-methods.js"></script>

view/sys/layout.html

@@ -13,12 +13,12 @@
     <title>后台管理</title>
     <link rel="stylesheet" type="text/css" href="/static/plugins/h-ui/css/H-ui.min.css" />
     <link rel="stylesheet" type="text/css" href="/static/plugins/h-ui.admin/css/H-ui.admin.css" />
-    <link rel="stylesheet" type="text/css" href="/static/plugins/lib/Hui-iconfont/1.0.8/iconfont.css" />
+    <link rel="stylesheet" type="text/css" href="/static/plugins/Hui-iconfont/1.0.8/iconfont.css" />
     <link rel="stylesheet" type="text/css" href="/static/plugins/h-ui.admin/skin/default/skin.css" id="skin" />
     <link rel="stylesheet" type="text/css" href="/static/sys/css/style.css" />
 
-    <script type="text/javascript" src="/static/plugins/lib/jquery/1.9.1/jquery.min.js"></script>
-    <script type="text/javascript" src="/static/plugins/lib/layer/2.4/layer.js"></script>
+    <script type="text/javascript" src="/static/plugins/jquery/1.9.1/jquery.min.js"></script>
+    <script type="text/javascript" src="/static/plugins/layer/2.4/layer.js"></script>
     <script type="text/javascript" src="/static/plugins/h-ui/js/H-ui.js"></script>
     <script type="text/javascript" src="/static/plugins/h-ui.admin/js/H-ui.admin.page.js"></script>
     <script type="text/javascript" src="/static/sys/js/admin.js"></script>

view/sys/login/index.html

@@ -43,9 +43,9 @@
         </div>
     </div>
     <div class="footer">Copyright HUWHOIS</div>
-    <script type="text/javascript" src="/static/plugins/lib/jquery/1.9.1/jquery.min.js"></script>
+    <script type="text/javascript" src="/static/plugins/jquery/1.9.1/jquery.min.js"></script>
     <script type="text/javascript" src="/static/plugins/h-ui/js/H-ui.js"></script>
-    <script type="text/javascript" src="/static/plugins/lib/layer/2.4/layer.js"></script>
+    <script type="text/javascript" src="/static/plugins/layer/2.4/layer.js"></script>
     <script>
         // 回车触发登录
         $(document).keyup(function (event) {

view/sys/public/breadcrumb.html

@@ -1,26 +0,0 @@
-{if isset($page_title) && !empty($page_title)}
-<div class="content-header">
-    <div class="container-fluid">
-        {$page_title|raw|default=''}
-    </div>
-</div>
-{elseif $breadCrumb /}
-<div class="content-header">
-    <div class="container-fluid">
-        <div class="row">
-            <div class="col-sm-6">
-                <h1 class="m-0">
-                    {$breadCrumb.left.0}
-                    <small>{$breadCrumb.left.1}</small>
-                </h1>
-            </div><!-- /.col -->
-            <div class="col-sm-6">
-                <ol class="breadcrumb float-sm-right">
-                    <li class="breadcrumb-item"><a href="{:url('index/index')}">Home</a></li>
-                    <li class="breadcrumb-item active"><a href="{:url($breadCrumb.right.url)}">{$breadCrumb.right.title}</a></li>
-                </ol>
-            </div><!-- /.col -->
-        </div><!-- /.row -->
-    </div><!-- /.container-fluid -->
-</div>
-{/if}

view/sys/public/css_js.html

@@ -1,68 +0,0 @@
-<!-- layui -->
-<link rel="stylesheet" href="/static/plugins/layui/css/layui.css">
-<!-- Google Font: Source Sans Pro -->
-<link rel="stylesheet" href="/static/plugins/AdminLTE/plugins/google-fonts/google.fonts.css">
-<!-- Font Awesome -->
-<link rel="stylesheet" href="/static/plugins/AdminLTE/plugins/fontawesome-free/css/all.min.css">
-<!-- Ionicons -->
-<link rel="stylesheet" href="https://cdn.staticfile.org/ionicons/2.0.1/css/ionicons.min.css">
-<!-- Tempusdominus Bootstrap 4 -->
-<link rel="stylesheet" href="/static/plugins/AdminLTE/plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css">
-<!-- iCheck -->
-<link rel="stylesheet" href="/static/plugins/AdminLTE/plugins/icheck-bootstrap/icheck-bootstrap.min.css">
-<!-- Theme style -->
-<link rel="stylesheet" href="/static/plugins/AdminLTE/dist/css/AdminLTE.min.css">
-<!-- overlayScrollbars -->
-<link rel="stylesheet" href="/static/plugins/AdminLTE/plugins/overlayScrollbars/css/OverlayScrollbars.min.css">
-<!-- Daterange picker -->
-<link rel="stylesheet" href="/static/plugins/AdminLTE/plugins/daterangepicker/daterangepicker.css">
-<!-- Bootstrap Color Picker -->
-<link rel="stylesheet" href="/static/plugins/AdminLTE/plugins/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css">
-<!-- Toastr -->
-<link rel="stylesheet" href="/static/plugins/AdminLTE/plugins/toastr/toastr.min.css">
-<!-- pace-progress -->
-<link rel="stylesheet" href="/static/plugins/AdminLTE/plugins/pace-progress/themes/black/pace-theme-flat-top.css">
-<!-- jQuery -->
-<script src="/static/plugins/AdminLTE/plugins/jquery/jquery.min.js"></script>
-<!-- layui -->
-<script src="/static/plugins/layui/layui.js"></script>
-<!-- webuploader -->
-<!-- <link rel="stylesheet" href="/static/plugins/webuploader-0.1.5/webuploader.css">
-<script src="/static/plugins/webuploader-0.1.5/webuploader.js"></script> -->
-{//include file="index/webuploader" /}
-{if $system.editor == '1'}
-<!-- ueditor -->
-<script src="/static/plugins/ueditor/ueditor.config.js"></script>
-<script src="/static/plugins/ueditor/ueditor.all.min.js"> </script>
-<script src="/static/plugins/ueditor/lang/zh-cn/zh-cn.js"></script>
-{else}
-<!-- ckeditor4 -->
-<script src="/static/plugins/ckeditor/ckeditor.js"></script>
-{/if}
-<!-- Bootstrap Table -->
-<link rel="stylesheet" href="/static/plugins/bootstrap-table/bootstrap-table.min.css" />
-<!-- layer 弹层组件 -->
-<script>
-    layui.use('layer',
-        function () {
-            var layer = layui.layer;
-        })
-</script>
-<!-- zTree 树节点组件 -->
-<script type="text/javascript" src="/static/plugins/zTree_v3/js/jquery.ztree.core.js"></script>
-<script type="text/javascript" src="/static/plugins/zTree_v3/js/jquery.ztree.excheck.js"></script>
-<!-- jQueryTagsInput -->
-<link rel="stylesheet" href="/static/plugins/AdminLTE/plugins/jQueryTagsInput/jquery.tagsinput.css">
-<script src="/static/plugins/AdminLTE/plugins/jQueryTagsInput/jquery.tagsinput.js"></script>
-<!-- Select2 -->
-<link rel="stylesheet" href="/static/plugins/AdminLTE/plugins/select2/css/select2.min.css">
-<link rel="stylesheet" href="/static/plugins/AdminLTE/plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css">
-<script src="/static/plugins/AdminLTE/plugins/select2/js/select2.full.min.js"></script>
-<!-- CodeMirror -->
-<link rel="stylesheet" href="/static/plugins/AdminLTE/plugins/codemirror/codemirror.css">
-<link rel="stylesheet" href="/static/plugins/AdminLTE/plugins/codemirror/theme/monokai.css">
-
-<!-- SIYUCMS -->
-<link rel="stylesheet" href="/static/plugins/AdminLTE/dist/css/siyucms.css">
-<script src="/static/plugins/siyu-ui.js?v=20201013"></script>
-<script src="/static/plugins/siyucms.js?v=20201013"></script>

view/sys/public/foot_css_js.html

@@ -1,71 +0,0 @@
-<!-- Bootstrap 4 -->
-<script src="/static/plugins/AdminLTE/plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
-<!-- daterangepicker -->
-<script src="/static/plugins/AdminLTE/plugins/moment/moment.min.js"></script>
-<script src="/static/plugins/AdminLTE/plugins/moment/locale/zh-cn.js"></script>
-<script src="/static/plugins/AdminLTE/plugins/daterangepicker/daterangepicker.js"></script>
-<!-- bootstrap color picker -->
-<script src="/static/plugins/AdminLTE/plugins/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js"></script>
-<!-- Tempusdominus Bootstrap 4 -->
-<script src="/static/plugins/AdminLTE/plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
-<!-- overlayScrollbars -->
-<script src="/static/plugins/AdminLTE/plugins/overlayScrollbars/js/jquery.overlayScrollbars.min.js"></script>
-<!-- Toastr -->
-<script src="/static/plugins/AdminLTE/plugins/toastr/toastr.min.js"></script>
-<!-- pace-progress -->
-<script src="/static/plugins/AdminLTE/plugins/pace-progress/pace.min.js"></script>
-<!-- Bootstrap Table 表格插件样式 -->
-<script src="/static/plugins/bootstrap-table/bootstrap-table.min.js"></script>
-<script src="/static/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
-<script src="/static/plugins/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js"></script>
-<script src="/static/plugins/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.min.js"></script>
-<link rel="stylesheet" href="/static/plugins/bootstrap-table/extensions/fixed-columns/bootstrap-table-fixed-columns.min.css"/>
-<script src="/static/plugins/bootstrap-table/extensions/fixed-columns/bootstrap-table-fixed-columns.min.js"></script>
-<!-- AdminLTE App -->
-<script src="/static/plugins/AdminLTE/dist/js/adminlte.js"></script>
-<!-- AdminLTE for demo purposes -->
-<script src="/static/plugins/AdminLTE/dist/js/demo.js"></script>
-<!-- pjax -->
-<script src="/static/plugins/AdminLTE/plugins/pjax/jquery.pjax.js"></script>
-<!-- jQueryForm -->
-<script src="/static/plugins/AdminLTE/plugins/jQueryForm/jquery.form.js"></script>
-<!-- CodeMirror -->
-<script src="/static/plugins/AdminLTE/plugins/codemirror/codemirror.js"></script>
-<script src="/static/plugins/AdminLTE/plugins/codemirror/mode/css/css.js"></script>
-<script src="/static/plugins/AdminLTE/plugins/codemirror/mode/xml/xml.js"></script>
-<script src="/static/plugins/AdminLTE/plugins/codemirror/mode/javascript/javascript.js"></script>
-<script src="/static/plugins/AdminLTE/plugins/codemirror/mode/htmlmixed/htmlmixed.js"></script>
-<!-- jquery-treegrid -->
-<link rel="stylesheet" href="/static/plugins/jquery-treegrid/css/jquery.treegrid.css">
-<script src="/static/plugins/jquery-treegrid/js/jquery.treegrid.js"></script>
-<script src="/static/plugins/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.js"></script>
-
-{literal}
-<script type="text/javascript">
-    $(function () {
-        // 跳转页
-        $(document).on('pjax:complete', function (event, xhr, textStatus, options) {
-            var url = xhr.getResponseHeader('X-PJAX-URL');
-            if (url) {
-                $.pjax({url: url, container: '.content-wrapper'})
-            }
-        });
-
-        // a 链接
-        $(document).pjax('a[target!=_blank]', '.content-wrapper');
-
-        // form 表单
-        $(document).on('submit', 'form[data-pjax]', function (event) {
-            $.pjax.submit(event, '.content-wrapper');
-        });
-
-        // 阻止超时导致的链接跳转(ajax默认超时时间650毫秒，超时后强制刷新整个页面)
-        $(document).on('pjax:timeout', function (event) {
-            event.preventDefault()
-        });
-
-        // 重新加载
-        //$.pjax.reload('.content-wrapper');
-    })
-</script>
-{/literal}