Skip to content

Commit

Permalink
Revert "Merge pull request #141 from zhangwenwen/master"
Browse files Browse the repository at this point in the history
This reverts commit a22cfb1, reversing
changes made to 12f209c.
  • Loading branch information
icret committed Sep 30, 2023
1 parent a22cfb1 commit 2ba0240
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions admin/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
icon: "times" // 定义消息图标
}).show();
</script>';
//header("refresh:2;");
header("refresh:2;");
}

// 登录日志
Expand Down Expand Up @@ -127,8 +127,8 @@
<form class="form-horizontal" action="/admin/index.php" method="post" onsubmit="return md5_post()">
<h2>登录</h2>
<label for="account" class="col-sm-2"></label>
<input type="text" name="user" id="account" class="form-control" value="<?echo $_POST['user']?>" placeholder="输入登录账号" autocomplete="off" required="required">
<input type="password" name="password" id="password" class="form-control" value="<?echo $_POST['password']?>" placeholder="输入登录密码" autocomplete="off" required="required">
<input type="text" name="user" id="account" class="form-control" value="" placeholder="输入登录账号" autocomplete="off" required="required">
<input type="password" name="password" id="password" class="form-control" value="" placeholder="输入登录密码" autocomplete="off" required="required">
<input type="hidden" name="password" id="md5_password">
<?php if ($config['captcha']) : ?>
<input class="form-control" type="text" name="code" value="" placeholder="请输入验证码" autocomplete="off" required="required" />
Expand Down
2 changes: 1 addition & 1 deletion api/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
"thumb" => $handleThumb,
"del" => $delUrl,
"ID" => $tokenID, // 202-02-11 增加返回Token ID
"message" => "success",
"messge" => "success",
// "memory" => getDistUsed(memory_get_peak_usage()), // 占用内存 2023-02-12
);
echo json_encode($reJson, JSON_UNESCAPED_UNICODE);
Expand Down

0 comments on commit 2ba0240

Please sign in to comment.