ComposerUpdate

This commit is contained in:
Anyon 2020-09-10 15:56:45 +08:00
parent d08b0e1a14
commit 9139c8b1c1
8 changed files with 42 additions and 16 deletions

View File

@ -193,11 +193,11 @@
});
};
$rootScope.setValue = function (key, name, value, callback) {
if (callback.indexOf('_') > -1) {
value = eval(callback.replace('_', "'" + value + "'"));
}
$rootScope.items[key] = $rootScope.items[key] || {};
$rootScope.cache[key] = $rootScope.cache[key] || {};
if (typeof callback === 'string' && callback.indexOf('_') > -1) {
value = eval(callback.replace('_', "'" + value + "'"));
}
return $rootScope.cache[key][name] = $rootScope.items[key][name] = value;
};
$rootScope.getValue = function (key, name, value) {

View File

@ -28,7 +28,7 @@
"topthink/framework": "^6.0",
"topthink/think-view": "^1.0",
"zoujingli/ip2region": "^1.0",
"zoujingli/think-library": "v6.0.x-dev",
"zoujingli/think-library": "^6.0",
"zoujingli/wechat-developer": "^1.2"
},
"autoload": {

View File

@ -210,15 +210,26 @@ return array(
'app\\admin\\controller\\api\\Update' => $baseDir . '/app/admin/controller/api/Update.php',
'app\\admin\\controller\\api\\Upload' => $baseDir . '/app/admin/controller/api/Upload.php',
'app\\data\\controller\\Config' => $baseDir . '/app/data/controller/Config.php',
'app\\data\\controller\\Member' => $baseDir . '/app/data/controller/Member.php',
'app\\data\\controller\\NewsItem' => $baseDir . '/app/data/controller/NewsItem.php',
'app\\data\\controller\\NewsMark' => $baseDir . '/app/data/controller/NewsMark.php',
'app\\data\\controller\\ShopGoods' => $baseDir . '/app/data/controller/ShopGoods.php',
'app\\data\\controller\\ShopGoodsCate' => $baseDir . '/app/data/controller/ShopGoodsCate.php',
'app\\data\\controller\\ShopGoodsMark' => $baseDir . '/app/data/controller/ShopGoodsMark.php',
'app\\data\\controller\\ShopGoodsStock' => $baseDir . '/app/data/controller/ShopGoodsStock.php',
'app\\data\\controller\\ShopOrder' => $baseDir . '/app/data/controller/ShopOrder.php',
'app\\data\\controller\\ShopOrderSend' => $baseDir . '/app/data/controller/ShopOrderSend.php',
'app\\data\\controller\\ShopOrderService' => $baseDir . '/app/data/controller/ShopOrderService.php',
'app\\data\\controller\\api\\Auth' => $baseDir . '/app/data/controller/api/Auth.php',
'app\\data\\controller\\api\\Data' => $baseDir . '/app/data/controller/api/Data.php',
'app\\data\\controller\\api\\Goods' => $baseDir . '/app/data/controller/api/Goods.php',
'app\\data\\controller\\api\\Login' => $baseDir . '/app/data/controller/api/Login.php',
'app\\data\\controller\\api\\News' => $baseDir . '/app/data/controller/api/News.php',
'app\\data\\controller\\api\\auth\\Center' => $baseDir . '/app/data/controller/api/auth/Center.php',
'app\\data\\controller\\api\\auth\\News' => $baseDir . '/app/data/controller/api/auth/News.php',
'app\\data\\service\\GoodsService' => $baseDir . '/app/data/service/GoodsService.php',
'app\\data\\service\\NewsService' => $baseDir . '/app/data/service/NewsService.php',
'app\\data\\service\\OrderService' => $baseDir . '/app/data/service/OrderService.php',
'app\\data\\service\\UserService' => $baseDir . '/app/data/service/UserService.php',
'app\\index\\controller\\Index' => $baseDir . '/app/index/controller/Index.php',
'app\\wechat\\command\\Fans' => $baseDir . '/app/wechat/command/Fans.php',

View File

@ -347,15 +347,26 @@ class ComposerStaticInit7ad2dfd941224dedfd9e69a3187017d8
'app\\admin\\controller\\api\\Update' => __DIR__ . '/../..' . '/app/admin/controller/api/Update.php',
'app\\admin\\controller\\api\\Upload' => __DIR__ . '/../..' . '/app/admin/controller/api/Upload.php',
'app\\data\\controller\\Config' => __DIR__ . '/../..' . '/app/data/controller/Config.php',
'app\\data\\controller\\Member' => __DIR__ . '/../..' . '/app/data/controller/Member.php',
'app\\data\\controller\\NewsItem' => __DIR__ . '/../..' . '/app/data/controller/NewsItem.php',
'app\\data\\controller\\NewsMark' => __DIR__ . '/../..' . '/app/data/controller/NewsMark.php',
'app\\data\\controller\\ShopGoods' => __DIR__ . '/../..' . '/app/data/controller/ShopGoods.php',
'app\\data\\controller\\ShopGoodsCate' => __DIR__ . '/../..' . '/app/data/controller/ShopGoodsCate.php',
'app\\data\\controller\\ShopGoodsMark' => __DIR__ . '/../..' . '/app/data/controller/ShopGoodsMark.php',
'app\\data\\controller\\ShopGoodsStock' => __DIR__ . '/../..' . '/app/data/controller/ShopGoodsStock.php',
'app\\data\\controller\\ShopOrder' => __DIR__ . '/../..' . '/app/data/controller/ShopOrder.php',
'app\\data\\controller\\ShopOrderSend' => __DIR__ . '/../..' . '/app/data/controller/ShopOrderSend.php',
'app\\data\\controller\\ShopOrderService' => __DIR__ . '/../..' . '/app/data/controller/ShopOrderService.php',
'app\\data\\controller\\api\\Auth' => __DIR__ . '/../..' . '/app/data/controller/api/Auth.php',
'app\\data\\controller\\api\\Data' => __DIR__ . '/../..' . '/app/data/controller/api/Data.php',
'app\\data\\controller\\api\\Goods' => __DIR__ . '/../..' . '/app/data/controller/api/Goods.php',
'app\\data\\controller\\api\\Login' => __DIR__ . '/../..' . '/app/data/controller/api/Login.php',
'app\\data\\controller\\api\\News' => __DIR__ . '/../..' . '/app/data/controller/api/News.php',
'app\\data\\controller\\api\\auth\\Center' => __DIR__ . '/../..' . '/app/data/controller/api/auth/Center.php',
'app\\data\\controller\\api\\auth\\News' => __DIR__ . '/../..' . '/app/data/controller/api/auth/News.php',
'app\\data\\service\\GoodsService' => __DIR__ . '/../..' . '/app/data/service/GoodsService.php',
'app\\data\\service\\NewsService' => __DIR__ . '/../..' . '/app/data/service/NewsService.php',
'app\\data\\service\\OrderService' => __DIR__ . '/../..' . '/app/data/service/OrderService.php',
'app\\data\\service\\UserService' => __DIR__ . '/../..' . '/app/data/service/UserService.php',
'app\\index\\controller\\Index' => __DIR__ . '/../..' . '/app/index/controller/Index.php',
'app\\wechat\\command\\Fans' => __DIR__ . '/../..' . '/app/wechat/command/Fans.php',

View File

@ -958,17 +958,17 @@
},
{
"name": "zoujingli/think-library",
"version": "v6.0.x-dev",
"version_normalized": "6.0.9999999.9999999-dev",
"version": "v6.0.7",
"version_normalized": "6.0.7.0",
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "2c0b63b9a34de703a52fbc3018417b95235b3a1f"
"reference": "eac899ff2ef30c37018370b3654151980d1c3ee8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/2c0b63b9a34de703a52fbc3018417b95235b3a1f",
"reference": "2c0b63b9a34de703a52fbc3018417b95235b3a1f",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/eac899ff2ef30c37018370b3654151980d1c3ee8",
"reference": "eac899ff2ef30c37018370b3654151980d1c3ee8",
"shasum": "",
"mirrors": [
{
@ -985,7 +985,7 @@
"ext-mbstring": "*",
"topthink/framework": "^6.0"
},
"time": "2020-09-08T02:23:12+00:00",
"time": "2020-09-10T07:50:21+00:00",
"type": "library",
"extra": {
"think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php
// This file is automatically generated at:2020-09-08 10:39:45
// This file is automatically generated at:2020-09-10 15:56:29
declare (strict_types = 1);
return array (
0 => 'think\\admin\\Library',

View File

@ -41,7 +41,7 @@ class Library extends Service
/**
* 扩展库版本号
*/
const VERSION = '6.0.5';
const VERSION = '6.0.7';
/**
* 启动服务

View File

@ -29,7 +29,7 @@ class HttpExtend
* @param array $options CURL请求参数
* @return boolean|string
*/
public static function get(string $location, array $query = [], array $options = [])
public static function get(string $location, $query = [], array $options = [])
{
$options['query'] = $query;
return static::request('get', $location, $options);
@ -42,7 +42,7 @@ class HttpExtend
* @param array $options CURL请求参数
* @return boolean|string
*/
public static function post(string $location, array $data = [], array $options = [])
public static function post(string $location, $data = [], array $options = [])
{
$options['data'] = $data;
return static::request('post', $location, $options);
@ -89,8 +89,12 @@ class HttpExtend
{
// GET 参数设置
if (!empty($options['query'])) {
$split = strpos($location, '?') !== false ? '&' : '?';
$location .= $split . http_build_query($options['query']);
$location .= strpos($location, '?') !== false ? '&' : '?';
if (is_array($options['query'])) {
$location .= http_build_query($options['query']);
} elseif (is_string($options['query'])) {
$location .= $options['query'];
}
}
$curl = curl_init();
// Agent 代理设置