From 1f20ac6a4201f1babda91fd73de5d6be5d021efe Mon Sep 17 00:00:00 2001
From: Chaim <gc@dtapp.net>
Date: Sat, 9 May 2020 13:25:45 +0800
Subject: [PATCH] - update

---
 src/common.php                                |   2 +-
 src/service/AliYun/Oss/BucketService.php      |  24 +++++++++++++++++
 src/service/AliYun/Oss/ObjectService.php      |  25 ++++++++++++++++++
 src/service/{crypt => Crypt}/AesService.php   |   2 +-
 src/service/{curl => Curl}/BtService.php      |   2 +-
 src/service/{curl => Curl}/HttpService.php    |   2 +-
 .../{douyin => DouYin}/WatermarkService.php   |   2 +-
 src/service/{ip => Ip}/IpIpDistrictInfo.php   |   2 +-
 src/service/{ip => Ip}/IpIpReader.php         |   2 +-
 src/service/{ip => Ip}/IpIpService.php        |   2 +-
 src/service/{ip => Ip}/MapService.php         |   4 +--
 src/service/{ip => Ip}/OnlineService.php      |   4 +--
 src/service/{ip => Ip}/QqWryService.php       |   2 +-
 src/service/{ip => Ip}/bin/city.json          |   0
 src/service/{ip => Ip}/bin/district.json      |   0
 src/service/{ip => Ip}/bin/ipipfree.ipdb      | Bin
 src/service/{ip => Ip}/bin/province.json      |   0
 src/service/{ip => Ip}/bin/qqwry.dat          | Bin
 .../{notice => Notice}/BeAryChatService.php   |   2 +-
 .../{notice => Notice}/DingDingService.php    |   4 +--
 .../{notice => Notice}/QyWeiXinService.php    |   4 +--
 .../{notice => Notice}/SendCloudService.php   |   2 +-
 .../{notice => Notice}/WorkKileService.php    |   2 +-
 .../WeChat/MessageManagementService.php       |   2 +-
 src/service/WeMini/AccessTokenService.php     |   2 +-
 src/service/WeMini/LoginService.php           |   2 +-
 src/service/WeMini/NewTmplService.php         |   2 +-
 src/service/WeMini/QrCodeService.php          |   2 +-
 src/service/WeMini/UserInfoService.php        |   2 +-
 tests/curl.php                                |   2 +-
 tests/douyin.php                              |   2 +-
 31 files changed, 77 insertions(+), 28 deletions(-)
 create mode 100644 src/service/AliYun/Oss/BucketService.php
 create mode 100644 src/service/AliYun/Oss/ObjectService.php
 rename src/service/{crypt => Crypt}/AesService.php (97%)
 rename src/service/{curl => Curl}/BtService.php (98%)
 rename src/service/{curl => Curl}/HttpService.php (99%)
 rename src/service/{douyin => DouYin}/WatermarkService.php (99%)
 rename src/service/{ip => Ip}/IpIpDistrictInfo.php (97%)
 rename src/service/{ip => Ip}/IpIpReader.php (99%)
 rename src/service/{ip => Ip}/IpIpService.php (98%)
 rename src/service/{ip => Ip}/MapService.php (97%)
 rename src/service/{ip => Ip}/OnlineService.php (98%)
 rename src/service/{ip => Ip}/QqWryService.php (99%)
 rename src/service/{ip => Ip}/bin/city.json (100%)
 rename src/service/{ip => Ip}/bin/district.json (100%)
 rename src/service/{ip => Ip}/bin/ipipfree.ipdb (100%)
 rename src/service/{ip => Ip}/bin/province.json (100%)
 rename src/service/{ip => Ip}/bin/qqwry.dat (100%)
 rename src/service/{notice => Notice}/BeAryChatService.php (95%)
 rename src/service/{notice => Notice}/DingDingService.php (96%)
 rename src/service/{notice => Notice}/QyWeiXinService.php (96%)
 rename src/service/{notice => Notice}/SendCloudService.php (95%)
 rename src/service/{notice => Notice}/WorkKileService.php (95%)

diff --git a/src/common.php b/src/common.php
index 047ed16..41279a2 100644
--- a/src/common.php
+++ b/src/common.php
@@ -15,7 +15,7 @@
 // +----------------------------------------------------------------------
 
 use DtApp\ThinkLibrary\exception\IpException;
-use DtApp\ThinkLibrary\service\ip\QqWryService;
+use DtApp\ThinkLibrary\service\Ip\QqWryService;
 
 if (!function_exists('get_ip_info')) {
 
diff --git a/src/service/AliYun/Oss/BucketService.php b/src/service/AliYun/Oss/BucketService.php
new file mode 100644
index 0000000..ce649e7
--- /dev/null
+++ b/src/service/AliYun/Oss/BucketService.php
@@ -0,0 +1,24 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkLibrary 6.0 for ThinkPhP 6.0
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2020 [ https://www.dtapp.net ]
+// +----------------------------------------------------------------------
+// | 官方网站: https://gitee.com/liguangchun/ThinkLibrary
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 仓库地址 ：https://gitee.com/liguangchun/ThinkLibrary
+// | github 仓库地址 ：https://github.com/GC0202/ThinkLibrary
+// | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
+// +----------------------------------------------------------------------
+
+namespace DtApp\ThinkLibrary\service\AliYun\Oss;
+
+use DtApp\ThinkLibrary\Service;
+
+class BucketService extends Service
+{
+
+}
diff --git a/src/service/AliYun/Oss/ObjectService.php b/src/service/AliYun/Oss/ObjectService.php
new file mode 100644
index 0000000..f4c699d
--- /dev/null
+++ b/src/service/AliYun/Oss/ObjectService.php
@@ -0,0 +1,25 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkLibrary 6.0 for ThinkPhP 6.0
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2020 [ https://www.dtapp.net ]
+// +----------------------------------------------------------------------
+// | 官方网站: https://gitee.com/liguangchun/ThinkLibrary
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 仓库地址 ：https://gitee.com/liguangchun/ThinkLibrary
+// | github 仓库地址 ：https://github.com/GC0202/ThinkLibrary
+// | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
+// +----------------------------------------------------------------------
+
+namespace DtApp\ThinkLibrary\service\AliYun\Oss;
+
+
+use DtApp\ThinkLibrary\Service;
+
+class ObjectService extends Service
+{
+
+}
diff --git a/src/service/crypt/AesService.php b/src/service/Crypt/AesService.php
similarity index 97%
rename from src/service/crypt/AesService.php
rename to src/service/Crypt/AesService.php
index 1fbf212..e4b4bcb 100644
--- a/src/service/crypt/AesService.php
+++ b/src/service/Crypt/AesService.php
@@ -14,7 +14,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary\service\crypt;
+namespace DtApp\ThinkLibrary\service\Crypt;
 
 use DtApp\ThinkLibrary\Service;
 
diff --git a/src/service/curl/BtService.php b/src/service/Curl/BtService.php
similarity index 98%
rename from src/service/curl/BtService.php
rename to src/service/Curl/BtService.php
index 8f990b7..fbf97d9 100644
--- a/src/service/curl/BtService.php
+++ b/src/service/Curl/BtService.php
@@ -14,7 +14,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary\service\curl;
+namespace DtApp\ThinkLibrary\service\Curl;
 
 use DtApp\ThinkLibrary\exception\CurlException;
 use DtApp\ThinkLibrary\Service;
diff --git a/src/service/curl/HttpService.php b/src/service/Curl/HttpService.php
similarity index 99%
rename from src/service/curl/HttpService.php
rename to src/service/Curl/HttpService.php
index befc4a9..4e285ef 100644
--- a/src/service/curl/HttpService.php
+++ b/src/service/Curl/HttpService.php
@@ -14,7 +14,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary\service\curl;
+namespace DtApp\ThinkLibrary\service\Curl;
 
 use DtApp\ThinkLibrary\exception\CurlException;
 use DtApp\ThinkLibrary\Service;
diff --git a/src/service/douyin/WatermarkService.php b/src/service/DouYin/WatermarkService.php
similarity index 99%
rename from src/service/douyin/WatermarkService.php
rename to src/service/DouYin/WatermarkService.php
index 2424c0b..92d8703 100644
--- a/src/service/douyin/WatermarkService.php
+++ b/src/service/DouYin/WatermarkService.php
@@ -14,7 +14,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary\service\douyin;
+namespace DtApp\ThinkLibrary\service\DouYin;
 
 use DtApp\ThinkLibrary\exception\DouYinException;
 use DtApp\ThinkLibrary\facade\Pregs;
diff --git a/src/service/ip/IpIpDistrictInfo.php b/src/service/Ip/IpIpDistrictInfo.php
similarity index 97%
rename from src/service/ip/IpIpDistrictInfo.php
rename to src/service/Ip/IpIpDistrictInfo.php
index 6ce4383..a94ee9f 100644
--- a/src/service/ip/IpIpDistrictInfo.php
+++ b/src/service/Ip/IpIpDistrictInfo.php
@@ -14,7 +14,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary\service\ip;
+namespace DtApp\ThinkLibrary\service\Ip;
 
 
 class IpIpDistrictInfo
diff --git a/src/service/ip/IpIpReader.php b/src/service/Ip/IpIpReader.php
similarity index 99%
rename from src/service/ip/IpIpReader.php
rename to src/service/Ip/IpIpReader.php
index 2ee943a..1832222 100644
--- a/src/service/ip/IpIpReader.php
+++ b/src/service/Ip/IpIpReader.php
@@ -14,7 +14,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary\service\ip;
+namespace DtApp\ThinkLibrary\service\Ip;
 
 use BadMethodCallException;
 use Exception;
diff --git a/src/service/ip/IpIpService.php b/src/service/Ip/IpIpService.php
similarity index 98%
rename from src/service/ip/IpIpService.php
rename to src/service/Ip/IpIpService.php
index f5b002e..105927f 100644
--- a/src/service/ip/IpIpService.php
+++ b/src/service/Ip/IpIpService.php
@@ -14,7 +14,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary\service\ip;
+namespace DtApp\ThinkLibrary\service\Ip;
 
 use DtApp\ThinkLibrary\Service;
 use Exception;
diff --git a/src/service/ip/MapService.php b/src/service/Ip/MapService.php
similarity index 97%
rename from src/service/ip/MapService.php
rename to src/service/Ip/MapService.php
index e91741f..b6030ac 100644
--- a/src/service/ip/MapService.php
+++ b/src/service/Ip/MapService.php
@@ -14,12 +14,12 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary\service\ip;
+namespace DtApp\ThinkLibrary\service\Ip;
 
 use DtApp\ThinkLibrary\exception\CurlException;
 use DtApp\ThinkLibrary\exception\IpException;
 use DtApp\ThinkLibrary\Service;
-use DtApp\ThinkLibrary\service\curl\HttpService;
+use DtApp\ThinkLibrary\service\Curl\HttpService;
 
 /**
  * IP  - 地图
diff --git a/src/service/ip/OnlineService.php b/src/service/Ip/OnlineService.php
similarity index 98%
rename from src/service/ip/OnlineService.php
rename to src/service/Ip/OnlineService.php
index 0db62ec..7fdd8bc 100644
--- a/src/service/ip/OnlineService.php
+++ b/src/service/Ip/OnlineService.php
@@ -14,12 +14,12 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary\service\ip;
+namespace DtApp\ThinkLibrary\service\Ip;
 
 use DtApp\ThinkLibrary\exception\CurlException;
 use DtApp\ThinkLibrary\exception\IpException;
 use DtApp\ThinkLibrary\Service;
-use DtApp\ThinkLibrary\service\curl\HttpService;
+use DtApp\ThinkLibrary\service\Curl\HttpService;
 
 /**
  * IP  - 在线查询接口
diff --git a/src/service/ip/QqWryService.php b/src/service/Ip/QqWryService.php
similarity index 99%
rename from src/service/ip/QqWryService.php
rename to src/service/Ip/QqWryService.php
index f3a4459..dd195c1 100644
--- a/src/service/ip/QqWryService.php
+++ b/src/service/Ip/QqWryService.php
@@ -14,7 +14,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary\service\ip;
+namespace DtApp\ThinkLibrary\service\Ip;
 
 use DtApp\ThinkLibrary\exception\IpException;
 use DtApp\ThinkLibrary\Service;
diff --git a/src/service/ip/bin/city.json b/src/service/Ip/bin/city.json
similarity index 100%
rename from src/service/ip/bin/city.json
rename to src/service/Ip/bin/city.json
diff --git a/src/service/ip/bin/district.json b/src/service/Ip/bin/district.json
similarity index 100%
rename from src/service/ip/bin/district.json
rename to src/service/Ip/bin/district.json
diff --git a/src/service/ip/bin/ipipfree.ipdb b/src/service/Ip/bin/ipipfree.ipdb
similarity index 100%
rename from src/service/ip/bin/ipipfree.ipdb
rename to src/service/Ip/bin/ipipfree.ipdb
diff --git a/src/service/ip/bin/province.json b/src/service/Ip/bin/province.json
similarity index 100%
rename from src/service/ip/bin/province.json
rename to src/service/Ip/bin/province.json
diff --git a/src/service/ip/bin/qqwry.dat b/src/service/Ip/bin/qqwry.dat
similarity index 100%
rename from src/service/ip/bin/qqwry.dat
rename to src/service/Ip/bin/qqwry.dat
diff --git a/src/service/notice/BeAryChatService.php b/src/service/Notice/BeAryChatService.php
similarity index 95%
rename from src/service/notice/BeAryChatService.php
rename to src/service/Notice/BeAryChatService.php
index 58b0dbb..d8521d5 100644
--- a/src/service/notice/BeAryChatService.php
+++ b/src/service/Notice/BeAryChatService.php
@@ -14,7 +14,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary\service\notice;
+namespace DtApp\ThinkLibrary\service\Notice;
 
 use DtApp\ThinkLibrary\Service;
 
diff --git a/src/service/notice/DingDingService.php b/src/service/Notice/DingDingService.php
similarity index 96%
rename from src/service/notice/DingDingService.php
rename to src/service/Notice/DingDingService.php
index 3b049e3..65e32cd 100644
--- a/src/service/notice/DingDingService.php
+++ b/src/service/Notice/DingDingService.php
@@ -14,12 +14,12 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary\service\notice;
+namespace DtApp\ThinkLibrary\service\Notice;
 
 use DtApp\ThinkLibrary\exception\CurlException;
 use DtApp\ThinkLibrary\exception\NoticeException;
 use DtApp\ThinkLibrary\Service;
-use DtApp\ThinkLibrary\service\curl\HttpService;
+use DtApp\ThinkLibrary\service\Curl\HttpService;
 
 /**
  * 通知  - 钉钉
diff --git a/src/service/notice/QyWeiXinService.php b/src/service/Notice/QyWeiXinService.php
similarity index 96%
rename from src/service/notice/QyWeiXinService.php
rename to src/service/Notice/QyWeiXinService.php
index 32eeb9c..440ec13 100644
--- a/src/service/notice/QyWeiXinService.php
+++ b/src/service/Notice/QyWeiXinService.php
@@ -14,12 +14,12 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary\service\notice;
+namespace DtApp\ThinkLibrary\service\Notice;
 
 use DtApp\ThinkLibrary\exception\CurlException;
 use DtApp\ThinkLibrary\exception\NoticeException;
 use DtApp\ThinkLibrary\Service;
-use DtApp\ThinkLibrary\service\curl\HttpService;
+use DtApp\ThinkLibrary\service\Curl\HttpService;
 
 /**
  * 通知 - 企业微信
diff --git a/src/service/notice/SendCloudService.php b/src/service/Notice/SendCloudService.php
similarity index 95%
rename from src/service/notice/SendCloudService.php
rename to src/service/Notice/SendCloudService.php
index 2231965..2fe6096 100644
--- a/src/service/notice/SendCloudService.php
+++ b/src/service/Notice/SendCloudService.php
@@ -14,7 +14,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary\service\notice;
+namespace DtApp\ThinkLibrary\service\Notice;
 
 use DtApp\ThinkLibrary\Service;
 
diff --git a/src/service/notice/WorkKileService.php b/src/service/Notice/WorkKileService.php
similarity index 95%
rename from src/service/notice/WorkKileService.php
rename to src/service/Notice/WorkKileService.php
index b94e1b5..b61f3e4 100644
--- a/src/service/notice/WorkKileService.php
+++ b/src/service/Notice/WorkKileService.php
@@ -14,7 +14,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary\service\notice;
+namespace DtApp\ThinkLibrary\service\Notice;
 
 use DtApp\ThinkLibrary\Service;
 
diff --git a/src/service/WeChat/MessageManagementService.php b/src/service/WeChat/MessageManagementService.php
index 480178e..19c38d3 100644
--- a/src/service/WeChat/MessageManagementService.php
+++ b/src/service/WeChat/MessageManagementService.php
@@ -19,7 +19,7 @@ namespace DtApp\ThinkLibrary\service\WeChat;
 
 use DtApp\ThinkLibrary\exception\CurlException;
 use DtApp\ThinkLibrary\Service;
-use DtApp\ThinkLibrary\service\curl\HttpService;
+use DtApp\ThinkLibrary\service\Curl\HttpService;
 
 /**
  * 微信公众号 - 消息管理
diff --git a/src/service/WeMini/AccessTokenService.php b/src/service/WeMini/AccessTokenService.php
index 0c8a234..f696802 100644
--- a/src/service/WeMini/AccessTokenService.php
+++ b/src/service/WeMini/AccessTokenService.php
@@ -18,7 +18,7 @@ namespace DtApp\ThinkLibrary\service\WeMini;
 
 use DtApp\ThinkLibrary\exception\CurlException;
 use DtApp\ThinkLibrary\Service;
-use DtApp\ThinkLibrary\service\curl\HttpService;
+use DtApp\ThinkLibrary\service\Curl\HttpService;
 
 /**
  * 微信小程序 - 接口调用凭据
diff --git a/src/service/WeMini/LoginService.php b/src/service/WeMini/LoginService.php
index 4bde821..77298b3 100644
--- a/src/service/WeMini/LoginService.php
+++ b/src/service/WeMini/LoginService.php
@@ -18,7 +18,7 @@ namespace DtApp\ThinkLibrary\service\WeMini;
 
 use DtApp\ThinkLibrary\exception\CurlException;
 use DtApp\ThinkLibrary\Service;
-use DtApp\ThinkLibrary\service\curl\HttpService;
+use DtApp\ThinkLibrary\service\Curl\HttpService;
 
 /**
  * 微信小程序 - 登录
diff --git a/src/service/WeMini/NewTmplService.php b/src/service/WeMini/NewTmplService.php
index 917e47c..e487dd1 100644
--- a/src/service/WeMini/NewTmplService.php
+++ b/src/service/WeMini/NewTmplService.php
@@ -18,7 +18,7 @@ namespace DtApp\ThinkLibrary\service\WeMini;
 
 use DtApp\ThinkLibrary\exception\CurlException;
 use DtApp\ThinkLibrary\Service;
-use DtApp\ThinkLibrary\service\curl\HttpService;
+use DtApp\ThinkLibrary\service\Curl\HttpService;
 
 /**
  * 微信小程序 - 订阅消息
diff --git a/src/service/WeMini/QrCodeService.php b/src/service/WeMini/QrCodeService.php
index 9470883..18b8be8 100644
--- a/src/service/WeMini/QrCodeService.php
+++ b/src/service/WeMini/QrCodeService.php
@@ -18,7 +18,7 @@ namespace DtApp\ThinkLibrary\service\WeMini;
 
 use DtApp\ThinkLibrary\exception\CurlException;
 use DtApp\ThinkLibrary\Service;
-use DtApp\ThinkLibrary\service\curl\HttpService;
+use DtApp\ThinkLibrary\service\Curl\HttpService;
 
 /**
  * 微信小程序 - 小程序码
diff --git a/src/service/WeMini/UserInfoService.php b/src/service/WeMini/UserInfoService.php
index a7cfabd..1ef642c 100644
--- a/src/service/WeMini/UserInfoService.php
+++ b/src/service/WeMini/UserInfoService.php
@@ -18,7 +18,7 @@ namespace DtApp\ThinkLibrary\service\WeMini;
 
 use DtApp\ThinkLibrary\exception\CurlException;
 use DtApp\ThinkLibrary\Service;
-use DtApp\ThinkLibrary\service\curl\HttpService;
+use DtApp\ThinkLibrary\service\Curl\HttpService;
 
 /**
  * 微信小程序 - 用户信息
diff --git a/tests/curl.php b/tests/curl.php
index e3a7c78..69e0c7a 100644
--- a/tests/curl.php
+++ b/tests/curl.php
@@ -15,7 +15,7 @@
 // +----------------------------------------------------------------------
 
 use DtApp\ThinkLibrary\exception\CurlException;
-use DtApp\ThinkLibrary\service\curl\HttpService;
+use DtApp\ThinkLibrary\service\Curl\HttpService;
 
 require '../vendor/autoload.php';
 
diff --git a/tests/douyin.php b/tests/douyin.php
index da67750..f61120c 100644
--- a/tests/douyin.php
+++ b/tests/douyin.php
@@ -15,7 +15,7 @@
 // +----------------------------------------------------------------------
 
 use DtApp\ThinkLibrary\exception\DouYinException;
-use DtApp\ThinkLibrary\service\douyin\WatermarkService;
+use DtApp\ThinkLibrary\service\DouYin\WatermarkService;
 
 require '../vendor/autoload.php';