关注问题

app-pt/config/main.php

@@ -49,6 +49,7 @@ return [
 				'wx-open-callback/<id:\w+>' => 'wx-open/callback',
 
 				'<controller:\w+>/<action:\w+>' => '<controller>/<action>',
+
 			],
 		],
 	],

biz-hd/admin/classes/AdminClass.php

@@ -184,11 +184,6 @@ class AdminClass extends BaseClass
     {
         $wxInfo = self::switchAdminInfo($wxInfo, $source);
         $adminSource = UserClass::$userSourceId;
-        $unionId = isset($wxInfo['unionId']) && !empty($wxInfo['unionId']) ? $wxInfo['unionId'] : '';
-        $unionAdmin = [];
-        if (!empty($unionId)) {
-            //$unionAdmin = self::getByUnionId($unionId);
-        }
         switch ($source) {
             case $adminSource['mini']['name']:
                 $sourceId = $adminSource['mini']['id'];
@@ -204,17 +199,11 @@ class AdminClass extends BaseClass
                 }
                 break;
             default:
-                throw new \Exception('未知来源的用户');
+                throw new \Exception('未知来源');
         }
         if (empty($admin)) {
-            if (!empty($unionAdmin)) {
-                //1、在小程序端已经授权用户信息和unionId之后，关注公众号时走这里
-                //2、关注了公众号或者H5已经授权时，并首次访问小程序
-                $admin = self::updateAdmin($unionAdmin, $wxInfo);
-            } else {
-                $wxInfo['sourceType'] = $sourceId;
-                $admin = self::generateAdmin($wxInfo);
-            }
+            $wxInfo['sourceType'] = $sourceId;
+            $admin = self::generateAdmin($wxInfo);
         } else {
             $admin = self::updateAdmin($admin, $wxInfo);
         }