diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php index 1d658cf85..f424c87ad 100644 --- a/app/api/controller/JunziqianController.php +++ b/app/api/controller/JunziqianController.php @@ -18,11 +18,21 @@ class JunziqianController extends BaseApiController public array $notNeedLogin = ['download_file']; /**请求地址*/ - private $serviceUrl = 'https://api.sandbox.junziqian.com'; + private $serviceUrl; /**appkey*/ - private $appkey = '3121e0d911b7943d'; + private $appkey; /**secret*/ - private $appSecret = '1e66d8b73121e0d911b7943d82bba174'; + private $appSecret; + + public function initialize() + { + $this->serviceUrl=env('junzi.url'); + $this->appkey=env('junzi.app_key'); + $this->appSecret=env('junzi.app_secret'); + + parent::initialize(); + + } /**请求地址*/ // private $serviceUrl = 'https://api.junziqian.com'; // /**appkey*/ diff --git a/app/api/logic/LoginLogic.php b/app/api/logic/LoginLogic.php index 4670560d2..806d0e615 100755 --- a/app/api/logic/LoginLogic.php +++ b/app/api/logic/LoginLogic.php @@ -167,7 +167,16 @@ class LoginLogic extends BaseLogic self::setError('无登录信息'); return false; } - $userInfo = UserTokenService::setToken($user->id, 3); + $terminal=3; + $Android=IndexLogic::isAndroid(); + if($Android){ + $terminal=5; + } + $ios=IndexLogic::isIOS(); + if($ios){ + $terminal=6; + } + $userInfo = UserTokenService::setToken($user->id, $terminal); //返回登录信息 $avatar = $user->avatar ?: Config::get('project.default_image.user_avatar'); $avatar = FileService::getFileUrl($avatar);