app/api/controller/Index.php

@@ -0,0 +1,100 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\api\controller;
+
+use app\BaseController;
+use think\App;
+use think\exception\HttpException;
+
+use app\model\Category;
+use app\model\Article;
+use app\utils\ParsedownUtils;
+
+class Index extends BaseController
+{
+    /**
+     * 构造方法
+     * @access public
+     * @param App $app 应用对象
+     */
+    public function __construct(App $app)
+    {
+        $this->app     = $app;
+        $this->request = $this->app->request;
+    }
+
+    public function index()
+    {
+        return '您好！这是一个[api]示例应用';
+    }
+
+    public function menu()
+    {
+        return json(Category::where('is_nav', 1)->order(['sort desc'])->select());
+    }
+
+    public function list()
+    {
+        $params = $this->app->request->param();
+
+        $cid = isset($params['cid']) ? (int)$params['cid'] : 0;
+
+        $list = Article::queryPage($params);
+
+        $category = Category::find($cid);
+
+        if ($category) {
+            $baseUrl = $category->url;
+        } else {
+            $baseUrl = '/index/all';
+        }
+
+        return json([
+            'baseUrl'  => $baseUrl,
+            'list' => $list->all(),
+            'total' => $list->total(),
+            'limit' => $list->listRows(),
+            'page' => $list->currentPage(),
+            'lastPage' => $list->lastPage(),
+            'cid' => $cid,
+        ]);
+    }
+
+    /**
+     * 文章详情
+     */
+    public function read($id = null)
+    {
+        $data = Article::getOne($id);
+
+        if (!$data) {
+            return json(['msg'=>'页面不存在'], 404);
+        }
+
+        $data->hits += 1;
+
+        $data->save();
+
+        $prev_next = Article::getNextPrev($id, $data->cid);
+
+        if ($data->content_type == 1) {
+            $parsedownExtension = new ParsedownUtils();
+            $parsedownExtension->setTocEnabled(true);
+            $res = $parsedownExtension->text($data->content);
+            $data->toc = $res['toc'];
+            $data->content = $res['content'];
+        }
+
+        return json([
+            'cid' => $data->cid,
+            'data' => $data,
+            'prev_next' => $prev_next,
+            'seo' => [
+                'title' => $data->title,
+                'key' => $data->keywords,
+                'des' => $data->summary,
+            ]
+        ]);
+    }
+}

app/controller/sys/Index.php

@@ -12,7 +12,6 @@ use think\facade\View;
 use app\model\SysMenu as SysMenuModel;
 use app\utils\ReUtils;
 
-
 class Index  extends Base
 {
     public function index()

app/model/SysUser.php

@@ -14,8 +14,45 @@ class SysUser extends Base
 {
     protected $pk = 'userid';
 
-
-
+    protected $schema = [
+        "id"          => "int",
+        "cid"         => "int",
+        "title"       => "varchar",
+        "writer"      => "varchar",
+        "source"      => "varchar",
+        "titlepic"    => "varchar",
+        "keywords"    => "varchar",
+        "summary"     => "varchar",
+        "content"     => "varchar",
+        "discussed"   => "int",
+        "status"      => "int",
+        "top"         => "int",
+        "sort"       => "int",
+        "hits"        => "int",
+        "likes"       => "int",
+        "content_type"=> "int",
+        "userid"      => "int",
+        "userid"      => "int",
+        "username"    => "varchar",
+        "create_time" => "int",
+        
+        "userid"     => "int",
+        "roleid"     => "int",
+        "username"   => "varchar",
+        "password"   => "varchar",
+        "salt"       => "varchar",
+        "nickname"   => "varchar",
+        "truename"   => "varchar",
+        "email"      => "varchar",
+        "avatar"      => "varchar",
+        "remark"      => "varchar",
+        "status"      => "int",
+        "per_time"   => "datetime",
+        "per_ip"     => "int",
+        "login_num"  => "int",
+        "create_time"=> "int",
+        "update_time" => "int"
+    ];
 
     public function sysRole()
     {

public/static/plugins/.gitignore

@@ -1,3 +1,9 @@
 /h-ui
 /h-ui.admin
 /Hui-iconfont
+<<<<<<< HEAD
+/layer
+/laypage
+/Swiper
+=======
+>>>>>>> 12a23a8ae7cd9871a9ece818a1ef3f502a7edd39

view/sys/category/index.html

@@ -109,7 +109,7 @@
             'id': parseInt(id)
         };
 
-        $.post('navStatus', data, function (res) {
+        $.post('/sys/category/navStatus', data, function (res) {
             if (res.code == 0) {
                 topalert({
                     type: 0,

view/sys/category/save.html

@@ -149,7 +149,11 @@
             var data = $("#form-save").serializeArray();
             $.ajax({
                 type: 'POST',
+<<<<<<< HEAD
+                url: '{:url("/sys/sys_category/doSave")}',
+=======
                 url: '/sys/category/doSave',
+>>>>>>> 12a23a8ae7cd9871a9ece818a1ef3f502a7edd39
                 data: data,
                 dataType: 'json',
                 success: function (res) {

view/sys/public/header.html

@@ -2,7 +2,7 @@
 <header class="navbar-wrapper">
     <div class="navbar navbar-fixed-top">
         <div class="container-fluid cl">
-            <a class="logo navbar-logo f-l mr-10 hidden-xs" href="/admin">后台管理</a>
+            <a class="logo navbar-logo f-l mr-10 hidden-xs" href="/sys/index/index.html">后台管理</a>
             <span class="logo navbar-slogan f-l mr-10 hidden-xs">v{$sys_version}</span>
             <nav class="nav navbar-nav">
                 <ul class="cl">
@@ -19,7 +19,7 @@
                         <span id="top_time"></span>
                     </li>
                     <li>
-                        <a aria-hidden="false" class="logo navbar-logo f-l mr-10 hidden-xs" href="/sys/index.html">
+                        <a aria-hidden="false" class="logo navbar-logo f-l mr-10 hidden-xs" href="/sys/index/index.html">
                             <i class="Hui-iconfont">&#xe625;</i>系统首页</a>
                         <a aria-hidden="false" class="logo navbar-logo f-l mr-10 hidden-xs" href="/index.html"
                             target="_blank">

view/sys/sys_log/index.html

@@ -55,5 +55,30 @@
 
 <!--请在下方写此页面业务相关的脚本-->
 <script type="text/javascript">
+<<<<<<< HEAD
+    // 删除条目
+    // function del(obj, id) {
+    //     layer.confirm('确认要删除吗？', function (index) {
+    //         $.post('delete', {
+    //             'id': id
+    //         }, function (data) {
+    //             if (data.code == 1) {
+    //                 $(obj).parents("tr").remove();
+    //                 layer.msg(data.msg, {
+    //                     icon: 1,
+    //                     time: 1000
+    //                 });
+    //             } else {
+    //                 layer.msg(data.msg, {
+    //                     icon: 5,
+    //                     time: 2000
+    //                 });
+    //                 return false;
+    //             }
+    //         }, 'json');
+    //     });
+    // }
+=======
+>>>>>>> 12a23a8ae7cd9871a9ece818a1ef3f502a7edd39
 </script>
 <!--请在上方写此页面业务相关的脚本-->

view/sys/sys_menu/save.html

@@ -78,7 +78,7 @@
             var data = $("#form-admin-menu").serializeArray();
             $.ajax({
                 type: 'POST',
-                url: '{:url("save")}',
+                url: '{:url("/sys/sys_user/save")}',
                 data: data,
                 dataType: 'json',
                 success: function(res) {

view/sys/sys_role/save.html

@@ -91,7 +91,7 @@
             var data = $("#form-save").serializeArray();
             $.ajax({
                 type: 'POST',
-                url: '{:url("save")}',
+                url: '{:url("/sys/sys_role/save")}',
                 data: data,
                 dataType: 'json',
                 success: function (res) {

view/sys/sys_user/password.html

@@ -67,7 +67,7 @@
 
         $.ajax({
                 type: 'POST',
-                url: '{:url("password")}',
+                url: '{:url("/sys/sys_user/password")}',
                 data: {
                     oldpassword: oldpassword,
                     newpassword: newpassword,

view/sys/sys_user/save.html

@@ -215,7 +215,7 @@
             var data = $("#form-save").serializeArray();
             $.ajax({
                 type: 'POST',
-                url: '{:url("save")}',
+                url: '{:url("/sys/sys_user/save")}',
                 data: data,
                 dataType: 'json',
                 success: function (res) {