Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop

app/Admin/Controllers/AgentController.php

@@ -72,7 +72,7 @@ class AgentController extends AdminController
 					} else if (empty($this->miniUpload)) {
 						$column->append((new MiniProgramUpload(null, 1))->setKey($this->id));
 					} else if ($this->miniUpload->is_success == 0) {
-						$column->append("已发布{$this->miniUpload->template_id}");
+						$column->append("已发布(模板:{$this->miniUpload->template_id})");
 					} else {
 						$column->append((new MiniProgramAuditStatus(null, 1))->setKey($this->id));
 					}

app/Http/Controllers/Api/IndexController.php

@@ -37,7 +37,7 @@ class IndexController extends Controller
 
         # 我的频道
 		if ($this->user_id) {
-			$channel_ids = UserChannel::where('user_id', $this->user_id)->value('channels');
+			$channel_ids = UserChannel::where('user_id', $this->user_id)->value('channels') ?? [];
 			$my_channels = Channel::where('agent_id', $this->agent_id)
 				->whereIn('id', $channel_ids)
 				->get(['id', 'name', 'icon']);

app/Http/Controllers/Api/LoginController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api;
 
 use App\Http\Controllers\Controller;
+use App\Models\AdminSetting;
 use App\Models\Agent;
 use App\Models\Channel;
 use App\Models\User;
@@ -34,12 +35,26 @@ class LoginController extends Controller
 			return $this->error('code参数缺失');
 		}
 
-		$config = config('wechat.mini_program.default');
-		$config = array_merge($config, [
-			'app_id' => $agent['appid'],
-			'secret' => $agent['appsecret'],
-		]);
-		$app = Factory::miniProgram($config);
+		// 如果有appsecret，使用原来的登录逻辑，否则使用第三方登录逻辑
+		if ($agent['appsecret']) {
+			$config = config('wechat.mini_program.default');
+			$config = array_merge($config, [
+				'app_id' => $agent['appid'],
+				'secret' => $agent['appsecret'],
+			]);
+			$app = Factory::miniProgram($config);
+		} else {
+			$setting = AdminSetting::val(['service_appid', 'service_appsecret', 'service_token', 'service_aeskey']);
+			$config = [
+				'app_id'   => $setting['service_appid'],
+				'secret'   => $setting['service_appsecret'],
+				'token'    => $setting['service_token'],
+				'aes_key'  => $setting['service_aeskey'],
+			];
+
+			$app = Factory::openPlatform($config);
+			dd($app['auth']);
+		}
 
 		try {
 			$res = $app->auth->session($code);
@@ -72,11 +87,8 @@ class LoginController extends Controller
 				$channel_ids = Channel::where([
 					['agent_id', '=', $this->agent_id],
 					['pid', '<>', 0],
-				])
-					->orderBy('id')
-					->limit(8)
-					->pluck('id')
-					->toArray();
+				])->orderBy('id')->limit(8)->pluck('id')->toArray();
+
 				//存入user_channel
 				UserChannel::where('user_id', $userModel->id)
 					->insert([