edit

database/system.php

@@ -1,5 +1,18 @@
 <?php
 
+$token = array();
+if (Dever::project('token')) {
+	$token = function()
+	{
+		$array = array();
+		$info = Dever::db('token/project')->state();
+		if ($info) {
+			$array += $info;
+		}
+		return $array;
+	};
+}
+
 return array
 (
 	# 表名
@@ -51,28 +64,40 @@ return array
 		'appid'		=> array
 		(
 			'type' 		=> 'varchar-150',
-			'name' 		=> '微信小程序appid',
+			'name' 		=> '微信小程序appid-废弃',
 			'default' 	=> '',
 			'desc' 		=> '请输入微信小程序appid',
 			'match' 	=> 'option',
-			'search'	=> 'order,fulltext',
-			'update'	=> 'text',
-			'list'		=> 'table',
-			'modal' 	=> '详细信息',
+			//'search'	=> 'order,fulltext',
+			//'update'	=> 'text',
+			//'list'		=> 'table',
+			//'modal' 	=> '详细信息',
 		),
 
 		'secret'		=> array
 		(
 			'type' 		=> 'varchar-150',
-			'name' 		=> '微信小程序secret',
+			'name' 		=> '微信小程序secret-废弃',
 			'default' 	=> '',
 			'desc' 		=> '请输入微信小程序secret',
 			'match' 	=> 'option',
-			'search'	=> 'order,fulltext',
-			'update'	=> 'text',
+			//'search'	=> 'order,fulltext',
+			//'update'	=> 'text',
 			//'list'		=> 'table',
 			//'modal' 	=> '详细信息',
 		),
+
+		'token_project_id'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '关联token',
+			'default' 	=> '-1',
+			'desc' 		=> '关联token',
+			'match' 	=> 'is_numeric',
+			'option' 	=> $token,
+			'update'	=> $token ? 'select' : false,
+			//'list'		=> true,
+		),
 		
 		'reorder'		=> array
 		(

src/Applet.php

@@ -359,16 +359,12 @@ class Applet extends Base
     private function getApplet()
     {
         $applet = Dever::config('base', 'project')->applet;
-        $project = false;
         $system = Dever::input('system', 1);
-        if (Dever::project('token')) {
-            $project = Dever::db('token/project')->find($system);
-        }
 
-        if (!$project) {
-            if (isset($applet['project']) && $applet['project']) {
-                $project = Dever::db($applet['project'])->find($system);
-            }
+        $system = Dever::db('passport/system')->find($system);
+        $project = false;
+        if ($system && $system['token_project_id'] > 0 && Dever::project('token')) {
+            $project = Dever::db('token/project')->find($system['token_project_id']);
         }
 
         if ($project) {