molong/sentos
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
molong
2022-11-14 20:34:53 +08:00
parent 5cee9dcfab
commit d02cf12370
18 changed files with 4081 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controller/Index.php
View File

@@ -24,6 +24,7 @@ class Index extends Base{
if(request()->isAjax()){
return ['code' => 1, 'data' => 'SentOS'];
}else{
$area = \think\facade\Db::name('areas')->select();
return view('/index');
}
}

9
app/controller/system/Index.php
View File

@@ -14,7 +14,14 @@ use app\services\system\ConfigService;
class Index extends Base{
public function version(){
$this->data['data'] = 'v1.5.0';
$system_info_mysql = \think\facade\Db::query("select version() as v;");
$this->data['data'] = [
['label' => '核心版本', 'values' => \think\facade\Env::get('version')],
['label' => '服务器操作系统', 'values' => PHP_OS],
['label' => '运行环境', 'values' => $_SERVER['SERVER_SOFTWARE']],
['label' => 'MYSQL版本', 'values' => $system_info_mysql[0]['v']],
['label' => '上传限制', 'values' => '10']
];
return $this->data;
}

14
app/model/Member.php
View File

@@ -1,14 +0,0 @@
<?php
// +----------------------------------------------------------------------
// | SentCMS [ WE CAN DO IT JUST THINK IT ]
// +----------------------------------------------------------------------
// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
// +----------------------------------------------------------------------
// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
// +----------------------------------------------------------------------
namespace app\model;
class Member extends \think\Model{
protected $connection = 'bestcrm';
}

15
app/services/auth/AuthService.php
View File

@@ -9,7 +9,6 @@
namespace app\services\auth;
use app\model\auth\Users;
use app\model\Member;
use app\model\auth\Permissions;
use sent\tree\Tree;
use think\facade\Env;
@@ -33,12 +32,7 @@ class AuthService{
$user = Users::where($map)->field(['uid','username', 'password', 'email', 'avatar', 'department_id', 'status'])->findOrEmpty();
if (!$user->isEmpty()) {
if(!password_verify($params['password'], $user->password)){
$member = Member::where($map)->findOrEmpty();
if (!$member->isEmpty() && $member['password'] === md5($params['password'] . $member['salt'])) {
$user->save(['password'=>password_hash($params['password'], PASSWORD_DEFAULT)]);
}else{
throw new \think\Exception('密码不正确！', 100002);
}
throw new \think\Exception('密码不正确！', 100002);
}
if($user->status != 1){
@@ -46,12 +40,7 @@ class AuthService{
}
return $user->append(['token']);
}else{
$member = Member::where($map)->findOrEmpty();
if(!$member->isEmpty()){
$user = Users::create(['uid' => $member['uid'], 'username' => $member['username'], 'password' => password_hash($params['password'], PASSWORD_DEFAULT), 'nickname' => $member['nickname'], 'email' => $member['email'], 'department_id' => $member['department']]);
}else{
throw new \think\Exception('当前用户不存在', 100001);
}
throw new \think\Exception('当前用户不存在', 100001);
}
}