wangmingchuan 12 months ago
parent b4e4475dbf
commit 98b0fe617a
  1. 6
      application/config.php
  2. 6
      application/database.php
  3. 8
      application/wap/controller/AuthController.php
  4. 1
      extend/service/MiniProgramService.php
  5. 1
      vendor/overtrue/wechat/src/MiniProgram/Sns/Sns.php

@ -274,21 +274,21 @@ return [
//监听ip
'ip' => '0.0.0.0',
//监听端口
'port' => '20014'
'port' => '20016'
],
//内部通讯
'channel' => [
//通讯ip
'ip' => '127.0.0.1',
//通讯端口
'port' => '20015'
'port' => '20017'
],
//Register
'text' => [
//通讯ip
'ip' => '0.0.0.0',
//通讯端口
'port' => '20015'
'port' => '20017'
],
],

@ -15,11 +15,11 @@ return [
// 服务器地址
'hostname' => 'localhost',
// 数据库名
'database' => 'knowledge',
'database' => 'knowledge_pmt',
// 用户名
'username' => 'knowledge',
'username' => 'knowledge_pmt',
// 密码
'password' => 'D7R84pxct8KscHmx',
'password' => 'qq111111',
// 端口
'hostport' => '3306',

@ -79,11 +79,6 @@ class AuthController extends WapBasic
$this->subjectUrl = getUrlToDomain();
$this->site_url = $site_url;
if ($isNextVersion) {
$jwtService = new JwtService();
try {
@ -106,6 +101,7 @@ class AuthController extends WapBasic
$this->uid = $this->userInfo['uid'];
$this->phone = User::getLogPhone($uid);
//绑定推广人
if ($spread_uid && $spreadUserInfo && $this->uid != $spread_uid && $spreadUserInfo['spread_uid'] != $this->uid && $this->userInfo['spread_uid'] != $spread_uid && !$this->userInfo['spread_uid']) {
$storeBrokerageStatu = SystemConfigService::get('store_brokerage_statu') ?: 1; //获取后台分销类型
if ($storeBrokerageStatu == 1) {
@ -193,7 +189,9 @@ class AuthController extends WapBasic
}
}
}
$institutionInfo = InstitutionAdmin::where('uid',$this->userInfo['uid'])->value('mer_id');
$institution = Lecturer::where(array('agent'=>$institutionInfo,'is_del' => 0))->select()->toArray();
$institution_exp = implode(',',array_column($institution,'mer_id'));
$this->institution = $institution_exp ? $institution_exp . ',' .$institutionInfo : $institutionInfo;

@ -83,6 +83,7 @@ class MiniProgramService
$appId = isset($wechat['mini_appid']) ? trim($wechat['mini_appid']) : '';
$appsecret = isset($wechat['mini_secret']) ? trim($wechat['mini_secret']) : '';
//}
$config['mini_program'] = [
'app_id' => $appId,
'secret' => $appsecret,

@ -50,6 +50,7 @@ class Sns extends AbstractMiniProgram
'js_code' => $jsCode,
'grant_type' => 'authorization_code',
];
return $this->parseJSON('GET', [self::JSCODE_TO_SESSION, $params]);
}
}

Loading…
Cancel
Save