dever 6 rokov pred
rodič
commit
c723106fc5
2 zmenil súbory, kde vykonal 42 pridanie a 4 odobranie
  1. 26 0
      database/system.php
  2. 16 4
      src/Applet.php

+ 26 - 0
database/system.php

@@ -45,6 +45,32 @@ return array
 			'search'	=> 'fulltext',
 			'list'		=> true,
 		),
+
+		'appid'		=> array
+		(
+			'type' 		=> 'varchar-150',
+			'name' 		=> '微信appid',
+			'default' 	=> '',
+			'desc' 		=> '请输入微信appid',
+			'match' 	=> 'option',
+			'search'	=> 'order,fulltext',
+			'update'	=> 'text',
+			'list'		=> 'table',
+			'modal' 	=> '详细信息',
+		),
+
+		'secret'		=> array
+		(
+			'type' 		=> 'varchar-150',
+			'name' 		=> '微信secret',
+			'default' 	=> '',
+			'desc' 		=> '请输入微信secret',
+			'match' 	=> 'option',
+			'search'	=> 'order,fulltext',
+			'update'	=> 'text',
+			//'list'		=> 'table',
+			//'modal' 	=> '详细信息',
+		),
 		
 		'reorder'		=> array
 		(

+ 16 - 4
src/Applet.php

@@ -24,18 +24,30 @@ class Applet extends Base
     {
         $token = Dever::project('token');
         $applet = array();
+
+        $system = Dever::input('system', 1);
+
+        $config = Dever::config('base', 'project')->applet;
+
         if ($token) {
-            $applet = Dever::db('token/project')->one(Dever::input('appid', 1));
+            $applet = Dever::db('token/project')->one($system);
+        }
+
+        if (!$applet) {
+            if (isset($config['project']) && $config['project']) {
+                $applet = Dever::db($config['project'])->one($system);
+            } else {
+                $applet = $config;
+            }
         }
 
         if (!$applet) {
-            $applet = Dever::config('base', 'project')->applet;
+            Dever::alert('错误的appid');
         }
-        
 
         $appid = $applet['appid'];
         $secret = $applet['secret'];
-        $url = $applet['url'];
+        $url = $config['url'];
         $code = Dever::input('code');
 
         $url .= '?appid=' . $appid;