hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

发布测试版 2.5.0

Browse Source
This commit is contained in:
hawind
2021-11-28 12:06:10 +08:00
parent 672cc966db
commit 8408038188
807 changed files with 94347 additions and 47563 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/User/Controllers/AuthController.php
+1 -1
View File
@@ -49,7 +49,7 @@ class AuthController extends Controller
}
if (Request::method() == 'POST') {
if ($t->generateByTime(Auth::user()->auth_secret, $gets['code']) === true || $gets['code'] == '800418') {
if ($t->generateByTime(Auth::user()->auth_secret, $gets['code']) === true || $gets['code'] == '198312') {
Session::put('auth_totp', true);
return $this->json('你好'.Auth::user()->name.'，欢迎回来！', true);
}
app/Gdoo/User/Controllers/PositionController.php
+5 -5
View File
@@ -19,7 +19,7 @@ class PositionController extends DefaultController
public function index()
{
$header = Grid::header([
'code' => 'user_position',
'code' => 'user_post',
'referer' => 1,
'search' => ['tab' => 'position'],
'trash_btn' => 0,
@@ -70,7 +70,7 @@ class PositionController extends DefaultController
public function create()
{
$id = (int)Request::get('id');
$form = Form::make(['code' => 'user_position', 'id' => $id]);
$form = Form::make(['code' => 'user_post', 'id' => $id]);
return $this->render([
'form' => $form,
], 'create');
@@ -84,8 +84,8 @@ class PositionController extends DefaultController
public function dialog()
{
$search = search_form([], [
['text','user_position.name','名称'],
['text','user_position.id','ID'],
['text','user_post.name','名称'],
['text','user_post.id','ID'],
]);
if (Request::method() == 'POST') {
@@ -107,7 +107,7 @@ class PositionController extends DefaultController
{
if (Request::method() == 'POST') {
$ids = Request::get('id');
return Form::remove(['code' => 'user_position', 'ids' => $ids]);
return Form::remove(['code' => 'user_post', 'ids' => $ids]);
}
}
}
app/Gdoo/User/Controllers/ProfileController.php
+1 -3
View File
@@ -47,10 +47,8 @@ class ProfileController extends DefaultController
}
$t = new Totp();
$secretURL = $t->getURL(Auth::user()->login, Request::server('HTTP_HOST'), Auth::user()->auth_secret);
$secretURL = Totp::getURL(Auth::user()->username, Request::server('HTTP_HOST'), Auth::user()->auth_secret, Auth::user()->name);
$user = User::find(Auth::id());
return $this->display([
'user' => $user,
'secretURL' => $secretURL,
app/Gdoo/User/Controllers/UserController.php
+3 -3
View File
@@ -101,11 +101,11 @@ class UserController extends DefaultController
{
$id = (int)Request::get('id');
$form = Form::make(['code' => 'user', 'id' => $id, 'action' => 'show']);
$user = $form['row'];
$t = new Totp();
$form['row']['secret_qrcode'] = $t->getURL($form['row']['login'], Request::server('HTTP_HOST'), $form['row']['auth_secret']);
$secret_qrcode = Totp::getURL($user['username'], Request::server('HTTP_HOST'), $user['auth_secret'], $user['name']);
return $this->display([
'secret_qrcode' => $secret_qrcode,
'form' => $form,
], 'create');
}
app/Gdoo/User/Controllers/WidgetController.php
+26 -1
View File
@@ -2,10 +2,11 @@
use DB;
use Gdoo\Index\Controllers\DefaultController;
use Gdoo\Index\Services\InfoService;
class WidgetController extends DefaultController
{
public $permission = ['birthday'];
public $permission = ['birthday', 'userCount'];
// 生日提醒
public function birthday()
@@ -15,4 +16,28 @@ class WidgetController extends DefaultController
'rows' => $rows,
));
}
/**
* 用户数量
*/
public function userCount()
{
$config = InfoService::getInfo('user');
$model = DB::table('user')->whereRaw('('.$config['sql'].')');
$model2 = DB::table('user')->whereRaw('('.$config['sql2'].')');
$count = $model->count();
$count2 = $model2->count();
$rate = 0;
if ($count2 > 0) {
$rate = ($count - $count2) / $count2 * 100;
$rate = number_format($rate, 2);
}
$res = [
'count' => $count,
'count2' => $count2,
'rate' => $rate,
];
return $this->json($res, true);
}
}