From 783a66eee70da748de7191babec7ee584cc3f1a3 Mon Sep 17 00:00:00 2001
From: brjun <brj1001@163.com>
Date: Thu, 8 Jun 2023 17:03:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=94=E7=94=A8=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/demo_rgapi/install.php     | 6 +++---
 addons/demo_rgapi/manifest.xml    | 2 +-
 addons/demo_rgapi/site.php        | 2 ++
 addons/demo_rgapi/upgrade.php     | 6 +++---
 web/common/permission.inc.php     | 8 ++++++++
 web/source/cloud/process.ctrl.php | 1 +
 6 files changed, 18 insertions(+), 7 deletions(-)
 mode change 100755 => 100644 addons/demo_rgapi/install.php
 mode change 100755 => 100644 addons/demo_rgapi/site.php

diff --git a/addons/demo_rgapi/install.php b/addons/demo_rgapi/install.php
old mode 100755
new mode 100644
index 400cd08..048f28d
--- a/addons/demo_rgapi/install.php
+++ b/addons/demo_rgapi/install.php
@@ -14,7 +14,7 @@
   `uniacid` int(11) NOT NULL DEFAULT '0',
   `image` varchar(255) NOT NULL DEFAULT '' COMMENT '图片路径',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 CREATE TABLE IF NOT EXISTS $tablename_paylog (
   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `no` varchar(255) NOT NULL DEFAULT '' COMMENT '商户订单号',
@@ -26,8 +26,8 @@
   `uid` varchar(255) NOT NULL DEFAULT '' COMMENT '用户标识',
   `uniacid` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 
 EOT;
 
-pdo_query($sql);
+pdo_run($sql);
diff --git a/addons/demo_rgapi/manifest.xml b/addons/demo_rgapi/manifest.xml
index 9043b9d..dc25595 100644
--- a/addons/demo_rgapi/manifest.xml
+++ b/addons/demo_rgapi/manifest.xml
@@ -50,5 +50,5 @@
 	</permissions>
 	<install><![CDATA[install.php]]></install>
 	<uninstall><![CDATA[]]></uninstall>
-	<upgrade><![CDATA[]]></upgrade>
+	<upgrade><![CDATA[upgrade.php]]></upgrade>
 </manifest>
diff --git a/addons/demo_rgapi/site.php b/addons/demo_rgapi/site.php
old mode 100755
new mode 100644
index b0974d4..955f95a
--- a/addons/demo_rgapi/site.php
+++ b/addons/demo_rgapi/site.php
@@ -174,6 +174,8 @@ public function doWebW7pay() {
     //内购发起退款
     public function doWebW7refund() {
         global $_W, $_GPC;
+        ini_set('display_errors', '1');
+        error_reporting(E_ALL ^ E_NOTICE);
         try {
             load()->library('sdk-console');
             $no = safe_gpc_string($_GPC['no']);
diff --git a/addons/demo_rgapi/upgrade.php b/addons/demo_rgapi/upgrade.php
index c7d612c..d0b6da5 100644
--- a/addons/demo_rgapi/upgrade.php
+++ b/addons/demo_rgapi/upgrade.php
@@ -13,7 +13,7 @@
   `uniacid` int(11) NOT NULL DEFAULT '0',
   `image` varchar(255) NOT NULL DEFAULT '' COMMENT '图片路径',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 CREATE TABLE IF NOT EXISTS $tablename_paylog (
   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `no` varchar(255) NOT NULL DEFAULT '' COMMENT '商户订单号',
@@ -25,7 +25,7 @@
   `uid` varchar(255) NOT NULL DEFAULT '' COMMENT '用户标识',
   `uniacid` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB;
 EOT;
 
-pdo_query($sql);
+pdo_run($sql);
diff --git a/web/common/permission.inc.php b/web/common/permission.inc.php
index e756139..6b2b84a 100644
--- a/web/common/permission.inc.php
+++ b/web/common/permission.inc.php
@@ -24,6 +24,10 @@
         'default' => '',
         'direct' => [],
     ],
+    'cloud' => [
+        'default' => '',
+        'direct' => [],
+    ],
     'message' => [
         'default' => '',
         'direct' => [],
@@ -54,6 +58,10 @@
         'default' => '',
         'direct' => ['visit', 'bindcall', 'mp-verify'],
     ],
+    'wxapp' => [
+        'default' => '',
+        'direct' => [],
+    ],
 ];
 
 return $w7_file_permission;
diff --git a/web/source/cloud/process.ctrl.php b/web/source/cloud/process.ctrl.php
index 62f827d..30be8a9 100644
--- a/web/source/cloud/process.ctrl.php
+++ b/web/source/cloud/process.ctrl.php
@@ -3,6 +3,7 @@
  * [WeEngine System] Copyright (c) 2014 W7.CC.
  */
 load()->func('communication');
+load()->model('extension');
 
 $step = $_GPC['step'] ?? '';
 $steps = array('scripts', 'module_upgrade');