同步更新插件代码版本

.gitignore

@@ -35,5 +35,5 @@
 /database/migrations/20221013045839_install_user_data.php
 /database/migrations/20221013045840_install_user_region.php
 /database/migrations/20221215000001_install_center_data.php
-/database/migrations/20230219000001_install_table.php
-/database/migrations/20230219000002_install_package.php
+/database/migrations/20230209000001_install_wechat_service.php
+/database/migrations/20230224000001_install_account.php

app/wechat/Service.php

@@ -28,12 +28,6 @@ use think\admin\Plugin;
  */
 class Service extends Plugin
 {
-    /**
-     * 定义资源目录
-     * @var string
-     */
-    protected $appCopy = 'app/wechat';
-
     /**
      * 定义当前包名
      * @var string

app/wechat/controller/Config.php

@@ -99,19 +99,19 @@ class Config extends Controller
     {
         if ($this->request->isGet()) {
             $auth = sysconf('wechat.service_authurl|raw') ?: "https://open.cuci.cc/service/api.push/auth?source=SOURCE";
-            $jsonRpc = sysconf('wechat.service_jsonrpc|raw') ?: 'https://open.cuci.cc/service/api.client/jsonrpc?not_init_session=1&token=TOKEN';
+            $jsonRpc = sysconf('wechat.service_jsonrpc|raw') ?: 'https://open.cuci.cc/service/api.client/jsonrpc?token=TOKEN&not_init_session=1';
             Builder::mk()
-                ->addTextInput('auth_url', '微信绑定授权跳转入口', 'Getway', true, '进入微信绑定授权时会跳转到这个页面，由微信管的理员扫二维码进行授权。', '^https://.*?jsonrpc.*?source=SOURCE.*?')
-                ->addTextInput('json_rpc', '第三方服务平台 JsonRpc 接口', 'JsonRpc', true, '由应用插件 ThinkPlugsWechatService 服务提供的第三方平台 JSON-RPC 接口地址。', '^https://.*?jsonrpc.*?token=TOKEN.*?')
+                ->addTextInput('auth_url', '公众号授权跳转入口', 'Getway', true, '进行微信授权时会跳转到这个页面，由微信管理员扫二维码进行授权。', '^https?://.*?auth.*?(\?|\&)source=SOURCE')
+                ->addTextInput('json_rpc', '第三方服务平台接口', 'JsonRpc', true, '由应用插件 ThinkPlugsWechatService 提供的第三方服务平台 JSON-RPC 接口地址。', '^https?://.*?jsonrpc.*?(\?|\&)token=TOKEN')
                 ->addSubmitButton('保存参数')->addCancelButton()
                 ->fetch(['vo' => ['auth_url' => $auth, 'json_rpc' => $jsonRpc]]);
         } else {
             $data = $this->_vali([
-                'auth_url.rquire'  => '授权跳转不能为空！',
+                'auth_url.require' => '授权跳转不能为空！',
                 'json_rpc.require' => '接口地址不能为空！'
             ]);
             sysconf('wechat.service_authurl', $data['auth_url']);
-            sysconf('wechat.service_jsonrpc', urldecode($data['json_rpc']));
+            sysconf('wechat.service_jsonrpc', $data['json_rpc']);
             $this->success('接口地址保存成功！');
         }
     }

app/wechat/view/menu/index.html

@@ -122,7 +122,6 @@
             $.form.load('{:url("index")}', {output: 'json'}, 'get', function (ret) {
                 return $rootScope.$apply(function () {
                     $rootScope.keys = ret.data.keysdata || [], $rootScope.list = ret.data.menudata || [];
-                    console.log($rootScope.keys)
                     if ($rootScope.list.length < 1) $rootScope.list = [{name: '请输入名称', type: 'click', sub_button: []}];
                     for (var i in $rootScope.list) $rootScope.list[i].sub_button = $rootScope.list[i].sub_button || [];
                     $rootScope.list[0].show = true, $rootScope.list[0].active = true, $rootScope.item = $rootScope.list[0];

composer.json

@@ -16,12 +16,11 @@
   ],
   "require": {
     "php": ">=7.1",
+    "ext-json": "*",
     "zoujingli/think-library": "^6.0",
     "zoujingli/think-plugs-admin": "^1.0",
     "zoujingli/think-plugs-wechat": "^1.0"
   },
-  "repositories": {
-  },
   "autoload": {
     "psr-0": {
       "": "extend"
@@ -31,6 +30,7 @@
     }
   },
   "config": {
+    "sort-packages": true,
     "allow-plugins": {
       "zoujingli/think-install": true
     }