From 25345ae006d382adce35c176f3d9698110a9fa91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 15 Oct 2024 13:11:25 +0800
Subject: [PATCH] 'commit'

---
 dsRes/Doc/v1.0/.cache.json                    |   2 +-
 ...source_Base_Controller_BaseController.html | 567 ++++++++++++++++++
 dsRes/Doc/v1.0/dsProject-v1.0-api-docs.json   | 290 +++++++++
 dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json       |   9 -
 dsRes/Doc/v1.0/index.html                     |  57 +-
 .../Base/Controller/BaseController.java       |  21 +-
 .../dsideal/resource/JApiDocsGenerator.java   |   2 +-
 7 files changed, 925 insertions(+), 23 deletions(-)
 create mode 100644 dsRes/Doc/v1.0/com_dsideal_resource_Base_Controller_BaseController.html
 create mode 100644 dsRes/Doc/v1.0/dsProject-v1.0-api-docs.json
 delete mode 100644 dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json

diff --git a/dsRes/Doc/v1.0/.cache.json b/dsRes/Doc/v1.0/.cache.json
index 0637a088..3c66ba24 100644
--- a/dsRes/Doc/v1.0/.cache.json
+++ b/dsRes/Doc/v1.0/.cache.json
@@ -1 +1 @@
-[]
\ No newline at end of file
+[{"baseUrl":"","className":"BaseController","description":"BaseController","docFileName":"com_dsideal_resource_Base_Controller_BaseController.html","generateDocs":true,"packageName":"com.dsideal.resource.Base.Controller","requestNodes":[{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#getStageList","deprecated":false,"description":"获取学段列表","header":[],"method":["GET","POST"],"methodName":"getStageList","paramNodes":[],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/getStageList"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#addSubject","deprecated":false,"description":"增加科目","header":[],"method":["GET","POST"],"methodName":"addSubject","paramNodes":[{"description":"科目名称","jsonBody":false,"name":"subject_name","required":false,"type":"string"},{"description":"科目代码","jsonBody":false,"name":"subject_code","required":false,"type":"string"},{"description":"学段ID","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"排序号","jsonBody":false,"name":"sort_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/addSubject"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#delSubject","deprecated":false,"description":"删除科目","header":[],"method":["GET","POST"],"methodName":"delSubject","paramNodes":[{"description":"科目ID","jsonBody":false,"name":"subject_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/delSubject"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#updateSubject","deprecated":false,"description":"修改科目","header":[],"method":["GET","POST"],"methodName":"updateSubject","paramNodes":[{"description":"科目ID","jsonBody":false,"name":"subject_id","required":false,"type":"int"},{"description":"科目名称","jsonBody":false,"name":"subject_name","required":false,"type":"string"},{"description":"科目代码","jsonBody":false,"name":"subject_code","required":false,"type":"string"},{"description":"学段ID","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"排序号","jsonBody":false,"name":"sort_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/updateSubject"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#listSubject","deprecated":false,"description":"科目列表","header":[],"method":["GET","POST"],"methodName":"listSubject","paramNodes":[{"description":"学段id","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"页码","jsonBody":false,"name":"pageNum","required":false,"type":"int"},{"description":"每页大小","jsonBody":false,"name":"pageSize","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/listSubject"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#getSubject","deprecated":false,"description":"获取科目详情","header":[],"method":["GET","POST"],"methodName":"getSubject","paramNodes":[{"description":"科目ID","jsonBody":false,"name":"subject_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/getSubject"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#addScheme","deprecated":false,"description":"增加版本","header":[],"method":["GET","POST"],"methodName":"addScheme","paramNodes":[{"description":"版本名称","jsonBody":false,"name":"scheme_name","required":false,"type":"string"},{"description":"学段ID","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"科目ID","jsonBody":false,"name":"subject_id","required":false,"type":"int"},{"description":"创建人ID","jsonBody":false,"name":"owner_id","required":false,"type":"string"},{"description":"1：章节目录结构 2：知识点结构","jsonBody":false,"name":"type_id","required":false,"type":"int"},{"description":"1:系统 2云盘","jsonBody":false,"name":"scheme_type_id","required":false,"type":"int"},{"description":"排序号","jsonBody":false,"name":"sort_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/addScheme"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#delScheme","deprecated":false,"description":"删除版本","header":[],"method":["GET","POST"],"methodName":"delScheme","paramNodes":[{"description":"版本ID","jsonBody":false,"name":"scheme_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/delScheme"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#updateScheme","deprecated":false,"description":"修改版本","header":[],"method":["GET","POST"],"methodName":"updateScheme","paramNodes":[{"description":"版本ID","jsonBody":false,"name":"scheme_id","required":false,"type":"int"},{"description":"版本名称","jsonBody":false,"name":"scheme_name","required":false,"type":"string"},{"description":"学段ID","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"科目ID","jsonBody":false,"name":"subject_id","required":false,"type":"int"},{"description":"1:章节目录结构 2：知识点结构","jsonBody":false,"name":"type_id","required":false,"type":"int"},{"description":"1:系统 2云盘","jsonBody":false,"name":"scheme_type_id","required":false,"type":"int"},{"description":"排序号","jsonBody":false,"name":"sort_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/updateScheme"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#listScheme","deprecated":false,"description":"版本列表","header":[],"method":["GET","POST"],"methodName":"listScheme","paramNodes":[{"description":"学段ID","jsonBody":false,"name":"stage_id","required":false,"type":"int"},{"description":"页码","jsonBody":false,"name":"pageNum","required":false,"type":"int"},{"description":"每页大小","jsonBody":false,"name":"pageSize","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/listScheme"},{"changeFlag":0,"codeFileUrl":"com_dsideal_resource_Base_Controller_BaseController.html#getScheme","deprecated":false,"description":"获取版本信息","header":[],"method":["GET","POST"],"methodName":"getScheme","paramNodes":[{"description":"版本ID","jsonBody":false,"name":"scheme_id","required":false,"type":"int"}],"responseNode":{"childNodes":[],"className":"","list":false,"showFieldNotNull":false},"url":"/base/getScheme"}],"srcFileName":"D:\\dsWork\\dsProject\\dsRes\\src\\main\\java\\com\\dsideal\\resource\\Base\\Controller\\BaseController.java"}]
\ No newline at end of file
diff --git a/dsRes/Doc/v1.0/com_dsideal_resource_Base_Controller_BaseController.html b/dsRes/Doc/v1.0/com_dsideal_resource_Base_Controller_BaseController.html
new file mode 100644
index 00000000..0d541546
--- /dev/null
+++ b/dsRes/Doc/v1.0/com_dsideal_resource_Base_Controller_BaseController.html
@@ -0,0 +1,567 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <title>BaseController</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/google-code-prettify@1.0.5/bin/prettify.min.css">
+    <link rel="stylesheet" href="style.css">
+</head>
+<body onload="PR.prettyPrint()">
+<nav class="navbar">
+    <div class="container-fluid">
+        <div class="navbar-header">
+            <a class="navbar-brand" href="index.html">
+                dsProject
+            </a>
+        </div>
+        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+            <ul class="nav navbar-nav navbar-right">
+                <li><a href="https://github.com/YeDaxia/JApiDocs" target="_blank">GitHub</a></li>
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">v1.0<span class="caret"></span></a>
+                    <ul class="dropdown-menu">
+                    </ul>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
+<div class="book with-summary">
+    <div class="book-summary">
+<div class="search-box form-group">
+    <input type="text" class="form-control" id="inputSearch" placeholder="搜索接口">
+    <span class="glyphicon glyphicon-search form-control-feedback" aria-hidden="true"></span>
+</div>
+<div id="accordion" class="catalog">
+        <div class="panel">
+            <div id="heading0" data-parent="#accordion" class="catalog-title" data-toggle="collapse"
+                 aria-expanded="true" data-target="#collapse0" aria-controls="collapse0">
+                <i class="glyphicon glyphicon-align-justify"></i> BaseController
+            </div>
+            <div id="collapse0" class="collapse in " aria-labelledby="heading0">
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#getStageList">
+                        获取学段列表
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#addSubject">
+                        增加科目
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#delSubject">
+                        删除科目
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#updateSubject">
+                        修改科目
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#listSubject">
+                        科目列表
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#getSubject">
+                        获取科目详情
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#addScheme">
+                        增加版本
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#delScheme">
+                        删除版本
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#updateScheme">
+                        修改版本
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#listScheme">
+                        版本列表
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#getScheme">
+                        获取版本信息
+                    </a>
+            </div>
+        </div>
+</div>    </div>
+    <div class="book-body">
+        <div class="body-inner">
+            <div class="book-header">
+                <div class="d-flex justify-content-between">
+                    <a class="header-menu toggle-catalog" href="javascript:void(0)"><i
+                            class="glyphicon glyphicon-align-justify"></i> 目录</a>
+                </div>
+            </div>
+            <div class="page-wrapper">
+                <div class="page-inner">
+                    <div class="action-list">
+                        <div class="action-item">
+<h2 id="getStageList"><a href="#">获取学段列表 </a></h2>
+<p><strong>请求URL</strong></p>
+<p>
+    <code>/base/getStageList</code>
+        <span class="label label-default">GET</span>
+        <span class="label label-default">POST</span>
+</p>
+    <p><strong>返回结果</strong></p>
+    <pre class="prettyprint lang-json">{}</pre>
+                        </div>
+                        <hr>
+                        <div class="action-item">
+<h2 id="addSubject"><a href="#">增加科目 </a></h2>
+<p><strong>请求URL</strong></p>
+<p>
+    <code>/base/addSubject</code>
+        <span class="label label-default">GET</span>
+        <span class="label label-default">POST</span>
+</p>
+        <p><strong>请求参数</strong> <span class="badge">application/x-www-form-urlencoded</span></p>
+        <table class="table table-bordered">
+            <tr>
+                <th>参数名</th>
+                <th>类型</th>
+                <th>必须</th>
+                <th>描述</th>
+            </tr>
+                    <tr>
+                        <td>subject_name</td>
+                        <td>string</td>
+                        <td>否</td>
+                        <td>科目名称</td>
+                    </tr>
+                    <tr>
+                        <td>subject_code</td>
+                        <td>string</td>
+                        <td>否</td>
+                        <td>科目代码</td>
+                    </tr>
+                    <tr>
+                        <td>stage_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>学段ID</td>
+                    </tr>
+                    <tr>
+                        <td>sort_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>排序号</td>
+                    </tr>
+        </table>
+    <p><strong>返回结果</strong></p>
+    <pre class="prettyprint lang-json">{}</pre>
+                        </div>
+                        <hr>
+                        <div class="action-item">
+<h2 id="delSubject"><a href="#">删除科目 </a></h2>
+<p><strong>请求URL</strong></p>
+<p>
+    <code>/base/delSubject</code>
+        <span class="label label-default">GET</span>
+        <span class="label label-default">POST</span>
+</p>
+        <p><strong>请求参数</strong> <span class="badge">application/x-www-form-urlencoded</span></p>
+        <table class="table table-bordered">
+            <tr>
+                <th>参数名</th>
+                <th>类型</th>
+                <th>必须</th>
+                <th>描述</th>
+            </tr>
+                    <tr>
+                        <td>subject_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>科目ID</td>
+                    </tr>
+        </table>
+    <p><strong>返回结果</strong></p>
+    <pre class="prettyprint lang-json">{}</pre>
+                        </div>
+                        <hr>
+                        <div class="action-item">
+<h2 id="updateSubject"><a href="#">修改科目 </a></h2>
+<p><strong>请求URL</strong></p>
+<p>
+    <code>/base/updateSubject</code>
+        <span class="label label-default">GET</span>
+        <span class="label label-default">POST</span>
+</p>
+        <p><strong>请求参数</strong> <span class="badge">application/x-www-form-urlencoded</span></p>
+        <table class="table table-bordered">
+            <tr>
+                <th>参数名</th>
+                <th>类型</th>
+                <th>必须</th>
+                <th>描述</th>
+            </tr>
+                    <tr>
+                        <td>subject_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>科目ID</td>
+                    </tr>
+                    <tr>
+                        <td>subject_name</td>
+                        <td>string</td>
+                        <td>否</td>
+                        <td>科目名称</td>
+                    </tr>
+                    <tr>
+                        <td>subject_code</td>
+                        <td>string</td>
+                        <td>否</td>
+                        <td>科目代码</td>
+                    </tr>
+                    <tr>
+                        <td>stage_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>学段ID</td>
+                    </tr>
+                    <tr>
+                        <td>sort_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>排序号</td>
+                    </tr>
+        </table>
+    <p><strong>返回结果</strong></p>
+    <pre class="prettyprint lang-json">{}</pre>
+                        </div>
+                        <hr>
+                        <div class="action-item">
+<h2 id="listSubject"><a href="#">科目列表 </a></h2>
+<p><strong>请求URL</strong></p>
+<p>
+    <code>/base/listSubject</code>
+        <span class="label label-default">GET</span>
+        <span class="label label-default">POST</span>
+</p>
+        <p><strong>请求参数</strong> <span class="badge">application/x-www-form-urlencoded</span></p>
+        <table class="table table-bordered">
+            <tr>
+                <th>参数名</th>
+                <th>类型</th>
+                <th>必须</th>
+                <th>描述</th>
+            </tr>
+                    <tr>
+                        <td>stage_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>学段id</td>
+                    </tr>
+                    <tr>
+                        <td>pageNum</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>页码</td>
+                    </tr>
+                    <tr>
+                        <td>pageSize</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>每页大小</td>
+                    </tr>
+        </table>
+    <p><strong>返回结果</strong></p>
+    <pre class="prettyprint lang-json">{}</pre>
+                        </div>
+                        <hr>
+                        <div class="action-item">
+<h2 id="getSubject"><a href="#">获取科目详情 </a></h2>
+<p><strong>请求URL</strong></p>
+<p>
+    <code>/base/getSubject</code>
+        <span class="label label-default">GET</span>
+        <span class="label label-default">POST</span>
+</p>
+        <p><strong>请求参数</strong> <span class="badge">application/x-www-form-urlencoded</span></p>
+        <table class="table table-bordered">
+            <tr>
+                <th>参数名</th>
+                <th>类型</th>
+                <th>必须</th>
+                <th>描述</th>
+            </tr>
+                    <tr>
+                        <td>subject_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>科目ID</td>
+                    </tr>
+        </table>
+    <p><strong>返回结果</strong></p>
+    <pre class="prettyprint lang-json">{}</pre>
+                        </div>
+                        <hr>
+                        <div class="action-item">
+<h2 id="addScheme"><a href="#">增加版本 </a></h2>
+<p><strong>请求URL</strong></p>
+<p>
+    <code>/base/addScheme</code>
+        <span class="label label-default">GET</span>
+        <span class="label label-default">POST</span>
+</p>
+        <p><strong>请求参数</strong> <span class="badge">application/x-www-form-urlencoded</span></p>
+        <table class="table table-bordered">
+            <tr>
+                <th>参数名</th>
+                <th>类型</th>
+                <th>必须</th>
+                <th>描述</th>
+            </tr>
+                    <tr>
+                        <td>scheme_name</td>
+                        <td>string</td>
+                        <td>否</td>
+                        <td>版本名称</td>
+                    </tr>
+                    <tr>
+                        <td>stage_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>学段ID</td>
+                    </tr>
+                    <tr>
+                        <td>subject_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>科目ID</td>
+                    </tr>
+                    <tr>
+                        <td>owner_id</td>
+                        <td>string</td>
+                        <td>否</td>
+                        <td>创建人ID</td>
+                    </tr>
+                    <tr>
+                        <td>type_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>1：章节目录结构 2：知识点结构</td>
+                    </tr>
+                    <tr>
+                        <td>scheme_type_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>1:系统 2云盘</td>
+                    </tr>
+                    <tr>
+                        <td>sort_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>排序号</td>
+                    </tr>
+        </table>
+    <p><strong>返回结果</strong></p>
+    <pre class="prettyprint lang-json">{}</pre>
+                        </div>
+                        <hr>
+                        <div class="action-item">
+<h2 id="delScheme"><a href="#">删除版本 </a></h2>
+<p><strong>请求URL</strong></p>
+<p>
+    <code>/base/delScheme</code>
+        <span class="label label-default">GET</span>
+        <span class="label label-default">POST</span>
+</p>
+        <p><strong>请求参数</strong> <span class="badge">application/x-www-form-urlencoded</span></p>
+        <table class="table table-bordered">
+            <tr>
+                <th>参数名</th>
+                <th>类型</th>
+                <th>必须</th>
+                <th>描述</th>
+            </tr>
+                    <tr>
+                        <td>scheme_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>版本ID</td>
+                    </tr>
+        </table>
+    <p><strong>返回结果</strong></p>
+    <pre class="prettyprint lang-json">{}</pre>
+                        </div>
+                        <hr>
+                        <div class="action-item">
+<h2 id="updateScheme"><a href="#">修改版本 </a></h2>
+<p><strong>请求URL</strong></p>
+<p>
+    <code>/base/updateScheme</code>
+        <span class="label label-default">GET</span>
+        <span class="label label-default">POST</span>
+</p>
+        <p><strong>请求参数</strong> <span class="badge">application/x-www-form-urlencoded</span></p>
+        <table class="table table-bordered">
+            <tr>
+                <th>参数名</th>
+                <th>类型</th>
+                <th>必须</th>
+                <th>描述</th>
+            </tr>
+                    <tr>
+                        <td>scheme_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>版本ID</td>
+                    </tr>
+                    <tr>
+                        <td>scheme_name</td>
+                        <td>string</td>
+                        <td>否</td>
+                        <td>版本名称</td>
+                    </tr>
+                    <tr>
+                        <td>stage_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>学段ID</td>
+                    </tr>
+                    <tr>
+                        <td>subject_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>科目ID</td>
+                    </tr>
+                    <tr>
+                        <td>type_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>1:章节目录结构 2：知识点结构</td>
+                    </tr>
+                    <tr>
+                        <td>scheme_type_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>1:系统 2云盘</td>
+                    </tr>
+                    <tr>
+                        <td>sort_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>排序号</td>
+                    </tr>
+        </table>
+    <p><strong>返回结果</strong></p>
+    <pre class="prettyprint lang-json">{}</pre>
+                        </div>
+                        <hr>
+                        <div class="action-item">
+<h2 id="listScheme"><a href="#">版本列表 </a></h2>
+<p><strong>请求URL</strong></p>
+<p>
+    <code>/base/listScheme</code>
+        <span class="label label-default">GET</span>
+        <span class="label label-default">POST</span>
+</p>
+        <p><strong>请求参数</strong> <span class="badge">application/x-www-form-urlencoded</span></p>
+        <table class="table table-bordered">
+            <tr>
+                <th>参数名</th>
+                <th>类型</th>
+                <th>必须</th>
+                <th>描述</th>
+            </tr>
+                    <tr>
+                        <td>stage_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>学段ID</td>
+                    </tr>
+                    <tr>
+                        <td>pageNum</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>页码</td>
+                    </tr>
+                    <tr>
+                        <td>pageSize</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>每页大小</td>
+                    </tr>
+        </table>
+    <p><strong>返回结果</strong></p>
+    <pre class="prettyprint lang-json">{}</pre>
+                        </div>
+                        <hr>
+                        <div class="action-item">
+<h2 id="getScheme"><a href="#">获取版本信息 </a></h2>
+<p><strong>请求URL</strong></p>
+<p>
+    <code>/base/getScheme</code>
+        <span class="label label-default">GET</span>
+        <span class="label label-default">POST</span>
+</p>
+        <p><strong>请求参数</strong> <span class="badge">application/x-www-form-urlencoded</span></p>
+        <table class="table table-bordered">
+            <tr>
+                <th>参数名</th>
+                <th>类型</th>
+                <th>必须</th>
+                <th>描述</th>
+            </tr>
+                    <tr>
+                        <td>scheme_id</td>
+                        <td>int</td>
+                        <td>否</td>
+                        <td>版本ID</td>
+                    </tr>
+        </table>
+    <p><strong>返回结果</strong></p>
+    <pre class="prettyprint lang-json">{}</pre>
+                        </div>
+                        <hr>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/js/bootstrap.min.js"></script>
+<script src="https://cdn.jsdelivr.net/autocomplete.js/0/autocomplete.jquery.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/google-code-prettify@1.0.5/bin/prettify.min.js"></script>
+<script>
+
+    var search_source_data = [
+            {name: 'BaseController.获取学段列表', url: 'com_dsideal_resource_Base_Controller_BaseController.html#getStageList'},
+            {name: 'BaseController.增加科目', url: 'com_dsideal_resource_Base_Controller_BaseController.html#addSubject'},
+            {name: 'BaseController.删除科目', url: 'com_dsideal_resource_Base_Controller_BaseController.html#delSubject'},
+            {name: 'BaseController.修改科目', url: 'com_dsideal_resource_Base_Controller_BaseController.html#updateSubject'},
+            {name: 'BaseController.科目列表', url: 'com_dsideal_resource_Base_Controller_BaseController.html#listSubject'},
+            {name: 'BaseController.获取科目详情', url: 'com_dsideal_resource_Base_Controller_BaseController.html#getSubject'},
+            {name: 'BaseController.增加版本', url: 'com_dsideal_resource_Base_Controller_BaseController.html#addScheme'},
+            {name: 'BaseController.删除版本', url: 'com_dsideal_resource_Base_Controller_BaseController.html#delScheme'},
+            {name: 'BaseController.修改版本', url: 'com_dsideal_resource_Base_Controller_BaseController.html#updateScheme'},
+            {name: 'BaseController.版本列表', url: 'com_dsideal_resource_Base_Controller_BaseController.html#listScheme'},
+            {name: 'BaseController.获取版本信息', url: 'com_dsideal_resource_Base_Controller_BaseController.html#getScheme'},
+    ];
+
+
+
+    $('.toggle-catalog').click(function () {
+        $('.book').toggleClass('with-summary');
+    });
+
+    $('#inputSearch').autocomplete({hint: false}, [
+        {
+            source: function (query, callback) {
+                var result = [];
+                for(var i = 0; i !== search_source_data.length; i++){
+                    if(search_source_data[i].name.indexOf(query) !== -1){
+                        result.push(search_source_data[i]);
+                    }
+                }
+                callback(result);
+            },
+            displayKey: 'name',
+            templates: {
+                suggestion: function (suggestion) {
+                    return suggestion.name;
+                }
+            }
+        }
+    ]).on('autocomplete:selected', function (event, suggestion, dataset, context) {
+        self.location = suggestion.url;
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/dsRes/Doc/v1.0/dsProject-v1.0-api-docs.json b/dsRes/Doc/v1.0/dsProject-v1.0-api-docs.json
new file mode 100644
index 00000000..c8041cb7
--- /dev/null
+++ b/dsRes/Doc/v1.0/dsProject-v1.0-api-docs.json
@@ -0,0 +1,290 @@
+{
+  "item": [
+    {
+      "request": {
+        "method": "GET",
+        "url": {
+          "query": [],
+          "raw": "{{domain}}/base/getStageList"
+        }
+      },
+      "name": "获取学段列表"
+    },
+    {
+      "request": {
+        "method": "POST",
+        "url": {
+          "query": [
+            {
+              "description": "科目名称",
+              "value": "",
+              "key": "subject_name"
+            },
+            {
+              "description": "科目代码",
+              "value": "",
+              "key": "subject_code"
+            },
+            {
+              "description": "学段ID",
+              "value": "",
+              "key": "stage_id"
+            },
+            {
+              "description": "排序号",
+              "value": "",
+              "key": "sort_id"
+            }
+          ],
+          "raw": "{{domain}}/base/addSubject"
+        }
+      },
+      "name": "增加科目"
+    },
+    {
+      "request": {
+        "method": "POST",
+        "url": {
+          "query": [
+            {
+              "description": "科目ID",
+              "value": "",
+              "key": "subject_id"
+            }
+          ],
+          "raw": "{{domain}}/base/delSubject"
+        }
+      },
+      "name": "删除科目"
+    },
+    {
+      "request": {
+        "method": "POST",
+        "url": {
+          "query": [
+            {
+              "description": "科目ID",
+              "value": "",
+              "key": "subject_id"
+            },
+            {
+              "description": "科目名称",
+              "value": "",
+              "key": "subject_name"
+            },
+            {
+              "description": "科目代码",
+              "value": "",
+              "key": "subject_code"
+            },
+            {
+              "description": "学段ID",
+              "value": "",
+              "key": "stage_id"
+            },
+            {
+              "description": "排序号",
+              "value": "",
+              "key": "sort_id"
+            }
+          ],
+          "raw": "{{domain}}/base/updateSubject"
+        }
+      },
+      "name": "修改科目"
+    },
+    {
+      "request": {
+        "method": "GET",
+        "url": {
+          "query": [
+            {
+              "description": "学段id",
+              "value": "",
+              "key": "stage_id"
+            },
+            {
+              "description": "页码",
+              "value": "",
+              "key": "pageNum"
+            },
+            {
+              "description": "每页大小",
+              "value": "",
+              "key": "pageSize"
+            }
+          ],
+          "raw": "{{domain}}/base/listSubject"
+        }
+      },
+      "name": "科目列表"
+    },
+    {
+      "request": {
+        "method": "GET",
+        "url": {
+          "query": [
+            {
+              "description": "科目ID",
+              "value": "",
+              "key": "subject_id"
+            }
+          ],
+          "raw": "{{domain}}/base/getSubject"
+        }
+      },
+      "name": "获取科目详情"
+    },
+    {
+      "request": {
+        "method": "POST",
+        "url": {
+          "query": [
+            {
+              "description": "版本名称",
+              "value": "",
+              "key": "scheme_name"
+            },
+            {
+              "description": "学段ID",
+              "value": "",
+              "key": "stage_id"
+            },
+            {
+              "description": "科目ID",
+              "value": "",
+              "key": "subject_id"
+            },
+            {
+              "description": "创建人ID",
+              "value": "",
+              "key": "owner_id"
+            },
+            {
+              "description": "1：章节目录结构 2：知识点结构",
+              "value": "",
+              "key": "type_id"
+            },
+            {
+              "description": "1:系统 2云盘",
+              "value": "",
+              "key": "scheme_type_id"
+            },
+            {
+              "description": "排序号",
+              "value": "",
+              "key": "sort_id"
+            }
+          ],
+          "raw": "{{domain}}/base/addScheme"
+        }
+      },
+      "name": "增加版本"
+    },
+    {
+      "request": {
+        "method": "POST",
+        "url": {
+          "query": [
+            {
+              "description": "版本ID",
+              "value": "",
+              "key": "scheme_id"
+            }
+          ],
+          "raw": "{{domain}}/base/delScheme"
+        }
+      },
+      "name": "删除版本"
+    },
+    {
+      "request": {
+        "method": "POST",
+        "url": {
+          "query": [
+            {
+              "description": "版本ID",
+              "value": "",
+              "key": "scheme_id"
+            },
+            {
+              "description": "版本名称",
+              "value": "",
+              "key": "scheme_name"
+            },
+            {
+              "description": "学段ID",
+              "value": "",
+              "key": "stage_id"
+            },
+            {
+              "description": "科目ID",
+              "value": "",
+              "key": "subject_id"
+            },
+            {
+              "description": "1:章节目录结构 2：知识点结构",
+              "value": "",
+              "key": "type_id"
+            },
+            {
+              "description": "1:系统 2云盘",
+              "value": "",
+              "key": "scheme_type_id"
+            },
+            {
+              "description": "排序号",
+              "value": "",
+              "key": "sort_id"
+            }
+          ],
+          "raw": "{{domain}}/base/updateScheme"
+        }
+      },
+      "name": "修改版本"
+    },
+    {
+      "request": {
+        "method": "GET",
+        "url": {
+          "query": [
+            {
+              "description": "学段ID",
+              "value": "",
+              "key": "stage_id"
+            },
+            {
+              "description": "页码",
+              "value": "",
+              "key": "pageNum"
+            },
+            {
+              "description": "每页大小",
+              "value": "",
+              "key": "pageSize"
+            }
+          ],
+          "raw": "{{domain}}/base/listScheme"
+        }
+      },
+      "name": "版本列表"
+    },
+    {
+      "request": {
+        "method": "GET",
+        "url": {
+          "query": [
+            {
+              "description": "版本ID",
+              "value": "",
+              "key": "scheme_id"
+            }
+          ],
+          "raw": "{{domain}}/base/getScheme"
+        }
+      },
+      "name": "获取版本信息"
+    }
+  ],
+  "name": "BaseController"
+}
\ No newline at end of file
diff --git a/dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json b/dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json
deleted file mode 100644
index 1074fd13..00000000
--- a/dsRes/Doc/v1.0/dsRes-v1.0-api-docs.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-"info": {
-"_postman_id": "",
-"name": "dsRes",
-"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-},
-"item": [
-]
-}
\ No newline at end of file
diff --git a/dsRes/Doc/v1.0/index.html b/dsRes/Doc/v1.0/index.html
index 98d917a6..ab6a4291 100644
--- a/dsRes/Doc/v1.0/index.html
+++ b/dsRes/Doc/v1.0/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>dsResAPI Documentation</title>
+    <title>dsProjectAPI Documentation</title>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/google-code-prettify@1.0.5/bin/prettify.min.css">
@@ -14,7 +14,7 @@
     <div class="container-fluid">
         <div class="navbar-header">
             <a class="navbar-brand" href="index.html">
-                dsRes
+                dsProject
             </a>
         </div>
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
@@ -36,6 +36,47 @@
     <span class="glyphicon glyphicon-search form-control-feedback" aria-hidden="true"></span>
 </div>
 <div id="accordion" class="catalog">
+        <div class="panel">
+            <div id="heading0" data-parent="#accordion" class="catalog-title" data-toggle="collapse"
+                 aria-expanded="true" data-target="#collapse0" aria-controls="collapse0">
+                <i class="glyphicon glyphicon-align-justify"></i> BaseController
+            </div>
+            <div id="collapse0" class="collapse in " aria-labelledby="heading0">
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#getStageList">
+                        获取学段列表
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#addSubject">
+                        增加科目
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#delSubject">
+                        删除科目
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#updateSubject">
+                        修改科目
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#listSubject">
+                        科目列表
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#getSubject">
+                        获取科目详情
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#addScheme">
+                        增加版本
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#delScheme">
+                        删除版本
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#updateScheme">
+                        修改版本
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#listScheme">
+                        版本列表
+                    </a>
+                    <a class="catalog-item" href="com_dsideal_resource_Base_Controller_BaseController.html#getScheme">
+                        获取版本信息
+                    </a>
+            </div>
+        </div>
 </div>    </div>
     <div class="book-body">
         <div class="body-inner">
@@ -51,6 +92,7 @@
                         <img src="http://static.nowait.xin/pic/japidocs-logo.png" width="200" height="200">
                         <h4 style="margin: 20px">本文档由JApiDocs生成</h4>
                         <div class="list-group" style="min-width: 200px">
+                                <a href="com_dsideal_resource_Base_Controller_BaseController.html" class="list-group-item">BaseController</a>
                         </div>
                     </div>
                 </div>
@@ -65,6 +107,17 @@
 <script>
 
     var search_source_data = [
+        {name: 'BaseController.获取学段列表', url: 'com_dsideal_resource_Base_Controller_BaseController.html#getStageList'},
+        {name: 'BaseController.增加科目', url: 'com_dsideal_resource_Base_Controller_BaseController.html#addSubject'},
+        {name: 'BaseController.删除科目', url: 'com_dsideal_resource_Base_Controller_BaseController.html#delSubject'},
+        {name: 'BaseController.修改科目', url: 'com_dsideal_resource_Base_Controller_BaseController.html#updateSubject'},
+        {name: 'BaseController.科目列表', url: 'com_dsideal_resource_Base_Controller_BaseController.html#listSubject'},
+        {name: 'BaseController.获取科目详情', url: 'com_dsideal_resource_Base_Controller_BaseController.html#getSubject'},
+        {name: 'BaseController.增加版本', url: 'com_dsideal_resource_Base_Controller_BaseController.html#addScheme'},
+        {name: 'BaseController.删除版本', url: 'com_dsideal_resource_Base_Controller_BaseController.html#delScheme'},
+        {name: 'BaseController.修改版本', url: 'com_dsideal_resource_Base_Controller_BaseController.html#updateScheme'},
+        {name: 'BaseController.版本列表', url: 'com_dsideal_resource_Base_Controller_BaseController.html#listScheme'},
+        {name: 'BaseController.获取版本信息', url: 'com_dsideal_resource_Base_Controller_BaseController.html#getScheme'},
     ];
 
 
diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java
index bde9c91d..64b23f6a 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java
@@ -11,9 +11,10 @@ import com.jfinal.ext.interceptor.GET;
 import com.jfinal.ext.interceptor.POST;
 import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
+import io.github.yedaxia.apidocs.ApiDoc;
 
 import java.util.List;
-
+@ApiDoc
 public class BaseController extends Controller {
     BaseModel bm = new BaseModel();
 
@@ -130,16 +131,16 @@ public class BaseController extends Controller {
         renderJson(RetKit.renderSuccess(record));
     }
 
+
     /**
-     * 添加版本
-     * scheme_name              版本名称
-     * stage_id                 学段
-     * subject_id               科目
-     * b_use                    是否启用
-     * owner_id                 系统:0 其他：学校ID
-     * type_id1                章节目录结构 2：知识点结构
-     * scheme_type_id          1:系统 2:云盘
-     * sort_id          版本的排序号
+     * 增加版本
+     * @param scheme_name  版本名称
+     * @param stage_id 学段ID
+     * @param subject_id 科目ID
+     * @param owner_id 创建人ID
+     * @param type_id 1：章节目录结构 2：知识点结构
+     * @param scheme_type_id 1:系统 2云盘
+     * @param sort_id 排序号
      */
     @Before({POST.class})
     @JwtCheckInterface({})
diff --git a/dsRes/src/main/java/com/dsideal/resource/JApiDocsGenerator.java b/dsRes/src/main/java/com/dsideal/resource/JApiDocsGenerator.java
index e39234e6..234bc369 100644
--- a/dsRes/src/main/java/com/dsideal/resource/JApiDocsGenerator.java
+++ b/dsRes/src/main/java/com/dsideal/resource/JApiDocsGenerator.java
@@ -118,8 +118,8 @@ public class JApiDocsGenerator {
         //可以限制只生成哪个接口,数组内容为空，则表示生成全部
         //String[] generateInterfacesList = {"getWxTj"};
         String[] generateInterfacesList = {};
+        String projectPath = System.getProperty("user.dir")+"/dsRes";
 
-        String projectPath = System.getProperty("user.dir");
         projectPath = projectPath.replace("\\", "/");
         String projectName = projectPath.substring(projectPath.lastIndexOf("/") + 1);
         DocsConfig config = new DocsConfig();