refactor(kefu): remove BaseAuth dependencies from unused kefu module
Made-with: Cursor
This commit is contained in:
@@ -6,15 +6,15 @@
|
||||
namespace app\controller\kefu;
|
||||
|
||||
|
||||
use app\common\controller\AppBaseController;
|
||||
use app\Request;
|
||||
use crmeb\basic\BaseController;
|
||||
|
||||
/**
|
||||
* Class AuthController
|
||||
* @package app\kefuapi\controller
|
||||
* @property Request $request
|
||||
*/
|
||||
abstract class AuthController extends BaseController
|
||||
abstract class AuthController extends AppBaseController
|
||||
{
|
||||
|
||||
/**
|
||||
|
||||
@@ -6,14 +6,15 @@
|
||||
namespace app\controller\kefu;
|
||||
|
||||
|
||||
use app\common\controller\AppBaseController;
|
||||
use app\Request;
|
||||
use app\services\kefu\KefuServices;
|
||||
use app\services\kefu\ProductServices;
|
||||
use app\services\message\service\StoreServiceRecordServices;
|
||||
use app\services\order\StoreOrderServices;
|
||||
use app\services\system\LocalCopyrightService;
|
||||
use app\services\system\attachment\SystemAttachmentServices;
|
||||
use app\services\user\UserAuthServices;
|
||||
use crmeb\basic\BaseController;
|
||||
use app\services\user\UserServices;
|
||||
use app\services\other\CacheServices;
|
||||
use app\services\message\service\StoreServiceServices;
|
||||
@@ -29,7 +30,7 @@ use think\db\exception\DataNotFoundException;
|
||||
use think\db\exception\DbException;
|
||||
use think\db\exception\ModelNotFoundException;
|
||||
|
||||
class Common extends BaseController
|
||||
class Common extends AppBaseController
|
||||
{
|
||||
protected function initialize()
|
||||
{
|
||||
@@ -269,14 +270,8 @@ class Common extends BaseController
|
||||
*/
|
||||
public function getCopyright()
|
||||
{
|
||||
$res = false;
|
||||
try {
|
||||
$copyright = $this->__z6uxyJQ4xYa5ee1mx5();
|
||||
$res = true;
|
||||
} catch (\Throwable $e) {
|
||||
$copyright = ['copyrightContext' => '', 'copyrightImage' => ''];
|
||||
}
|
||||
$copyright['is_copyright'] = $res;
|
||||
$copyright = app()->make(LocalCopyrightService::class)->getCopyright();
|
||||
$copyright['is_copyright'] = false;
|
||||
return $this->success($copyright);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
namespace app\controller\kefu;
|
||||
|
||||
|
||||
use app\common\controller\AppBaseController;
|
||||
use app\Request;
|
||||
use crmeb\basic\BaseController;
|
||||
use crmeb\services\CacheService;
|
||||
use app\services\kefu\LoginServices;
|
||||
use app\validate\kefu\LoginValidate;
|
||||
@@ -21,7 +21,7 @@ use think\db\exception\ModelNotFoundException;
|
||||
* Class Login
|
||||
* @package app\kefu\controller
|
||||
*/
|
||||
class Login extends BaseController
|
||||
class Login extends AppBaseController
|
||||
{
|
||||
|
||||
/**
|
||||
|
||||
@@ -6,13 +6,11 @@
|
||||
namespace app\services\kefu;
|
||||
|
||||
|
||||
use crmeb\basic\BaseAuth;
|
||||
use app\services\auth\AccessTokenService;
|
||||
use app\services\BaseServices;
|
||||
use crmeb\exceptions\AuthException;
|
||||
use crmeb\services\CacheService;
|
||||
use app\dao\message\service\StoreServiceDao;
|
||||
use crmeb\services\wechat\OfficialAccount;
|
||||
use crmeb\utils\ApiErrorCode;
|
||||
use think\annotation\Inject;
|
||||
use think\exception\ValidateException;
|
||||
use app\services\wechat\WechatUserServices;
|
||||
@@ -77,14 +75,15 @@ class LoginServices extends BaseServices
|
||||
*/
|
||||
public function parseToken(string $token)
|
||||
{
|
||||
/** @var BaseAuth $services */
|
||||
$services = app()->make(BaseAuth::class);
|
||||
$adminInfo = $services->parseToken($token, function ($id) {
|
||||
return $this->dao->get($id);
|
||||
});
|
||||
if (isset($adminInfo->auth) && $adminInfo->auth !== md5($adminInfo->password)) {
|
||||
throw new AuthException(ApiErrorCode::ERR_LOGIN_INVALID);
|
||||
}
|
||||
/** @var AccessTokenService $services */
|
||||
$services = app()->make(AccessTokenService::class);
|
||||
$adminInfo = $services->parseToken(
|
||||
$token,
|
||||
'kefu',
|
||||
fn($id) => $this->dao->get($id),
|
||||
fn($adminInfo) => md5($adminInfo->password)
|
||||
);
|
||||
|
||||
return $adminInfo->hidden(['password', 'ip', 'status']);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user