blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-05 19:41:44 +08:00
Code Issues Projects Releases Wiki Activity

[更新]ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2019-04-02 09:47:26 +08:00
parent 4e3dab96c5
commit bf7571f460
22 changed files with 244 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thinkphp/library/think/App.php
View File

@ -20,7 +20,7 @@ use think\route\Dispatch;
*/
class App extends Container
{
const VERSION = '5.1.34 LTS';
const VERSION = '5.1.35 LTS';
/**
* 当前模块路径

10
thinkphp/library/think/Model.php
View File

@ -437,6 +437,16 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
return $this->exists;
}
/**
* 判断模型是否为空
* @access public
* @return bool
*/
public function isEmpty()
{
return empty($this->data);
}
/**
* 保存当前数据对象
* @access public

2
thinkphp/library/think/Validate.php
View File

@ -519,7 +519,7 @@ class Validate
if (isset($this->append[$field])) {
// 追加额外的验证规则
$rules = array_merge($rules, $this->append[$field]);
$rules = array_unique(array_merge($rules, $this->append[$field]));
}
$i = 0;

2
thinkphp/library/think/db/Builder.php
View File

@ -454,7 +454,7 @@ abstract class Builder
$array[] = $key . ' ' . $exp . ' :' . $name;
}
$whereStr = '(' . implode($array, ' ' . strtoupper($logic) . ' ') . ')';
$whereStr = '(' . implode(' ' . strtoupper($logic) . ' ', $array) . ')';
} else {
$whereStr = $key . ' ' . $exp . ' ' . $value;
}

1
thinkphp/library/think/db/Query.php
View File

@ -1655,6 +1655,7 @@ class Query
{
if (true === $option) {
$this->options = [];
$this->bind = [];
} elseif (is_string($option) && isset($this->options[$option])) {
unset($this->options[$option]);
}

44
thinkphp/library/think/db/connector/pgsql.sql
View File

@ -37,6 +37,10 @@ DECLARE
v_sql varchar;
v_rec RECORD;
v_key varchar;
v_conkey smallint[];
v_pk varchar[];
v_len smallint;
v_pos smallint := 1;
BEGIN
SELECT
pg_class.oid INTO v_oid
@ -49,6 +53,31 @@ BEGIN
RETURN;
END IF;
SELECT
pg_constraint.conkey INTO v_conkey
FROM
pg_constraint
INNER JOIN pg_class ON pg_constraint.conrelid = pg_class.oid
INNER JOIN pg_attribute ON pg_attribute.attrelid = pg_class.oid
INNER JOIN pg_type ON pg_type.oid = pg_attribute.atttypid
WHERE
pg_class.relname = a_table_name
AND pg_constraint.contype = 'p';
v_len := array_length(v_conkey,1) + 1;
WHILE v_pos < v_len LOOP
SELECT
pg_attribute.attname INTO v_key
FROM pg_constraint
INNER JOIN pg_class ON pg_constraint.conrelid = pg_class.oid
INNER JOIN pg_attribute ON pg_attribute.attrelid = pg_class.oid AND pg_attribute.attnum = pg_constraint.conkey [ v_conkey[v_pos] ]
INNER JOIN pg_type ON pg_type.oid = pg_attribute.atttypid
WHERE pg_class.relname = a_table_name AND pg_constraint.contype = 'p';
v_pk := array_append(v_pk,v_key);
v_pos := v_pos + 1;
END LOOP;
v_sql='
SELECT
pg_attribute.attname AS fields_name,
@ -83,12 +112,19 @@ BEGIN
v_ret.fields_not_null=v_rec.fields_not_null;
v_ret.fields_default=v_rec.fields_default;
v_ret.fields_comment=v_rec.fields_comment;
SELECT constraint_name INTO v_key FROM information_schema.key_column_usage WHERE table_schema=a_schema_name AND table_name=a_table_name AND column_name=v_rec.fields_name;
IF FOUND THEN
v_ret.fields_key_name=v_key;
ELSE
v_ret.fields_key_name='';
v_len := array_length(v_pk,1) + 1;
v_pos := 1;
WHILE v_pos < v_len LOOP
IF v_rec.fields_name = v_pk[v_pos] THEN
v_ret.fields_key_name=v_pk[v_pos];
EXIT;
END IF;
v_pos := v_pos + 1;
END LOOP;
RETURN NEXT v_ret;
END LOOP;
RETURN ;

9
thinkphp/library/think/facade/Config.php
View File

@ -16,11 +16,14 @@ use think\Facade;
/**
* @see \think\Config
* @mixin \think\Config
* @method array load(string $file, string $name = '') static 加载配置文件
* @method bool has(string $name) static 检测配置是否存在
* @method array pull(string $name) static 获取一级配置
* @method array pull(string $name) static 获取一级配置参数
* @method mixed get(string $name,mixed $default = null) static 获取配置参数
* @method mixed set(string $name, mixed $value = null) static 设置配置参数
* @method array reset(string $prefix ='') static 重置配置参数
* @method array set(mixed $name, mixed $value = null) static 设置配置参数
* @method array reset(string $name ='') static 重置配置参数
* @method void remove(string $name = '') static 移除配置
* @method void setYaconf(mixed $$yaconf) static 设置开启Yaconf 或者指定配置文件名
*/
class Config extends Facade
{

1
thinkphp/library/think/facade/Log.php
View File

@ -21,6 +21,7 @@ use think\Facade;
* @method \think\Log record(mixed $msg, string $type = 'info', array $context = []) static 记录日志信息
* @method \think\Log clear() static 清空日志信息
* @method \think\Log key(string $key) static 当前日志记录的授权key
* @method \think\Log close() static 关闭本次请求日志写入
* @method bool check(array $config) static 检查日志写入权限
* @method bool save() static 保存调试信息
* @method void write(mixed $msg, string $type = 'info', bool $force = false) static 实时写入日志信息

25
thinkphp/library/think/model/concern/Conversion.php
View File

@ -140,9 +140,13 @@ trait Conversion
// 过滤属性
if (!empty($this->visible)) {
$array = $this->parseAttr($this->visible, $visible);
if (!empty($array)) {
$data = array_intersect_key($data, array_flip($array));
} elseif (!empty($this->hidden)) {
$array = $this->parseAttr($this->hidden, $hidden, false);
}
}
if (empty($array) && !empty($this->hidden)) {
$array = $this->parseAttr($this->hidden, $hidden);
$data = array_diff_key($data, array_flip($array));
}
@ -187,10 +191,7 @@ trait Conversion
$item[$key] = $relation->append([$attr])->toArray();
} else {
$value = $this->getAttr($name, $item);
if (false !== $value) {
$item[$name] = $value;
}
$item[$name] = $this->getAttr($name, $item);
}
}
}
@ -256,27 +257,17 @@ trait Conversion
* @access protected
* @param array $attrs 属性
* @param array $result 结果集
* @param bool $visible
* @return array
*/
protected function parseAttr($attrs, &$result, $visible = true)
protected function parseAttr($attrs, &$result)
{
$array = [];
foreach ($attrs as $key => $val) {
if (is_array($val)) {
if ($visible) {
$array[] = $key;
}
$result[$key] = $val;
} elseif (strpos($val, '.')) {
list($key, $name) = explode('.', $val);
if ($visible) {
$array[] = $key;
}
$result[$key][] = $name;
} else {
$array[] = $val;

4
thinkphp/library/think/model/relation/HasMany.php
View File

@ -194,8 +194,8 @@ class HasMany extends Relation
}
}
return $this->query
->whereExp($this->foreignKey, '=' . $this->parent->getTable() . '.' . $this->localKey)
return $this->query->alias($aggregate . '_table')
->whereExp($aggregate . '_table.' . $this->foreignKey, '=' . $this->parent->getTable() . '.' . $this->localKey)
->fetchSql()
->$aggregate($field);
}

4
thinkphp/library/think/route/RuleGroup.php
View File

@ -151,10 +151,6 @@ class RuleGroup extends Rule
$method = strtolower($request->method());
$rules = $this->getMethodRules($method);
if (count($rules) == 0) {
return false;
}
if ($this->parent) {
// 合并分组参数
$this->mergeGroupOptions();

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit53186b8f9ced5efc2d0ef0e9b2b040f3::getLoader();
return ComposerAutoloaderInit0f92db73f9e6460de5691c8b6fdb91d6::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit53186b8f9ced5efc2d0ef0e9b2b040f3
class ComposerAutoloaderInit0f92db73f9e6460de5691c8b6fdb91d6
{
private static $loader;
@ -19,15 +19,15 @@ class ComposerAutoloaderInit53186b8f9ced5efc2d0ef0e9b2b040f3
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit53186b8f9ced5efc2d0ef0e9b2b040f3', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit0f92db73f9e6460de5691c8b6fdb91d6', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit53186b8f9ced5efc2d0ef0e9b2b040f3', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit0f92db73f9e6460de5691c8b6fdb91d6', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit53186b8f9ced5efc2d0ef0e9b2b040f3::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit0f92db73f9e6460de5691c8b6fdb91d6::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@ -48,19 +48,19 @@ class ComposerAutoloaderInit53186b8f9ced5efc2d0ef0e9b2b040f3
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit53186b8f9ced5efc2d0ef0e9b2b040f3::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit0f92db73f9e6460de5691c8b6fdb91d6::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire53186b8f9ced5efc2d0ef0e9b2b040f3($fileIdentifier, $file);
composerRequire0f92db73f9e6460de5691c8b6fdb91d6($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire53186b8f9ced5efc2d0ef0e9b2b040f3($fileIdentifier, $file)
function composerRequire0f92db73f9e6460de5691c8b6fdb91d6($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit53186b8f9ced5efc2d0ef0e9b2b040f3
class ComposerStaticInit0f92db73f9e6460de5691c8b6fdb91d6
{
public static $files = array (
'841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php',
@ -277,9 +277,9 @@ class ComposerStaticInit53186b8f9ced5efc2d0ef0e9b2b040f3
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit53186b8f9ced5efc2d0ef0e9b2b040f3::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit53186b8f9ced5efc2d0ef0e9b2b040f3::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit53186b8f9ced5efc2d0ef0e9b2b040f3::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit0f92db73f9e6460de5691c8b6fdb91d6::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit0f92db73f9e6460de5691c8b6fdb91d6::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit0f92db73f9e6460de5691c8b6fdb91d6::$classMap;
}, null, ClassLoader::class);
}

39
vendor/composer/installed.json vendored
View File

@ -177,17 +177,17 @@
},
{
"name": "symfony/options-resolver",
"version": "v3.4.22",
"version_normalized": "3.4.22.0",
"version": "v3.4.23",
"version_normalized": "3.4.23.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
"reference": "0f1cbaee6b356e72c0e025f9a4e9d76a25bf4793"
"reference": "926e3b797e6bb66c0e4d7da7eff3a174f7378bcf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/0f1cbaee6b356e72c0e025f9a4e9d76a25bf4793",
"reference": "0f1cbaee6b356e72c0e025f9a4e9d76a25bf4793",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/926e3b797e6bb66c0e4d7da7eff3a174f7378bcf",
"reference": "926e3b797e6bb66c0e4d7da7eff3a174f7378bcf",
"shasum": "",
"mirrors": [
{
@ -199,7 +199,7 @@
"require": {
"php": "^5.5.9|>=7.0.8"
},
"time": "2019-01-16T09:39:14+00:00",
"time": "2019-02-23T15:06:07+00:00",
"type": "library",
"extra": {
"branch-alias": {
@ -239,17 +239,17 @@
},
{
"name": "topthink/framework",
"version": "v5.1.34",
"version_normalized": "5.1.34.0",
"version": "v5.1.35",
"version_normalized": "5.1.35.0",
"source": {
"type": "git",
"url": "https://github.com/top-think/framework.git",
"reference": "7c8cd1ea2bd4683a6ef46af415334260c6e2cc15"
"reference": "c53c0c6132022a87e8ee9c4109939eaf9a8a7adb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/top-think/framework/zipball/7c8cd1ea2bd4683a6ef46af415334260c6e2cc15",
"reference": "7c8cd1ea2bd4683a6ef46af415334260c6e2cc15",
"url": "https://api.github.com/repos/top-think/framework/zipball/c53c0c6132022a87e8ee9c4109939eaf9a8a7adb",
"reference": "c53c0c6132022a87e8ee9c4109939eaf9a8a7adb",
"shasum": "",
"mirrors": [
{
@ -271,7 +271,7 @@
"sebastian/phpcpd": "2.*",
"squizlabs/php_codesniffer": "2.*"
},
"time": "2019-01-30T06:38:38+00:00",
"time": "2019-03-03T00:44:44+00:00",
"type": "think-framework",
"installation-source": "dist",
"notification-url": "https://packagist.org/downloads/",
@ -443,17 +443,17 @@
},
{
"name": "zoujingli/wechat-developer",
"version": "v1.2.9",
"version_normalized": "1.2.9.0",
"version": "v1.2.10",
"version_normalized": "1.2.10.0",
"source": {
"type": "git",
"url": "https://github.com/zoujingli/WeChatDeveloper.git",
"reference": "def818b7df403c7a00a5070a722e531161f68835"
"reference": "f68a378fc931f434b8e4044c5539bb24ed85038c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/def818b7df403c7a00a5070a722e531161f68835",
"reference": "def818b7df403c7a00a5070a722e531161f68835",
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/f68a378fc931f434b8e4044c5539bb24ed85038c",
"reference": "f68a378fc931f434b8e4044c5539bb24ed85038c",
"shasum": "",
"mirrors": [
{
@ -465,10 +465,13 @@
"require": {
"ext-curl": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"ext-simplexml": "*",
"php": ">=5.4"
},
"time": "2019-01-12T11:40:04+00:00",
"time": "2019-03-30T07:30:45+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {

2
vendor/symfony/options-resolver/Debug/OptionsResolverIntrospector.php vendored
View File

@ -32,7 +32,7 @@ class OptionsResolverIntrospector
throw new UndefinedOptionsException(sprintf('The option "%s" does not exist.', $option));
}
if (!array_key_exists($option, $this->{$property})) {
if (!\array_key_exists($option, $this->{$property})) {
throw new NoConfigurationException($message);
}

12
vendor/symfony/options-resolver/OptionsResolver.php vendored
View File

@ -175,7 +175,7 @@ class OptionsResolver implements Options
// to resolve options with lazy closures, normalizers or validation
// rules, none of which can exist for undefined options
// If the option was resolved before, update the resolved value
if (!isset($this->defined[$option]) || array_key_exists($option, $this->resolved)) {
if (!isset($this->defined[$option]) || \array_key_exists($option, $this->resolved)) {
$this->resolved[$option] = $value;
}
@ -215,7 +215,7 @@ class OptionsResolver implements Options
*/
public function hasDefault($option)
{
return array_key_exists($option, $this->defaults);
return \array_key_exists($option, $this->defaults);
}
/**
@ -280,7 +280,7 @@ class OptionsResolver implements Options
*/
public function isMissing($option)
{
return isset($this->required[$option]) && !array_key_exists($option, $this->defaults);
return isset($this->required[$option]) && !\array_key_exists($option, $this->defaults);
}
/**
@ -694,12 +694,12 @@ class OptionsResolver implements Options
}
// Shortcut for resolved options
if (array_key_exists($option, $this->resolved)) {
if (\array_key_exists($option, $this->resolved)) {
return $this->resolved[$option];
}
// Check whether the option is set at all
if (!array_key_exists($option, $this->defaults)) {
if (!\array_key_exists($option, $this->defaults)) {
if (!isset($this->defined[$option])) {
throw new NoSuchOptionException(sprintf('The option "%s" does not exist. Defined options are: "%s".', $option, implode('", "', array_keys($this->defined))));
}
@ -908,7 +908,7 @@ class OptionsResolver implements Options
throw new AccessException('Array access is only supported within closures of lazy options and normalizers.');
}
return array_key_exists($option, $this->defaults);
return \array_key_exists($option, $this->defaults);
}
/**

6
vendor/zoujingli/wechat-developer/We.php vendored
View File

@ -74,7 +74,7 @@ class We
* 定义当前版本
* @var string
*/
const VERSION = '1.2.5';
const VERSION = '1.2.9';
/**
* 静态配置
@ -111,10 +111,10 @@ class We
$class = 'WeChat\\' . substr($name, 6);
} elseif (substr($name, 0, 6) === 'WeMini') {
$class = 'WeMini\\' . substr($name, 6);
} elseif (substr($name, 0, 5) === 'WePay') {
$class = 'WePay\\' . substr($name, 5);
} elseif (substr($name, 0, 6) === 'AliPay') {
$class = 'AliPay\\' . substr($name, 6);
} elseif (substr($name, 0, 5) === 'WePay') {
$class = 'WePay\\' . substr($name, 5);
}
if (!empty($class) && class_exists($class)) {
$option = array_shift($arguments);

69
vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php vendored
View File

@ -150,7 +150,7 @@ class Tools
$entity = libxml_disable_entity_loader(true);
$data = (array)simplexml_load_string($xml, 'SimpleXMLElement', LIBXML_NOCDATA);
libxml_disable_entity_loader($entity);
return json_decode(self::arr2json($data), true);
return json_decode(json_encode($data), true);
}
/**
@ -160,9 +160,70 @@ class Tools
*/
public static function arr2json($data)
{
return preg_replace_callback('/\\\\u([0-9a-f]{4})/i', function ($matches) {
return mb_convert_encoding(pack("H*", $matches[1]), "UTF-8", "UCS-2BE");
}, ($jsonData = json_encode($data)) == '[]' ? '{}' : $jsonData);
$json = json_encode(self::buildEnEmojiData($data), JSON_UNESCAPED_UNICODE);
return $json === '[]' ? '{}' : $json;
}
/**
* 数组对象Emoji编译处理
* @param array $data
* @return array
*/
public static function buildEnEmojiData(array $data)
{
foreach ($data as $key => $value) {
if (is_array($value)) {
$data[$key] = self::buildEnEmojiData($value);
} elseif (is_string($value)) {
$data[$key] = self::emojiEncode($value);
} else {
$data[$key] = $value;
}
}
return $data;
}
/**
* 数组对象Emoji反解析处理
* @param array $data
* @return array
*/
public static function buildDeEmojiData(array $data)
{
foreach ($data as $key => $value) {
if (is_array($value)) {
$data[$key] = self::buildDeEmojiData($value);
} elseif (is_string($value)) {
$data[$key] = self::emojiDecode($value);
} else {
$data[$key] = $value;
}
}
return $data;
}
/**
* Emoji原形转换为String
* @param string $content
* @return string
*/
public static function emojiEncode($content)
{
return json_decode(preg_replace_callback("/(\\\u[ed][0-9a-f]{3})/i", function ($string) {
return addslashes($string[0]);
}, json_encode($content)));
}
/**
* Emoji字符串转换为原形
* @param string $content
* @return string
*/
public static function emojiDecode($content)
{
return json_decode(preg_replace_callback('/\\\\\\\\/i', function () {
return '\\';
}, json_encode($content)));
}
/**

10
vendor/zoujingli/wechat-developer/WeMini/Qrcode.php vendored
View File

@ -32,16 +32,17 @@ class Qrcode extends BasicWeChat
* @param integer $width 二维码的宽度
* @param bool $auto_color 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
* @param array $line_color auto_color 为 false 时生效
* @param boolean $is_hyaline 是否需要透明底色
* @param null|string $outType 输出类型
* @return array|string
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function createMiniPath($path, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"], $outType = null)
public function createMiniPath($path, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"], $is_hyaline = true, $outType = null)
{
$url = 'https://api.weixin.qq.com/wxa/getwxacode?access_token=ACCESS_TOKEN';
$this->registerApi($url, __FUNCTION__, func_get_args());
$data = ['path' => $path, 'width' => $width, 'auto_color' => $auto_color, 'line_color' => $line_color];
$data = ['path' => $path, 'width' => $width, 'auto_color' => $auto_color, 'line_color' => $line_color, 'is_hyaline' => $is_hyaline];
$result = Tools::post($url, Tools::arr2json($data));
if (json_decode($result)) {
return Tools::json2arr($result);
@ -57,15 +58,16 @@ class Qrcode extends BasicWeChat
* @param integer $width 二维码的宽度
* @param bool $auto_color 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
* @param array $line_color auto_color 为 false 时生效
* @param boolean $is_hyaline 是否需要透明底色
* @param null|string $outType 输出类型
* @return array|string
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function createMiniScene($scene, $page, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"], $outType = null)
public function createMiniScene($scene, $page, $width = 430, $auto_color = false, $line_color = ["r" => "0", "g" => "0", "b" => "0"], $is_hyaline = true, $outType = null)
{
$url = 'https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=ACCESS_TOKEN';
$data = ['scene' => $scene, 'width' => $width, 'auto_color' => $auto_color, 'page' => $page, 'line_color' => $line_color];
$data = ['scene' => $scene, 'width' => $width, 'auto_color' => $auto_color, 'page' => $page, 'line_color' => $line_color, 'is_hyaline' => $is_hyaline];
$this->registerApi($url, __FUNCTION__, func_get_args());
$result = Tools::post($url, Tools::arr2json($data));
if (json_decode($result)) {

51
vendor/zoujingli/wechat-developer/_test/pay-redpack-create.php vendored Normal file
View File

@ -0,0 +1,51 @@
<?php
// +----------------------------------------------------------------------
// | WeChatDeveloper
// +----------------------------------------------------------------------
// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://think.ctolog.com
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
// +----------------------------------------------------------------------
try {
// 1. 手动加载入口文件
include "../include.php";
// 2. 准备公众号配置参数
$config = include "./config.php";
// 3. 创建接口实例
$wechat = new \WePay\Redpack($config);
// 4. 组装参数，可以参考官方商户文档
$options = [
'mch_billno' => time(),
're_openid' => 'o38gps3vNdCqaggFfrBRCRikwlWY',
'send_name' => '商户名称',
'act_name' => '活动名称',
'total_amount' => '100',
'total_num' => '1',
'wishing' => '感谢您参加猜灯谜活动，祝您元宵节快乐！',
'remark' => '猜越多得越多，快来抢！',
'client_ip' => '127.0.0.1',
];
// 发送红包记录
$result = $wechat->create($options);
echo '<pre>';
var_export($result);
// 查询红包记录
$result = $wechat->query($options['mch_billno']);
var_export($result);
} catch (Exception $e) {
// 出错啦，处理下吧
echo $e->getMessage() . PHP_EOL;
}

5
vendor/zoujingli/wechat-developer/composer.json vendored
View File

@ -23,7 +23,10 @@
"php": ">=5.4",
"ext-json": "*",
"ext-curl": "*",
"ext-openssl": "*"
"ext-libxml": "*",
"ext-openssl": "*",
"ext-mbstring": "*",
"ext-simplexml": "*"
},
"autoload": {
"classmap": [