blackteay/ApiAdmin
1
0
Fork 0
mirror of https://gitee.com/apiadmin/ApiAdmin.git synced 2025-04-06 03:58:00 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhaoxiang 2018-08-07 19:20:01 +08:00
commit 9a96177e74
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/controller/InterfaceList.php
View File

@ -73,7 +73,7 @@ class InterfaceList extends Base {
*/ */
public function add() { public function add() {
$postData = $this->request->post(); $postData = $this->request->post();
if (!preg_match("/^[A-Za-z0-9\/]+$/", $postData['apiClass'])) { if (!preg_match("/^[A-Za-z0-9_\/]+$/", $postData['apiClass'])) {
return $this->buildFailed(ReturnCode::DB_SAVE_ERROR, '真实类名只允许填写字母，数字和/'); return $this->buildFailed(ReturnCode::DB_SAVE_ERROR, '真实类名只允许填写字母，数字和/');
} }
@ -114,7 +114,7 @@ class InterfaceList extends Base {
*/ */
public function edit() { public function edit() {
$postData = $this->request->post(); $postData = $this->request->post();
if (!preg_match("/^[A-Za-z0-9\/]+$/", $postData['apiClass'])) { if (!preg_match("/^[A-Za-z0-9_\/]+$/", $postData['apiClass'])) {
return $this->buildFailed(ReturnCode::DB_SAVE_ERROR, '真实类名只允许填写字母，数字和/'); return $this->buildFailed(ReturnCode::DB_SAVE_ERROR, '真实类名只允许填写字母，数字和/');
} }

2
application/api/behavior/BuildResponse.php
View File

@ -23,6 +23,8 @@ class BuildResponse {
* @throws \think\exception\DbException * @throws \think\exception\DbException
*/ */
public function run($response) { public function run($response) {
$header = config('apiAdmin.CROSS_DOMAIN');
$response->header($header);
$data = $response->getData(); $data = $response->getData();
$request = Request::instance(); $request = Request::instance();
$hash = $request->routeInfo(); $hash = $request->routeInfo();

2
application/wiki/view/index/detail.html
View File

@ -37,7 +37,7 @@
<div class="ui vertical menu" style="width: 100%;overflow: auto;"> <div class="ui vertical menu" style="width: 100%;overflow: auto;">
{volist name="apiList" id="vo"} {volist name="apiList" id="vo"}
<a class="{if condition="$hash == $vo['hash']"}active{/if} teal item" href="{:url('/wiki/detail/'.$groupHash.'/'.$vo["hash"])}"> <a class="{if condition="$hash == $vo['hash']"}active{/if} teal item" href="{:url('/wiki/detail/'.$groupHash.'/'.$vo["hash"])}">
{:substr($vo['hash'], 0, 11)}...（{:mb_substr($vo['info'], 0, 3)}...） {:mb_substr($vo['info'], 0, 11)}...
<div class="ui {if condition="$hash == $vo['hash']"}teal{/if} label"> &gt; </div> <div class="ui {if condition="$hash == $vo['hash']"}teal{/if} label"> &gt; </div>
</a> </a>
{/volist} {/volist}