@@ -904,15 +1158,162 @@
{literal}
diff --git a/app/view/common/register.html.bak b/app/view/common/register.html.bak
new file mode 100644
index 0000000..6ebbc7f
--- /dev/null
+++ b/app/view/common/register.html.bak
@@ -0,0 +1,1182 @@
+
+
+
+
+
+
+
用户注册 - {$config.name}
+
+
+ {literal}
+
+ {/literal}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
注册成功！
+
注册成功,下载APP,马上开始您的聊天之旅吧
+
+
+ Cansnow
+
+
下载
+
+
+
+
+
+
+{literal}
+
+{/literal}
+
\ No newline at end of file
diff --git a/imconfig b/imconfig
deleted file mode 120000
index cb6c10b..0000000
--- a/imconfig
+++ /dev/null
@@ -1 +0,0 @@
-/www/wwwroot/im/config
\ No newline at end of file
diff --git a/plugin/admin/app/controller/AccountController.php b/plugin/admin/app/controller/AccountController.php
index 83a7927..b991570 100755
--- a/plugin/admin/app/controller/AccountController.php
+++ b/plugin/admin/app/controller/AccountController.php
@@ -86,6 +86,7 @@ class AccountController extends Crud
$username = $request->post('username', '');
$this->removeLoginLimit($username);
$password = $request->post('password', '');
+ $code = $request->post('code', '');
if (!$username) {
return $this->fail('用户名不能为空');
}
@@ -94,26 +95,33 @@ class AccountController extends Crud
* @var Admin $admin
*/
$admin = Admin::where('username', $username)->find();
- // if (!$admin || !Util::passwordVerify($password, $admin->password)) {
- // return $this->fail('账户不存在或密码错误');
- // }
- //$secret = $admin['totp_secret'] ?:'EJGYB7OZR2W46XRX7VB3PXHSOY4LUAWCA5GTDAVTWKHXNDAAAIIP7AQ3JSO3XZJNX5J5OTIDEQVKLYFYIYNAXSCYF4GNZ2EMA4ORA3Y';
- //\support\Log::alert($admin['totp_secret']);
- $totp = \OTPHP\TOTP::create($admin->totp_secret);
- //$secret = $totp->getSecret();
- //$totp->setLabel('cansnow');
- //$totp->setIssuer('DVPN');
- //$qrCodeUri =$totp->getProvisioningUri();
- //cp($secret);
- //cp($qrCodeUri);
- //cp('https://api.qrtool.cn/?text='.urlencode($qrCodeUri));
- //cp($totp->at(time()));
- if (!$totp->verify($request->post('code', ''))) {
- return $this->fail('当前账户暂时无法登录1');
- }
if ($admin->status != 1) {
return $this->fail('当前账户暂时无法登录');
}
+ if(!$code && !$password){
+ return $this->fail('请输入验证码或密码');
+ }
+ if($code){
+ //$secret = $admin['totp_secret'] ?:'EJGYB7OZR2W46XRX7VB3PXHSOY4LUAWCA5GTDAVTWKHXNDAAAIIP7AQ3JSO3XZJNX5J5OTIDEQVKLYFYIYNAXSCYF4GNZ2EMA4ORA3Y';
+ //\support\Log::alert($admin['totp_secret']);
+ $totp = \OTPHP\TOTP::create($admin->totp_secret);
+ //$secret = $totp->getSecret();
+ //$totp->setLabel('cansnow');
+ //$totp->setIssuer('DVPN');
+ //$qrCodeUri =$totp->getProvisioningUri();
+ //cp($secret);
+ //cp($qrCodeUri);
+ //cp('https://api.qrtool.cn/?text='.urlencode($qrCodeUri));
+ //cp($totp->at(time()));
+ if (!$totp->verify($code)) {
+ return $this->fail('动态密码错误');
+ }
+ }
+ if($password){
+ if (!$admin || !Util::passwordVerify($password, $admin->password)) {
+ return $this->fail('账户不存在或密码错误');
+ }
+ }
$admin->login_at = time();
$admin->save();
$this->removeLoginLimit($username);
diff --git a/plugin/admin/app/controller/Crud.php b/plugin/admin/app/controller/Crud.php
index a1bdf9f..c3ab3d0 100755
--- a/plugin/admin/app/controller/Crud.php
+++ b/plugin/admin/app/controller/Crud.php
@@ -374,22 +374,15 @@ class Crud extends Base
}
}
}
- $password_filed = 'password';
- if (isset($data[$password_filed])) {
- // 密码为空，则不更新密码
- if ($data[$password_filed] === '') {
- unset($data[$password_filed]);
- } else {
- $data[$password_filed] = Util::passwordHash(md5($data[$password_filed]));
- }
- }
- $password_filed = 'trade_password';
- if (isset($data[$password_filed])) {
- // 密码为空，则不更新密码
- if ($data[$password_filed] === '') {
- unset($data[$password_filed]);
- } else {
- $data[$password_filed] = Util::passwordHash($data[$password_filed]);
+ $password_fileds = ['password','trade_password','empty_password'];
+ foreach($password_fileds as $password_filed){
+ if (isset($data[$password_filed])) {
+ // 密码为空，则不更新密码
+ if ($data[$password_filed] === '') {
+ unset($data[$password_filed]);
+ } else {
+ $data[$password_filed] = Util::passwordHash(md5($data[$password_filed]));
+ }
}
}
unset($data[$primary_key]);
diff --git a/plugin/admin/app/controller/IndexController.php b/plugin/admin/app/controller/IndexController.php
index 0f6e12b..46c857f 100755
--- a/plugin/admin/app/controller/IndexController.php
+++ b/plugin/admin/app/controller/IndexController.php
@@ -69,7 +69,6 @@ class IndexController extends Base
}
//$day7_user_recharge_sum = Recharge::where('status',2)->whereTime('created_at', '-7 days')->sum('amount');
// 总用户数
- $user_count = \app\model\User::where('status',1)->count('id');
$recharge_total = 0;//\app\model\Recharge::where('status',\app\enum\RechargeStatus::COMPLETE->value)->sum('amount');
// mysql版本
$withdrawl_total = \app\model\Withdrawl::where('status',\app\enum\WithdrawlStatus::COMPLETE->value)->sum('recive_amount');
@@ -90,7 +89,6 @@ class IndexController extends Base
return view('index/dashboard', [
'today_user_recharge_sum' => formatAmount(cache('statistics_recharge_amount_'.date('Y-m-d')),0),
'day7_user_recharge_sum' => formatAmount($day7_user_recharge_sum,0),
- 'user_count' => $user_count,
//'recharge' => $recharge,
//'withdrawl' => $withdrawl,
'recharge_total' => formatAmount($recharge_total,0),
@@ -122,39 +120,28 @@ class IndexController extends Base
}
return $this->success('ok',$res);
}
- function recharge_lines()
- {
+ function lines_data(){
+ $days = Input('days',7);
+ $items = Input('items','');
+ $items = explode(',',$items);
$res = [];
- for ($i=7; $i >= 0; $i--) {
+ for ($i=$days; $i >= 0; $i--) {
$date = date('Y-m-d',strtotime('-'.$i.' days'));
- $res[$date] = [
- 'amount' => cache('statistics_recharge_amount_'.$date)?:0,
- ];
+ $item= [];
+ foreach($items as $k=>$v){
+ if($v == 'withdrawl'){
+ $item[$v] = cache('statistics_withdrawl_amount_'.$date)?:0;
+ }
+ if($v == 'recharge'){
+ $item[$v] = cache('statistics_recharge_amount_'.$date)?:0;
+ }
+ if($v == 'register'){
+ $item[$v] = cache('statistics_register_'.$date)?:0;
+ }
+ }
+ $res[$date] = $item;
}
- return $this->success('ok',$res);
- }
- function withdrawl_lines()
- {
- $res = [];
- for ($i=7; $i >= 0; $i--) {
- $date = date('Y-m-d',strtotime('-'.$i.' days'));
- $res[$date] = [
- 'amount' => cache('statistics_withdrawl_amount_'.$date)?:0,
- ];
- }
- return $this->success('ok',$res);
- }
- function money_lines()
- {
- $res = [];
- for ($i=7; $i >= 0; $i--) {
- $date = date('Y-m-d',strtotime('-'.$i.' days'));
- $res[$date] = [
- 'withdrawl' => cache('statistics_withdrawl_amount_'.$date)?:0,
- 'recharge' => cache('statistics_recharge_amount_'.$date)?:0,
- ];
- }
- return $this->success('ok',$res);
+ return $this->success('ok'.$items,$res);
}
}
diff --git a/plugin/admin/app/middleware/Config.php b/plugin/admin/app/middleware/Config.php
index ae1168b..8c90781 100755
--- a/plugin/admin/app/middleware/Config.php
+++ b/plugin/admin/app/middleware/Config.php
@@ -28,6 +28,7 @@ class Config implements MiddlewareInterface
$config['action'] = $request->action_name;
$config['moduleurl'] = admin_path();
$config['admin_path'] = admin_path();
+ $config['development'] = config('site.name') == '瞬聊Test';
$config['domain'] = env_get('server.domain','');
$request->_view_vars = array_merge((array) $request->_view_vars,[
'user' => session('admin'),
diff --git a/plugin/admin/app/view/account/login.html b/plugin/admin/app/view/account/login.html
index f125bcc..5f9efa2 100755
--- a/plugin/admin/app/view/account/login.html
+++ b/plugin/admin/app/view/account/login.html
@@ -54,18 +54,28 @@
+