From 291e8820692b2b8fbe5a14e433c2ec8277872bec Mon Sep 17 00:00:00 2001
From: "as2252258@163.com" <as22522582>
Date: Thu, 5 Mar 2020 12:41:49 +0800
Subject: [PATCH] add clear

---
 Container.php                                        |  4 ++--
 composer.json                                        |  5 +----
 officialaccount/AccessToken.php                      | 12 ------------
 {common => wchat/common}/Config.php                  |  2 +-
 {common => wchat/common}/Decode.php                  |  2 +-
 {common => wchat/common}/Help.php                    |  2 +-
 {common => wchat/common}/HttpClient.php              |  2 +-
 {common => wchat/common}/Miniprogarampage.php        |  4 ++--
 {common => wchat/common}/Progaram.php                |  2 +-
 {common => wchat/common}/Result.php                  |  2 +-
 wchat/officialaccount/AccessToken.php                | 12 ++++++++++++
 .../officialaccount}/AfficialAccount.php             |  6 +++---
 .../officialaccount}/Authorization.php               |  8 ++++----
 .../officialaccount}/NewsManager.php                 |  6 +++---
 .../officialaccount}/QrCode.php                      |  6 +++---
 .../officialaccount}/SourceMaterial.php              |  6 +++---
 .../officialaccount}/Subscribe.php                   |  4 ++--
 {officialaccount => wchat/officialaccount}/Tag.php   |  2 +-
 {officialaccount => wchat/officialaccount}/WxSDK.php |  4 ++--
 .../officialaccount}/dcaler/Authorization.php        |  2 +-
 .../officialaccount}/dcaler/PKCS7Encoder.php         |  2 +-
 .../officialaccount}/dcaler/Prpcrypt.php             |  4 ++--
 .../officialaccount}/dcaler/SnsInfo.php              |  2 +-
 .../officialaccount}/dcaler/XMLParse.php             |  4 ++--
 {qq => wchat/qq}/Account.php                         |  8 ++++----
 {qq => wchat/qq}/GamePrePay.php                      |  2 +-
 {qq => wchat/qq}/Notify.php                          |  4 ++--
 {qq => wchat/qq}/QrCode.php                          |  8 ++++----
 {qq => wchat/qq}/Recharge.php                        |  8 ++++----
 {qq => wchat/qq}/Redhat.php                          |  6 +++---
 {qq => wchat/qq}/SecCheck.php                        |  4 ++--
 {qq => wchat/qq}/SmallProgram.php                    |  4 ++--
 {qq => wchat/qq}/Subject.php                         |  4 ++--
 {qq => wchat/qq}/Template.php                        |  4 ++--
 {qq => wchat/qq}/Token.php                           |  2 +-
 {qq => wchat/qq}/result/RedHatResult.php             |  2 +-
 {wx => wchat/wx}/Account.php                         | 10 +++++-----
 {wx => wchat/wx}/ContentAsyncCheck.php               |  2 +-
 {wx => wchat/wx}/Message.php                         |  6 +++---
 {wx => wchat/wx}/Notify.php                          |  2 +-
 {wx => wchat/wx}/PublicTemplate.php                  |  4 ++--
 {wx => wchat/wx}/Recharge.php                        |  8 ++++----
 {wx => wchat/wx}/SecCheck.php                        |  4 ++--
 {wx => wchat/wx}/SmallProgram.php                    |  4 ++--
 {wx => wchat/wx}/Subject.php                         |  4 ++--
 {wx => wchat/wx}/Template.php                        |  4 ++--
 {wx => wchat/wx}/Token.php                           |  2 +-
 47 files changed, 104 insertions(+), 107 deletions(-)
 delete mode 100644 officialaccount/AccessToken.php
 rename {common => wchat/common}/Config.php (99%)
 rename {common => wchat/common}/Decode.php (98%)
 rename {common => wchat/common}/Help.php (98%)
 rename {common => wchat/common}/HttpClient.php (99%)
 rename {common => wchat/common}/Miniprogarampage.php (98%)
 rename {common => wchat/common}/Progaram.php (58%)
 rename {common => wchat/common}/Result.php (99%)
 create mode 100644 wchat/officialaccount/AccessToken.php
 rename {officialaccount => wchat/officialaccount}/AfficialAccount.php (87%)
 rename {officialaccount => wchat/officialaccount}/Authorization.php (93%)
 rename {officialaccount => wchat/officialaccount}/NewsManager.php (97%)
 rename {officialaccount => wchat/officialaccount}/QrCode.php (95%)
 rename {officialaccount => wchat/officialaccount}/SourceMaterial.php (95%)
 rename {officialaccount => wchat/officialaccount}/Subscribe.php (97%)
 rename {officialaccount => wchat/officialaccount}/Tag.php (93%)
 rename {officialaccount => wchat/officialaccount}/WxSDK.php (89%)
 rename {officialaccount => wchat/officialaccount}/dcaler/Authorization.php (99%)
 rename {officialaccount => wchat/officialaccount}/dcaler/PKCS7Encoder.php (95%)
 rename {officialaccount => wchat/officialaccount}/dcaler/Prpcrypt.php (97%)
 rename {officialaccount => wchat/officialaccount}/dcaler/SnsInfo.php (98%)
 rename {officialaccount => wchat/officialaccount}/dcaler/XMLParse.php (92%)
 rename {qq => wchat/qq}/Account.php (93%)
 rename {qq => wchat/qq}/GamePrePay.php (87%)
 rename {qq => wchat/qq}/Notify.php (99%)
 rename {qq => wchat/qq}/QrCode.php (95%)
 rename {qq => wchat/qq}/Recharge.php (97%)
 rename {qq => wchat/qq}/Redhat.php (99%)
 rename {qq => wchat/qq}/SecCheck.php (96%)
 rename {qq => wchat/qq}/SmallProgram.php (92%)
 rename {qq => wchat/qq}/Subject.php (98%)
 rename {qq => wchat/qq}/Template.php (98%)
 rename {qq => wchat/qq}/Token.php (71%)
 rename {qq => wchat/qq}/result/RedHatResult.php (98%)
 rename {wx => wchat/wx}/Account.php (96%)
 rename {wx => wchat/wx}/ContentAsyncCheck.php (99%)
 rename {wx => wchat/wx}/Message.php (98%)
 rename {wx => wchat/wx}/Notify.php (99%)
 rename {wx => wchat/wx}/PublicTemplate.php (98%)
 rename {wx => wchat/wx}/Recharge.php (97%)
 rename {wx => wchat/wx}/SecCheck.php (97%)
 rename {wx => wchat/wx}/SmallProgram.php (92%)
 rename {wx => wchat/wx}/Subject.php (98%)
 rename {wx => wchat/wx}/Template.php (98%)
 rename {wx => wchat/wx}/Token.php (71%)

diff --git a/Container.php b/Container.php
index 385efaf..2304b35 100644
--- a/Container.php
+++ b/Container.php
@@ -1,7 +1,7 @@
 <?php
 
-use common\Config;
-use common\Progaram;
+use wchat\common\Config;
+use wchat\common\Progaram;
 
 /**
  * Class Container
diff --git a/composer.json b/composer.json
index ea1f56c..b666c53 100644
--- a/composer.json
+++ b/composer.json
@@ -13,10 +13,7 @@
 	],
 	"autoload": {
 		"psr-4": {
-			"wchat\\": "wx",
-			"qq\\": "qq",
-			"common\\": "common",
-			"officialaccount\\": "officialaccount"
+			"wchat\\": "wchat"
 		},
 		"files": [
 			"Container.php"
diff --git a/officialaccount/AccessToken.php b/officialaccount/AccessToken.php
deleted file mode 100644
index a37040a..0000000
--- a/officialaccount/AccessToken.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-
-namespace officialaccount;
-
-
-use common\HttpClient;
-
-class AccessToken extends AfficialAccount
-{
-
-}
diff --git a/common/Config.php b/wchat/common/Config.php
similarity index 99%
rename from common/Config.php
rename to wchat/common/Config.php
index 65a1844..88bdaa2 100644
--- a/common/Config.php
+++ b/wchat/common/Config.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace common;
+namespace wchat\common;
 
 
 class Config
diff --git a/common/Decode.php b/wchat/common/Decode.php
similarity index 98%
rename from common/Decode.php
rename to wchat/common/Decode.php
index 9018b4f..969e031 100644
--- a/common/Decode.php
+++ b/wchat/common/Decode.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace common;
+namespace wchat\common;
 
 
 class Decode
diff --git a/common/Help.php b/wchat/common/Help.php
similarity index 98%
rename from common/Help.php
rename to wchat/common/Help.php
index 620b3f0..2905d30 100644
--- a/common/Help.php
+++ b/wchat/common/Help.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace common;
+namespace wchat\common;
 
 
 class Help extends Miniprogarampage
diff --git a/common/HttpClient.php b/wchat/common/HttpClient.php
similarity index 99%
rename from common/HttpClient.php
rename to wchat/common/HttpClient.php
index 474152d..6fd10fe 100644
--- a/common/HttpClient.php
+++ b/wchat/common/HttpClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace common;
+namespace wchat\common;
 
 use Swoole\Coroutine\Http\Client as SClient;
 use Swoole\Coroutine\System;
diff --git a/common/Miniprogarampage.php b/wchat/common/Miniprogarampage.php
similarity index 98%
rename from common/Miniprogarampage.php
rename to wchat/common/Miniprogarampage.php
index 2fce1d2..4ede543 100644
--- a/common/Miniprogarampage.php
+++ b/wchat/common/Miniprogarampage.php
@@ -6,9 +6,9 @@
  * Time: 10:23
  */
 
-namespace common;
+namespace wchat\common;
 
-use common\Config;
+use wchat\common\Config;
 
 abstract class Miniprogarampage implements Progaram
 {
diff --git a/common/Progaram.php b/wchat/common/Progaram.php
similarity index 58%
rename from common/Progaram.php
rename to wchat/common/Progaram.php
index 44cdca7..f8d683d 100644
--- a/common/Progaram.php
+++ b/wchat/common/Progaram.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace common;
+namespace wchat\common;
 
 
 interface Progaram
diff --git a/common/Result.php b/wchat/common/Result.php
similarity index 99%
rename from common/Result.php
rename to wchat/common/Result.php
index b230c37..f648b4f 100644
--- a/common/Result.php
+++ b/wchat/common/Result.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace common;
+namespace wchat\common;
 
 /**
  * Class Result
diff --git a/wchat/officialaccount/AccessToken.php b/wchat/officialaccount/AccessToken.php
new file mode 100644
index 0000000..9b58fff
--- /dev/null
+++ b/wchat/officialaccount/AccessToken.php
@@ -0,0 +1,12 @@
+<?php
+
+
+namespace wchat\officialaccount;
+
+
+use wchat\common\HttpClient;
+
+class AccessToken extends AfficialAccount
+{
+
+}
diff --git a/officialaccount/AfficialAccount.php b/wchat/officialaccount/AfficialAccount.php
similarity index 87%
rename from officialaccount/AfficialAccount.php
rename to wchat/officialaccount/AfficialAccount.php
index 8d4470a..b1807d5 100644
--- a/officialaccount/AfficialAccount.php
+++ b/wchat/officialaccount/AfficialAccount.php
@@ -1,11 +1,11 @@
 <?php
 
 
-namespace officialaccount;
+namespace wchat\officialaccount;
 
 
-use common\HttpClient;
-use common\Miniprogarampage;
+use wchat\common\HttpClient;
+use wchat\common\Miniprogarampage;
 
 abstract class AfficialAccount extends Miniprogarampage
 {
diff --git a/officialaccount/Authorization.php b/wchat/officialaccount/Authorization.php
similarity index 93%
rename from officialaccount/Authorization.php
rename to wchat/officialaccount/Authorization.php
index 7211933..57fa15a 100644
--- a/officialaccount/Authorization.php
+++ b/wchat/officialaccount/Authorization.php
@@ -1,12 +1,12 @@
 <?php
 
 
-namespace officialaccount;
+namespace wchat\officialaccount;
 
 
-use officialaccount\dcaler\SnsInfo;
-use common\HttpClient;
-use officialaccount\dcaler\Authorization as DAuth;
+use wchat\officialaccount\dcaler\SnsInfo;
+use wchat\common\HttpClient;
+use wchat\officialaccount\dcaler\Authorization as DAuth;
 
 class Authorization extends AfficialAccount
 {
diff --git a/officialaccount/NewsManager.php b/wchat/officialaccount/NewsManager.php
similarity index 97%
rename from officialaccount/NewsManager.php
rename to wchat/officialaccount/NewsManager.php
index d5ed781..131962f 100644
--- a/officialaccount/NewsManager.php
+++ b/wchat/officialaccount/NewsManager.php
@@ -1,11 +1,11 @@
 <?php
 
 
-namespace officialaccount;
+namespace wchat\officialaccount;
 
 
-use officialaccount\dcaler\Prpcrypt;
-use officialaccount\dcaler\XMLParse;
+use wchat\officialaccount\dcaler\Prpcrypt;
+use wchat\officialaccount\dcaler\XMLParse;
 
 class NewsManager extends AfficialAccount
 {
diff --git a/officialaccount/QrCode.php b/wchat/officialaccount/QrCode.php
similarity index 95%
rename from officialaccount/QrCode.php
rename to wchat/officialaccount/QrCode.php
index 38315a0..caee85b 100644
--- a/officialaccount/QrCode.php
+++ b/wchat/officialaccount/QrCode.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace officialaccount;
+namespace wchat\officialaccount;
 
 
-use common\HttpClient;
-use common\Result;
+use wchat\common\HttpClient;
+use wchat\common\Result;
 
 class QrCode extends AfficialAccount
 {
diff --git a/officialaccount/SourceMaterial.php b/wchat/officialaccount/SourceMaterial.php
similarity index 95%
rename from officialaccount/SourceMaterial.php
rename to wchat/officialaccount/SourceMaterial.php
index b731bc5..20b5eca 100644
--- a/officialaccount/SourceMaterial.php
+++ b/wchat/officialaccount/SourceMaterial.php
@@ -1,11 +1,11 @@
 <?php
 
 
-namespace officialaccount;
+namespace wchat\officialaccount;
 
 
-use common\HttpClient;
-use common\Result;
+use wchat\common\HttpClient;
+use wchat\common\Result;
 
 class SourceMaterial extends AfficialAccount
 {
diff --git a/officialaccount/Subscribe.php b/wchat/officialaccount/Subscribe.php
similarity index 97%
rename from officialaccount/Subscribe.php
rename to wchat/officialaccount/Subscribe.php
index c7a2fae..40a42d3 100644
--- a/officialaccount/Subscribe.php
+++ b/wchat/officialaccount/Subscribe.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace officialaccount;
+namespace wchat\officialaccount;
 
 
-use common\HttpClient;
+use wchat\common\HttpClient;
 
 class Subscribe extends AfficialAccount
 {
diff --git a/officialaccount/Tag.php b/wchat/officialaccount/Tag.php
similarity index 93%
rename from officialaccount/Tag.php
rename to wchat/officialaccount/Tag.php
index 3e57943..6f960bf 100644
--- a/officialaccount/Tag.php
+++ b/wchat/officialaccount/Tag.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace officialaccount;
+namespace wchat\officialaccount;
 
 
 class Tag extends AfficialAccount
diff --git a/officialaccount/WxSDK.php b/wchat/officialaccount/WxSDK.php
similarity index 89%
rename from officialaccount/WxSDK.php
rename to wchat/officialaccount/WxSDK.php
index b0b582a..1fe7573 100644
--- a/officialaccount/WxSDK.php
+++ b/wchat/officialaccount/WxSDK.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace officialaccount;
+namespace wchat\officialaccount;
 
 
-use common\Config;
+use wchat\common\Config;
 
 class WxSDK
 {
diff --git a/officialaccount/dcaler/Authorization.php b/wchat/officialaccount/dcaler/Authorization.php
similarity index 99%
rename from officialaccount/dcaler/Authorization.php
rename to wchat/officialaccount/dcaler/Authorization.php
index b703344..20a1b0e 100644
--- a/officialaccount/dcaler/Authorization.php
+++ b/wchat/officialaccount/dcaler/Authorization.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace officialaccount\dcaler;
+namespace wchat\officialaccount\dcaler;
 
 
 class Authorization
diff --git a/officialaccount/dcaler/PKCS7Encoder.php b/wchat/officialaccount/dcaler/PKCS7Encoder.php
similarity index 95%
rename from officialaccount/dcaler/PKCS7Encoder.php
rename to wchat/officialaccount/dcaler/PKCS7Encoder.php
index 80e97b8..19dfb58 100644
--- a/officialaccount/dcaler/PKCS7Encoder.php
+++ b/wchat/officialaccount/dcaler/PKCS7Encoder.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace officialaccount\dcaler;
+namespace wchat\officialaccount\dcaler;
 
 
 class PKCS7Encoder
diff --git a/officialaccount/dcaler/Prpcrypt.php b/wchat/officialaccount/dcaler/Prpcrypt.php
similarity index 97%
rename from officialaccount/dcaler/Prpcrypt.php
rename to wchat/officialaccount/dcaler/Prpcrypt.php
index d121b06..81bb8b6 100644
--- a/officialaccount/dcaler/Prpcrypt.php
+++ b/wchat/officialaccount/dcaler/Prpcrypt.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace officialaccount\dcaler;
+namespace wchat\officialaccount\dcaler;
 
 
-use officialaccount\NewsManager;
+use wchat\officialaccount\NewsManager;
 
 class Prpcrypt
 {
diff --git a/officialaccount/dcaler/SnsInfo.php b/wchat/officialaccount/dcaler/SnsInfo.php
similarity index 98%
rename from officialaccount/dcaler/SnsInfo.php
rename to wchat/officialaccount/dcaler/SnsInfo.php
index c0aaa00..caec518 100644
--- a/officialaccount/dcaler/SnsInfo.php
+++ b/wchat/officialaccount/dcaler/SnsInfo.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace officialaccount\dcaler;
+namespace wchat\officialaccount\dcaler;
 
 
 class SnsInfo
diff --git a/officialaccount/dcaler/XMLParse.php b/wchat/officialaccount/dcaler/XMLParse.php
similarity index 92%
rename from officialaccount/dcaler/XMLParse.php
rename to wchat/officialaccount/dcaler/XMLParse.php
index 4155fd2..7d2c355 100644
--- a/officialaccount/dcaler/XMLParse.php
+++ b/wchat/officialaccount/dcaler/XMLParse.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace officialaccount\dcaler;
+namespace wchat\officialaccount\dcaler;
 
 
-use officialaccount\NewsManager;
+use wchat\officialaccount\NewsManager;
 
 class XMLParse
 {
diff --git a/qq/Account.php b/wchat/qq/Account.php
similarity index 93%
rename from qq/Account.php
rename to wchat/qq/Account.php
index 6f6a91f..624af4d 100644
--- a/qq/Account.php
+++ b/wchat/qq/Account.php
@@ -6,11 +6,11 @@
  * Time: 16:12
  */
 
-namespace qq;
+namespace wchat\qq;
 
-use common\Decode;
-use common\HttpClient;
-use common\Result;
+use wchat\common\Decode;
+use wchat\common\HttpClient;
+use wchat\common\Result;
 
 class Account extends SmallProgram
 {
diff --git a/qq/GamePrePay.php b/wchat/qq/GamePrePay.php
similarity index 87%
rename from qq/GamePrePay.php
rename to wchat/qq/GamePrePay.php
index 09f127d..4d053a5 100644
--- a/qq/GamePrePay.php
+++ b/wchat/qq/GamePrePay.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace qq;
+namespace wchat\qq;
 
 
 class GamePrePay extends SmallProgram
diff --git a/qq/Notify.php b/wchat/qq/Notify.php
similarity index 99%
rename from qq/Notify.php
rename to wchat/qq/Notify.php
index cc835e1..a817f81 100644
--- a/qq/Notify.php
+++ b/wchat/qq/Notify.php
@@ -1,9 +1,9 @@
 <?php
 
 
-namespace qq;
+namespace wchat\qq;
 
-use common\Help;
+use wchat\common\Help;
 
 class Notify extends SmallProgram
 {
diff --git a/qq/QrCode.php b/wchat/qq/QrCode.php
similarity index 95%
rename from qq/QrCode.php
rename to wchat/qq/QrCode.php
index 9c201cf..a250644 100644
--- a/qq/QrCode.php
+++ b/wchat/qq/QrCode.php
@@ -1,11 +1,11 @@
 <?php
 
 
-namespace qq;
+namespace wchat\qq;
 
 
-use common\HttpClient;
-use common\Result;
+use wchat\common\HttpClient;
+use wchat\common\Result;
 
 class QrCode extends SmallProgram
 {
@@ -15,7 +15,7 @@ class QrCode extends SmallProgram
 	private $getwxacode = 'https://api.weixin.qq.com/wxa/getwxacode?access_token=';
 	private $getwxacodeunlimit = 'https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=';
 
-	private $savePath = __DIR__ . '/../../../';
+	private $savePath = __DIR__ . '/../../Users/';
 
 	/**
 	 * @param $path
diff --git a/qq/Recharge.php b/wchat/qq/Recharge.php
similarity index 97%
rename from qq/Recharge.php
rename to wchat/qq/Recharge.php
index 25fee23..71c2555 100644
--- a/qq/Recharge.php
+++ b/wchat/qq/Recharge.php
@@ -6,11 +6,11 @@
  * Time: 10:22
  */
 
-namespace qq;
+namespace wchat\qq;
 
-use common\HttpClient;
-use common\Result;
-use common\Help;
+use wchat\common\HttpClient;
+use wchat\common\Result;
+use wchat\common\Help;
 
 class Recharge extends SmallProgram
 {
diff --git a/qq/Redhat.php b/wchat/qq/Redhat.php
similarity index 99%
rename from qq/Redhat.php
rename to wchat/qq/Redhat.php
index ce24e81..286767c 100644
--- a/qq/Redhat.php
+++ b/wchat/qq/Redhat.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace qq;
+namespace wchat\qq;
 
-use common\Help;
-use common\Result;
+use wchat\common\Help;
+use wchat\common\Result;
 use qq\result\RedHatResult;
 
 class Redhat extends SmallProgram
diff --git a/qq/SecCheck.php b/wchat/qq/SecCheck.php
similarity index 96%
rename from qq/SecCheck.php
rename to wchat/qq/SecCheck.php
index 4ab7342..65c8d98 100644
--- a/qq/SecCheck.php
+++ b/wchat/qq/SecCheck.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace qq;
+namespace wchat\qq;
 
 
-use common\Result;
+use wchat\common\Result;
 
 /**
  * Class SecCheck
diff --git a/qq/SmallProgram.php b/wchat/qq/SmallProgram.php
similarity index 92%
rename from qq/SmallProgram.php
rename to wchat/qq/SmallProgram.php
index e4b2b30..b83f307 100644
--- a/qq/SmallProgram.php
+++ b/wchat/qq/SmallProgram.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace qq;
+namespace wchat\qq;
 
 
-use common\Miniprogarampage;
+use wchat\common\Miniprogarampage;
 
 class SmallProgram extends Miniprogarampage
 {
diff --git a/qq/Subject.php b/wchat/qq/Subject.php
similarity index 98%
rename from qq/Subject.php
rename to wchat/qq/Subject.php
index d846adf..6fb238e 100644
--- a/qq/Subject.php
+++ b/wchat/qq/Subject.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace qq;
+namespace wchat\qq;
 
 
-use common\Result;
+use wchat\common\Result;
 
 class Subject extends SmallProgram
 {
diff --git a/qq/Template.php b/wchat/qq/Template.php
similarity index 98%
rename from qq/Template.php
rename to wchat/qq/Template.php
index 2ca3cd7..52bb162 100644
--- a/qq/Template.php
+++ b/wchat/qq/Template.php
@@ -6,10 +6,10 @@
  * Time: 9:49
  */
 
-namespace qq;
+namespace wchat\qq;
 
 
-use common\Result;
+use wchat\common\Result;
 
 class Template extends SmallProgram
 {
diff --git a/qq/Token.php b/wchat/qq/Token.php
similarity index 71%
rename from qq/Token.php
rename to wchat/qq/Token.php
index e1a31bc..410289b 100644
--- a/qq/Token.php
+++ b/wchat/qq/Token.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace qq;
+namespace wchat\qq;
 
 
 
diff --git a/qq/result/RedHatResult.php b/wchat/qq/result/RedHatResult.php
similarity index 98%
rename from qq/result/RedHatResult.php
rename to wchat/qq/result/RedHatResult.php
index 462027a..2ccffa3 100644
--- a/qq/result/RedHatResult.php
+++ b/wchat/qq/result/RedHatResult.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace qq\result;
+namespace wchat\qq\result;
 
 /**
  * Class RedHatResult
diff --git a/wx/Account.php b/wchat/wx/Account.php
similarity index 96%
rename from wx/Account.php
rename to wchat/wx/Account.php
index b2798f9..e5c4e06 100644
--- a/wx/Account.php
+++ b/wchat/wx/Account.php
@@ -6,11 +6,11 @@
  * Time: 16:12
  */
 
-namespace wchat;
+namespace wchat\wx;
 
-use common\Decode;
-use common\HttpClient;
-use common\Result;
+use wchat\common\Decode;
+use wchat\common\HttpClient;
+use wchat\common\Result;
 
 class Account extends SmallProgram
 {
@@ -20,7 +20,7 @@ class Account extends SmallProgram
 	private $publicInfo = 'https://api.weixin.qq.com/cgi-bin/user/info?';
 	private $getwxacodeunlimit = 'https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=';
 
-	private $savePath = __DIR__ . '/../../../';
+	private $savePath = __DIR__ . '/../../Users/';
 
 
 	private $OK = 0;
diff --git a/wx/ContentAsyncCheck.php b/wchat/wx/ContentAsyncCheck.php
similarity index 99%
rename from wx/ContentAsyncCheck.php
rename to wchat/wx/ContentAsyncCheck.php
index 2584599..db02aa3 100644
--- a/wx/ContentAsyncCheck.php
+++ b/wchat/wx/ContentAsyncCheck.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace wchat;
+namespace wchat\wx;
 
 
 /**
diff --git a/wx/Message.php b/wchat/wx/Message.php
similarity index 98%
rename from wx/Message.php
rename to wchat/wx/Message.php
index 1ce6c6c..55eba9a 100644
--- a/wx/Message.php
+++ b/wchat/wx/Message.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace wchat;
+namespace wchat\wx;
 
-use common\HttpClient;
-use common\Result;
+use wchat\common\HttpClient;
+use wchat\common\Result;
 class Message extends SmallProgram
 {
 	const TEXT = 0;
diff --git a/wx/Notify.php b/wchat/wx/Notify.php
similarity index 99%
rename from wx/Notify.php
rename to wchat/wx/Notify.php
index de12600..c422925 100644
--- a/wx/Notify.php
+++ b/wchat/wx/Notify.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace wchat;
+namespace wchat\wx;
 
 
 class Notify extends SmallProgram
diff --git a/wx/PublicTemplate.php b/wchat/wx/PublicTemplate.php
similarity index 98%
rename from wx/PublicTemplate.php
rename to wchat/wx/PublicTemplate.php
index a7f009a..3151520 100644
--- a/wx/PublicTemplate.php
+++ b/wchat/wx/PublicTemplate.php
@@ -6,9 +6,9 @@
  * Time: 9:49
  */
 
-namespace wchat;
+namespace wchat\wx;
 
-use common\Result;
+use wchat\common\Result;
 
 class PublicTemplate extends SmallProgram
 {
diff --git a/wx/Recharge.php b/wchat/wx/Recharge.php
similarity index 97%
rename from wx/Recharge.php
rename to wchat/wx/Recharge.php
index 294650c..b7d3418 100644
--- a/wx/Recharge.php
+++ b/wchat/wx/Recharge.php
@@ -6,11 +6,11 @@
  * Time: 10:22
  */
 
-namespace wchat;
+namespace wchat\wx;
 
-use common\HttpClient;
-use common\Result;
-use common\Help;
+use wchat\common\HttpClient;
+use wchat\common\Result;
+use wchat\common\Help;
 
 class Recharge extends SmallProgram
 {
diff --git a/wx/SecCheck.php b/wchat/wx/SecCheck.php
similarity index 97%
rename from wx/SecCheck.php
rename to wchat/wx/SecCheck.php
index 6f7b63e..6c8fe3f 100644
--- a/wx/SecCheck.php
+++ b/wchat/wx/SecCheck.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace wchat;
+namespace wchat\wx;
 
 
-use common\Result;
+use wchat\common\Result;
 
 /**
  * Class SecCheck
diff --git a/wx/SmallProgram.php b/wchat/wx/SmallProgram.php
similarity index 92%
rename from wx/SmallProgram.php
rename to wchat/wx/SmallProgram.php
index 3819b33..d055dc5 100644
--- a/wx/SmallProgram.php
+++ b/wchat/wx/SmallProgram.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace wchat;
+namespace wchat\wx;
 
 
-use common\Miniprogarampage;
+use wchat\common\Miniprogarampage;
 
 class SmallProgram extends Miniprogarampage
 {
diff --git a/wx/Subject.php b/wchat/wx/Subject.php
similarity index 98%
rename from wx/Subject.php
rename to wchat/wx/Subject.php
index 98e203d..3398341 100644
--- a/wx/Subject.php
+++ b/wchat/wx/Subject.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace wchat;
+namespace wchat\wx;
 
 
-use common\Result;
+use wchat\common\Result;
 
 class Subject extends SmallProgram
 {
diff --git a/wx/Template.php b/wchat/wx/Template.php
similarity index 98%
rename from wx/Template.php
rename to wchat/wx/Template.php
index bca46b0..3ea3cf2 100644
--- a/wx/Template.php
+++ b/wchat/wx/Template.php
@@ -6,9 +6,9 @@
  * Time: 9:49
  */
 
-namespace wchat;
+namespace wchat\wx;
 
-use common\Result;
+use wchat\common\Result;
 
 class Template extends SmallProgram
 {
diff --git a/wx/Token.php b/wchat/wx/Token.php
similarity index 71%
rename from wx/Token.php
rename to wchat/wx/Token.php
index 99a206d..c98999b 100644
--- a/wx/Token.php
+++ b/wchat/wx/Token.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace wchat;
+namespace wchat\wx;
 
 
 class Token extends SmallProgram