diff --git a/app/admin/controller/Auth.php b/app/admin/controller/Auth.php index 5f8d51c8e..506551592 100644 --- a/app/admin/controller/Auth.php +++ b/app/admin/controller/Auth.php @@ -17,6 +17,7 @@ namespace app\admin\controller; use think\admin\Controller; use think\admin\service\AdminService; +use app\wechat\service\WechatService; /** * 系统权限管理 @@ -80,6 +81,7 @@ class Auth extends Controller */ public function state() { + $this->_applyFormToken(); $this->_save($this->table, ['status' => input('status')]); } diff --git a/app/wechat/service/WechatService.php b/app/wechat/service/WechatService.php index 65dcb2b66..a4b73343d 100644 --- a/app/wechat/service/WechatService.php +++ b/app/wechat/service/WechatService.php @@ -62,6 +62,7 @@ use think\exception\HttpResponseException; * @method \WeMini\Soter WeMiniSoter() static 小程序生物认证 * @method \WeMini\Template WeMiniTemplate() static 小程序模板消息支持 * @method \WeMini\Total WeMiniTotal() static 小程序数据接口 + * @method \WeMini\Newtmpl WeminiNewtmpl() static 小程序订阅消息支持 * * ----- WePay ----- * @method \WePay\Bill WePayBill() static 微信商户账单及评论 diff --git a/composer.lock b/composer.lock index f690b9b5c..2a5ebcd0d 100644 --- a/composer.lock +++ b/composer.lock @@ -962,16 +962,16 @@ }, { "name": "zoujingli/wechat-developer", - "version": "v1.2.15", + "version": "v1.2.16", "source": { "type": "git", "url": "https://github.com/zoujingli/WeChatDeveloper.git", - "reference": "4b81e72cff7a3acfde2cca919bd8e173355bc53c" + "reference": "01fa1479e8c4d7a0875de96787a2bcaeacc755e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/4b81e72cff7a3acfde2cca919bd8e173355bc53c", - "reference": "4b81e72cff7a3acfde2cca919bd8e173355bc53c", + "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/01fa1479e8c4d7a0875de96787a2bcaeacc755e9", + "reference": "01fa1479e8c4d7a0875de96787a2bcaeacc755e9", "shasum": "", "mirrors": [ { @@ -1022,7 +1022,7 @@ "wechatpay", "wepay" ], - "time": "2019-11-25T10:40:50+00:00" + "time": "2020-01-04T08:51:50+00:00" } ], "packages-dev": [], diff --git a/nbproject/project.properties b/nbproject/project.properties deleted file mode 100644 index 112ce7b6f..000000000 --- a/nbproject/project.properties +++ /dev/null @@ -1,7 +0,0 @@ -include.path=${php.global.include.path} -php.version=PHP_74 -source.encoding=UTF-8 -src.dir=. -tags.asp=false -tags.short=false -web.root=. diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index 52118b3e6..000000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - org.netbeans.modules.php.project - - - thinkadmin - - - diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index a2350a4e2..3188b5915 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -164,6 +164,7 @@ return array( 'WeMini\\Image' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Image.php', 'WeMini\\Logistics' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Logistics.php', 'WeMini\\Message' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Message.php', + 'WeMini\\Newtmpl' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Newtmpl.php', 'WeMini\\Ocr' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Ocr.php', 'WeMini\\Plugs' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Plugs.php', 'WeMini\\Poi' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Poi.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 1fd46421b..52f6f9714 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -297,6 +297,7 @@ class ComposerStaticInit2b1316f37dd8fe5c4c25969e0b842e8e 'WeMini\\Image' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Image.php', 'WeMini\\Logistics' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Logistics.php', 'WeMini\\Message' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Message.php', + 'WeMini\\Newtmpl' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Newtmpl.php', 'WeMini\\Ocr' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Ocr.php', 'WeMini\\Plugs' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Plugs.php', 'WeMini\\Poi' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Poi.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index a85cbe4e8..9ed34ccc1 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -989,17 +989,17 @@ }, { "name": "zoujingli/wechat-developer", - "version": "v1.2.15", - "version_normalized": "1.2.15.0", + "version": "v1.2.16", + "version_normalized": "1.2.16.0", "source": { "type": "git", "url": "https://github.com/zoujingli/WeChatDeveloper.git", - "reference": "4b81e72cff7a3acfde2cca919bd8e173355bc53c" + "reference": "01fa1479e8c4d7a0875de96787a2bcaeacc755e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/4b81e72cff7a3acfde2cca919bd8e173355bc53c", - "reference": "4b81e72cff7a3acfde2cca919bd8e173355bc53c", + "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/01fa1479e8c4d7a0875de96787a2bcaeacc755e9", + "reference": "01fa1479e8c4d7a0875de96787a2bcaeacc755e9", "shasum": "", "mirrors": [ { @@ -1017,7 +1017,7 @@ "ext-simplexml": "*", "php": ">=5.4" }, - "time": "2019-11-25T10:40:50+00:00", + "time": "2020-01-04T08:51:50+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/services.php b/vendor/services.php index cf22079cc..317a2afca 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/wechat-developer/WeMini/Newtmpl.php b/vendor/zoujingli/wechat-developer/WeMini/Newtmpl.php new file mode 100644 index 000000000..80ae2ace0 --- /dev/null +++ b/vendor/zoujingli/wechat-developer/WeMini/Newtmpl.php @@ -0,0 +1,151 @@ +registerApi($url, __FUNCTION__, func_get_args()); + return $this->callPostApi($url, $data, true); + } + + /** + * 获取小程序账号的类目 + * @return array + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function getCategory() + { + $url = 'https://api.weixin.qq.com/wxaapi/newtmpl/getcategory?access_token=ACCESS_TOKEN'; + $this->registerApi($url, __FUNCTION__, func_get_args()); + return $this->callGetApi($url); + } + + /** + * 获取小程序账号的类目 + * @return array + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function deleteCategory() + { + $url = 'https://api.weixin.qq.com/cgi-bin/wxopen/deletecategory?access_token=TOKEN'; + $this->registerApi($url, __FUNCTION__, func_get_args()); + return $this->callPostApi($url, [], true); + } + + /** + * 获取帐号所属类目下的公共模板标题 + * @param string $ids 类目 id，多个用逗号隔开 + * @return array + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function getPubTemplateTitleList($ids) + { + $url = 'https://api.weixin.qq.com/wxaapi/newtmpl/getpubtemplatetitles?access_token=ACCESS_TOKEN'; + $this->registerApi($url, __FUNCTION__, func_get_args()); + return $this->callPostApi($url, ['ids'=>$ids,'start' => '0', 'limit' => '30'], true); + } + + /** + * 获取模板标题下的关键词列表 + * @param string $tid 模板标题 id，可通过接口获取 + * @return array + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function getPubTemplateKeyWordsById($tid) + { + $url = 'https://api.weixin.qq.com/wxaapi/newtmpl/getpubtemplatekeywords?access_token=ACCESS_TOKEN'; + $this->registerApi($url, __FUNCTION__, func_get_args()); + return $this->callPostApi($url, ['tid' => $tid], true); + } + + /** + * 组合模板并添加至帐号下的个人模板库 + * @param string $tid 模板标题 id，可通过接口获取，也可登录小程序后台查看获取 + * @param array $kidList 开发者自行组合好的模板关键词列表，关键词顺序可以自由搭配（例如 [3,5,4] 或 [4,5,3]），最多支持5个，最少2个关键词组合 + * @param string $sceneDesc 服务场景描述，15个字以内 + * @return array + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function addTemplate($tid, array $kidList, $sceneDesc = '') + { + $url = 'https://api.weixin.qq.com/wxaapi/newtmpl/addtemplate?access_token=ACCESS_TOKEN'; + $this->registerApi($url, __FUNCTION__, func_get_args()); + return $this->callPostApi($url, ['tid' => $tid, 'kidList' => $kidList, 'sceneDesc' => $sceneDesc], false); + } + + /** + * 获取当前帐号下的个人模板列表 + * @return array + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function getTemplateList() + { + $url = 'https://api.weixin.qq.com/wxaapi/newtmpl/gettemplate?access_token=ACCESS_TOKEN'; + $this->registerApi($url, __FUNCTION__, func_get_args()); + return $this->callPostApi($url, [], true); + } + + /** + * 删除帐号下的个人模板 + * @param string $priTmplId 要删除的模板id + * @return array + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function delTemplate($priTmplId) + { + $url = 'https://api.weixin.qq.com/wxaapi/newtmpl/deltemplate?access_token=ACCESS_TOKEN'; + $this->registerApi($url, __FUNCTION__, func_get_args()); + return $this->callPostApi($url, ['priTmplId' => $priTmplId], true); + } + + /** + * 发送订阅消息 + * @param array $data 发送的消息对象数组 + * @return array + * @throws \WeChat\Exceptions\InvalidResponseException + * @throws \WeChat\Exceptions\LocalCacheException + */ + public function send(array $data) + { + $url = 'https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=ACCESS_TOKEN'; + $this->registerApi($url, __FUNCTION__, func_get_args()); + return $this->callPostApi($url, $data, true); + } + +} \ No newline at end of file