- update facade

composer.json

@@ -41,7 +41,7 @@
   "extra": {
     "think": {
       "services": [
-        "DtApp\\ThinkLibrary"
+        "DtApp\\ThinkLibrary\\Library"
       ],
       "config": {
         "dtapp": "src/config.php"

git.sh

@@ -0,0 +1,2 @@
+git push gitee
+git push github

src/Library.php

@@ -0,0 +1,43 @@
+<?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;
+
+/**
+ * 模块注册服务
+ * Class Library
+ * @package DtApp\ThinkLibrary
+ */
+class Library extends \think\Service
+{
+    /**
+     * 注册服务
+     */
+    public function register()
+    {
+        // 加载语言包
+        $this->app->lang->load(__DIR__ . '/lang/zh-cn.php', 'zh-cn');
+        $this->app->lang->load(__DIR__ . '/lang/en-us.php', 'en-us');
+    }
+
+    /**
+     * 启动服务
+     */
+    public function boot()
+    {
+
+    }
+}

src/Service.php

@@ -1,18 +1,5 @@
 <?php
 
-// +----------------------------------------------------------------------
-// | ThinkAdmin
-// +----------------------------------------------------------------------
-// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
-// +----------------------------------------------------------------------
-// | 官方网站: https://gitee.com/zoujingli/ThinkLibrary
-// +----------------------------------------------------------------------
-// | 开源协议 ( https://mit-license.org )
-// +----------------------------------------------------------------------
-// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkLibrary
-// | github 代码仓库：https://github.com/zoujingli/ThinkLibrary
-// +----------------------------------------------------------------------
-
 // +----------------------------------------------------------------------
 // | ThinkLibrary 6.0 for ThinkPhP 6.0
 // +----------------------------------------------------------------------

src/facade/Dates.php

@@ -16,16 +16,17 @@
 
 namespace DtApp\ThinkLibrary\facade;
 
+use DtApp\ThinkLibrary\helper\Dates as helper;
 use think\Facade;
 
 /**
  * 日期门面
- * Class Date
+ * Class Dates
  * @see \DtApp\ThinkLibrary\Date
  * @package think\facade
- * @mixin \DtApp\ThinkLibrary\Date
+ * @mixin helper
  */
-class Date extends Facade
+class Dates extends Facade
 {
     /**
      * 获取当前Facade对应类名（或者已经绑定的容器对象标识）
@@ -34,6 +35,6 @@ class Date extends Facade
      */
     protected static function getFacadeClass()
     {
-        return 'DtApp\ThinkLibrary\Date';
+        return helper::class;
     }
 }

src/facade/Files.php

@@ -16,18 +16,19 @@
 
 namespace DtApp\ThinkLibrary\facade;
 
+use DtApp\ThinkLibrary\helper\Files as helper;
 use think\Facade;
 
 /**
  * 文件门面
  * Class Files
- * @see \DtApp\ThinkLibrary\Files
+ * @see \DtApp\ThinkLibrary\helper\Files
  * @package think\facade
- * @mixin \DtApp\ThinkLibrary\Files
+ * @mixin helper
  *
- * @method \DtApp\ThinkLibrary\Files delete(string $name) bool 删除文件
- * @method \DtApp\ThinkLibrary\Files deletes(string $name) bool 删除文件夹
- * @method \DtApp\ThinkLibrary\Files folderZip(string $name, string $suffix_name = '.png', string $file_name = '*') bool 把文件夹里面的文件打包成zip文件
+ * @method helper delete(string $name) bool 删除文件
+ * @method helper deletes(string $name) bool 删除文件夹
+ * @method helper folderZip(string $name, string $suffix_name = '.png', string $file_name = '*') bool 把文件夹里面的文件打包成zip文件
  */
 class Files extends Facade
 {
@@ -38,6 +39,6 @@ class Files extends Facade
      */
     protected static function getFacadeClass()
     {
-        return 'DtApp\ThinkLibrary\Files';
+        return helper::class;
     }
 }

src/facade/Ints.php

@@ -16,17 +16,18 @@
 
 namespace DtApp\ThinkLibrary\facade;
 
+use DtApp\ThinkLibrary\helper\Ints as helper;
 use think\Facade;
 
 /**
  * 数字门面
  * Class Ints
- * @see \DtApp\ThinkLibrary\Ints
+ * @see \DtApp\ThinkLibrary\helper\Ints
  * @package think\facade
- * @mixin \DtApp\ThinkLibrary\Ints
+ * @mixin helper
  *
- * @method \DtApp\ThinkLibrary\Ints isEvenNumbers(int $num) bool 判断一个数是不是偶数
- * @method \DtApp\ThinkLibrary\Ints isOddNumbers(int $num) bool 判断一个数是不是奇数
+ * @method helper isEvenNumbers(int $num) bool 判断一个数是不是偶数
+ * @method helper isOddNumbers(int $num) bool 判断一个数是不是奇数
  */
 class Ints extends Facade
 {
@@ -37,7 +38,7 @@ class Ints extends Facade
      */
     protected static function getFacadeClass()
     {
-        return 'DtApp\ThinkLibrary\Ints';
+        return helper::class;
     }
 }
 

src/facade/Preg.php

@@ -1,53 +0,0 @@
-<?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\facade;
-
-use think\facade;
-
-/**
- * 验证门面
- * Class Preg
- * @see \DtApp\ThinkLibrary\Preg
- * @package think\facade
- * @mixin \DtApp\ThinkLibrary\Preg
- *
- * @method \DtApp\ThinkLibrary\Preg isIphone($mobile) bool 验证手机号码
- * @method \DtApp\ThinkLibrary\Preg isIphoneAll($mobile) bool 严谨验证手机号码
- * @method \DtApp\ThinkLibrary\Preg isTel($tel) bool 验证电话号码
- * @method \DtApp\ThinkLibrary\Preg isIdCard($mobile) bool 验证身份证号（15位或18位数字）
- * @method \DtApp\ThinkLibrary\Preg isDigit($digit) bool 验证是否是数字(这里小数点会认为是字符)
- * @method \DtApp\ThinkLibrary\Preg isNum($num) bool 验证是否是数字(可带小数点的数字)
- * @method \DtApp\ThinkLibrary\Preg isStr($str) bool 验证由数字、26个英文字母或者下划线组成的字符串
- * @method \DtApp\ThinkLibrary\Preg isPassword($str) bool 验证用户密码(以字母开头，长度在6-18之间，只能包含字符、数字和下划线)
- * @method \DtApp\ThinkLibrary\Preg isChinese($str) bool 验证汉字
- * @method \DtApp\ThinkLibrary\Preg isEmail($email) bool 验证Email地址
- * @method \DtApp\ThinkLibrary\Preg isLink($url) bool 验证网址URL
- * @method \DtApp\ThinkLibrary\Preg isQq($qq) bool 腾讯QQ号
- * @method \DtApp\ThinkLibrary\Preg isIp($ip) bool 验证IP地址
- */
-class Preg extends Facade
-{
-    /**
-     * 获取当前Facade对应类名（或者已经绑定的容器对象标识）
-     * @access protected
-     * @return string
-     */
-    protected static function getFacadeClass()
-    {
-        return 'DtApp\ThinkLibrary\Preg';
-    }
-}

src/facade/Pregs.php

@@ -0,0 +1,54 @@
+<?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\facade;
+
+use DtApp\ThinkLibrary\helper\Pregs as helper;
+use think\facade;
+
+/**
+ * 验证门面
+ * Class Pregs
+ * @see \DtApp\ThinkLibrary\helper\Pregs
+ * @package think\facade
+ * @mixin helper
+ *
+ * @method helper isIphone($mobile) bool 验证手机号码
+ * @method helper isIphoneAll($mobile) bool 严谨验证手机号码
+ * @method helper isTel($tel) bool 验证电话号码
+ * @method helper isIdCard($mobile) bool 验证身份证号（15位或18位数字）
+ * @method helper isDigit($digit) bool 验证是否是数字(这里小数点会认为是字符)
+ * @method helper isNum($num) bool 验证是否是数字(可带小数点的数字)
+ * @method helper isStr($str) bool 验证由数字、26个英文字母或者下划线组成的字符串
+ * @method helper isPassword($str) bool 验证用户密码(以字母开头，长度在6-18之间，只能包含字符、数字和下划线)
+ * @method helper isChinese($str) bool 验证汉字
+ * @method helper isEmail($email) bool 验证Email地址
+ * @method helper isLink($url) bool 验证网址URL
+ * @method helper isQq($qq) bool 腾讯QQ号
+ * @method helper isIp($ip) bool 验证IP地址
+ */
+class Pregs extends Facade
+{
+    /**
+     * 获取当前Facade对应类名（或者已经绑定的容器对象标识）
+     * @access protected
+     * @return string
+     */
+    protected static function getFacadeClass()
+    {
+        return helper::class;
+    }
+}

src/facade/Randoms.php

@@ -16,18 +16,19 @@
 
 namespace DtApp\ThinkLibrary\facade;
 
+use DtApp\ThinkLibrary\helper\Randoms as helper;
 use think\facade;
 
 /**
  * 随机门面
- * Class Random
+ * Class Randoms
  * @see \DtApp\ThinkLibrary\Random
  * @package think\facade
- * @mixin \DtApp\ThinkLibrary\Random
+ * @mixin helper
  *
- * @method \DtApp\ThinkLibrary\Random generate(int $length = 6, int $type = 1) false|string 生成随机
+ * @method helper generate(int $length = 6, int $type = 1) false|string 生成随机
  */
-class Random extends Facade
+class Randoms extends Facade
 {
     /**
      * 获取当前Facade对应类名（或者已经绑定的容器对象标识）
@@ -36,7 +37,7 @@ class Random extends Facade
      */
     protected static function getFacadeClass()
     {
-        return 'DtApp\ThinkLibrary\Random';
+        return helper::class;
     }
 }
 

src/facade/Strings.php

@@ -16,22 +16,23 @@
 
 namespace DtApp\ThinkLibrary\facade;
 
+use DtApp\ThinkLibrary\helper\Strings as helper;
 use think\facade;
 
 /**
  * 字符串门面
- * Class Str
+ * Class Strings
  * @see \DtApp\ThinkLibrary\Str
  * @package think\facade
- * @mixin \DtApp\ThinkLibrary\Str
+ * @mixin helper
  *
- * @method \DtApp\ThinkLibrary\Str extractBefore(string $str, int $start_num, int $end_num) bool|false|string 截取字符串前面n个字符
- * @method \DtApp\ThinkLibrary\Str extractRear(string $str, int $num) false|string 截取字符串最后n个字符
- * @method \DtApp\ThinkLibrary\Str filter(string $str) string 过滤字符串
- * @method \DtApp\ThinkLibrary\Str exitContain(string $str, $nee = 3, $del = ',') bool 判断字符串是否包含某个字符
- * @method \DtApp\ThinkLibrary\Str len(string $str) int 统计字符串长度
+ * @method helper extractBefore(string $str, int $start_num, int $end_num) bool|false|string 截取字符串前面n个字符
+ * @method helper extractRear(string $str, int $num) false|string 截取字符串最后n个字符
+ * @method helper filter(string $str) string 过滤字符串
+ * @method helper exitContain(string $str, $nee = 3, $del = ',') bool 判断字符串是否包含某个字符
+ * @method helper len(string $str) int 统计字符串长度
  */
-class Str extends Facade
+class Strings extends Facade
 {
     /**
      * 获取当前Facade对应类名（或者已经绑定的容器对象标识）
@@ -40,6 +41,6 @@ class Str extends Facade
      */
     protected static function getFacadeClass()
     {
-        return 'DtApp\ThinkLibrary\Str';
+        return helper::class;
     }
 }

src/facade/Time.php

@@ -1,48 +0,0 @@
-<?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\facade;
-
-use think\Facade;
-
-/**
- * 时间门面
- * Class Time
- * @see \DtApp\ThinkLibrary\helper\Time
- * @package think\facade
- * @mixin \DtApp\ThinkLibrary\helper\Time
- *
- * @method \DtApp\ThinkLibrary\helper\Time getData(string $format = "Y-m-d H:i:s") false|string 当前时间
- * @method \DtApp\ThinkLibrary\helper\Time getTime() false|string 当前时间戳
- * @method \DtApp\ThinkLibrary\helper\Time getUDate() false|string 当前时间戳
- * @method \DtApp\ThinkLibrary\helper\Time getTimeDifference(string $end_time, string $start_time) false|string 计算两个时间差
- * @method \DtApp\ThinkLibrary\helper\Time dateToTimestamp(string $date) false|string 将指定日期转换为时间戳
- * @method \DtApp\ThinkLibrary\helper\Time dateRear(string $format = "Y-m-d H:i:s", int $mun = 10) false|string 获取某个时间之后的时间
- * @method \DtApp\ThinkLibrary\helper\Time dateBefore(string $format = "Y-m-d H:i:s", int $mun = 10) false|string 获取某个时间之前的时间
- * @method \DtApp\ThinkLibrary\helper\Time checkIsBetweenTime(string $start, string $end) bool 判断当前的时分是否在指定的时间段内
- */
-class Time extends Facade
-{
-    /**
-     * 获取当前Facade对应类名（或者已经绑定的容器对象标识）
-     * @access protected
-     * @return string
-     */
-    protected static function getFacadeClass()
-    {
-        return \DtApp\ThinkLibrary\helper\Time::class;
-    }
-}

src/facade/Times.php

@@ -0,0 +1,49 @@
+<?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\facade;
+
+use DtApp\ThinkLibrary\helper\Times as helper;
+use think\Facade;
+
+/**
+ * 时间门面
+ * Class Times
+ * @see \DtApp\ThinkLibrary\helper\Times
+ * @package think\facade
+ * @mixin helper
+ *
+ * @method helper getData(string $format = "Y-m-d H:i:s") false|string 当前时间
+ * @method helper getTime() false|string 当前时间戳
+ * @method helper getUDate() false|string 当前时间戳
+ * @method helper getTimeDifference(string $end_time, string $start_time) false|string 计算两个时间差
+ * @method helper dateToTimestamp(string $date) false|string 将指定日期转换为时间戳
+ * @method helper dateRear(string $format = "Y-m-d H:i:s", int $mun = 10) false|string 获取某个时间之后的时间
+ * @method helper dateBefore(string $format = "Y-m-d H:i:s", int $mun = 10) false|string 获取某个时间之前的时间
+ * @method helper checkIsBetweenTime(string $start, string $end) bool 判断当前的时分是否在指定的时间段内
+ */
+class Times extends Facade
+{
+    /**
+     * 获取当前Facade对应类名（或者已经绑定的容器对象标识）
+     * @access protected
+     * @return string
+     */
+    protected static function getFacadeClass()
+    {
+        return helper::class;
+    }
+}

src/facade/UnIqIds.php

@@ -16,20 +16,21 @@
 
 namespace DtApp\ThinkLibrary\facade;
 
+use DtApp\ThinkLibrary\helper\UnIqIds as helper;
 use think\Facade;
 
 /**
  * 唯一ID门面
- * Class UnIqId
+ * Class UnIqIds
  * @see \DtApp\ThinkLibrary\UnIqId
  * @package think\facade
- * @mixin \DtApp\ThinkLibrary\UnIqId
+ * @mixin helper
  *
- * @method \DtApp\ThinkLibrary\UnIqId random($size = 10, $type = 1, $prefix = '') static 获取随机字符串编码
- * @method \DtApp\ThinkLibrary\UnIqId date($size = 16, $prefix = '') static 唯一日期编码
- * @method \DtApp\ThinkLibrary\UnIqId number($size = 12, $prefix = '') static 唯一数字编码
+ * @method helper random($size = 10, $type = 1, $prefix = '') static 获取随机字符串编码
+ * @method helper date($size = 16, $prefix = '') static 唯一日期编码
+ * @method helper number($size = 12, $prefix = '') static 唯一数字编码
  */
-class UnIqId extends Facade
+class UnIqIds extends Facade
 {
     /**
      * 获取当前Facade对应类名（或者已经绑定的容器对象标识）
@@ -38,6 +39,6 @@ class UnIqId extends Facade
      */
     protected static function getFacadeClass()
     {
-        return 'DtApp\ThinkLibrary\UnIqId';
+        return helper::class;
     }
 }

src/facade/Urls.php

@@ -16,6 +16,7 @@
 
 namespace DtApp\ThinkLibrary\facade;
 
+use DtApp\ThinkLibrary\helper\Urls as helper;
 use think\Facade;
 
 /**
@@ -23,11 +24,11 @@ use think\Facade;
  * Class Urls
  * @see \DtApp\ThinkLibrary\Urls
  * @package think\facade
- * @mixin \DtApp\ThinkLibrary\Urls
+ * @mixin helper
  *
- * @method \DtApp\ThinkLibrary\Urls lenCode(string $url) static 编码
- * @method \DtApp\ThinkLibrary\Urls deCode(string $url) static 解码
- * @method \DtApp\ThinkLibrary\Urls toParams(array $data) static 格式化参数格式化成url参数
+ * @method helper lenCode(string $url) static 编码
+ * @method helper deCode(string $url) static 解码
+ * @method helper toParams(array $data) static 格式化参数格式化成url参数
  */
 class Urls extends Facade
 {
@@ -38,6 +39,6 @@ class Urls extends Facade
      */
     protected static function getFacadeClass()
     {
-        return 'DtApp\ThinkLibrary\Urls';
+        return helper::class;
     }
 }

src/facade/Xmls.php

@@ -16,16 +16,18 @@
 
 namespace DtApp\ThinkLibrary\facade;
 
+use DtApp\ThinkLibrary\helper\Xmls as helper;
 use think\Facade;
 
 /**
  * XML门面
- * @see \DtApp\ThinkLibrary\Xmls
+ * Class Xmls
+ * @see \DtApp\ThinkLibrary\helper\Xmls
  * @package think\facade
- * @mixin \DtApp\ThinkLibrary\Xmls
+ * @mixin helper
  *
- * @method \DtApp\ThinkLibrary\Xmls toXml(array $values) string 数组转换为xml
- * @method \DtApp\ThinkLibrary\Xmls toArray(string $xml) string 将XML转为array
+ * @method helper toXml(array $values) string 数组转换为xml
+ * @method helper toArray(string $xml) string 将XML转为array
  */
 class Xmls extends Facade
 {
@@ -36,6 +38,6 @@ class Xmls extends Facade
      */
     protected static function getFacadeClass()
     {
-        return 'DtApp\ThinkLibrary\Xmls';
+        return helper::class;
     }
 }

src/helper/Dates.php

@@ -14,15 +14,15 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary;
+namespace DtApp\ThinkLibrary\helper;
 
 /**
  * 日期管理类
- * Class Date
- * @mixin Date
- * @package DtApp\ThinkLibrary
+ * Class Dates
+ * @mixin Dates
+ * @package DtApp\ThinkLibrary\helper
  */
-class Date
+class Dates
 {
 
 }

src/helper/Files.php

@@ -14,7 +14,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary;
+namespace DtApp\ThinkLibrary\helper;
 
 use DtApp\ThinkLibrary\exception\DtAppException;
 use ZipArchive;
@@ -23,7 +23,7 @@ use ZipArchive;
  * 文件管理类
  * Class Files
  * @mixin Files
- * @package DtApp\ThinkLibrary
+ * @package DtApp\ThinkLibrary\helper
  */
 class Files
 {

src/helper/Ints.php

@@ -14,13 +14,13 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary;
+namespace DtApp\ThinkLibrary\helper;
 
 /**
  * 数字管理类
  * Class Ints
  * @mixin Ints
- * @package DtApp\ThinkLibrary
+ * @package DtApp\ThinkLibrary\helper
  */
 class Ints
 {

src/helper/Pregs.php

@@ -14,15 +14,15 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary;
+namespace DtApp\ThinkLibrary\helper;
 
 /**
  * 验证管理类
- * Class Preg
- * @mixin Preg
- * @package DtApp\ThinkLibrary
+ * Class Pregs
+ * @mixin Pregs
+ * @package DtApp\ThinkLibrary\helper
  */
-class Preg
+class Pregs
 {
     /**
      * 验证手机号码

src/helper/Randoms.php

@@ -14,15 +14,15 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary;
+namespace DtApp\ThinkLibrary\helper;
 
 /**
  * 随机管理类
- * Class Random
- * @mixin Random
- * @package DtApp\ThinkLibrary
+ * Class Randoms
+ * @mixin Randoms
+ * @package DtApp\ThinkLibrary\helper
  */
-class Random
+class Randoms
 {
     /**
      * 生成随机

src/helper/Strings.php

@@ -14,15 +14,15 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary;
+namespace DtApp\ThinkLibrary\helper;
 
 /**
  * 字符串管理类
- * Class Str
- * @mixin Str
- * @package DtApp\ThinkLibrary
+ * Class Strings
+ * @mixin Strings
+ * @package DtApp\ThinkLibrary\helper
  */
-class Str
+class Strings
 {
     /**
      * 截取字符串前面n个字符

src/helper/Times.php

@@ -18,11 +18,11 @@ namespace DtApp\ThinkLibrary\helper;
 
 /**
  * 时间管理类
- * Class Time
- * @mixin Time
+ * Class Times
+ * @mixin Times
  * @package DtApp\ThinkLibrary\helper
  */
-class Time
+class Times
 {
     /**
      * 当前时间

src/helper/UnIqIds.php

@@ -14,15 +14,15 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary;
+namespace DtApp\ThinkLibrary\helper;
 
 /**
  * 唯一ID管理类
- * Class UnIqId
- * @mixin UnIqId
- * @package DtApp\ThinkLibrary
+ * Class UnIqIds
+ * @mixin UnIqIds
+ * @package DtApp\ThinkLibrary\helper
  */
-class UnIqId
+class UnIqIds
 {
 
     /**

src/helper/Urls.php

@@ -14,13 +14,13 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary;
+namespace DtApp\ThinkLibrary\helper;
 
 /**
  * 网址管理类
  * Class Urls
  * @mixin Urls
- * @package DtApp\ThinkLibrary
+ * @package DtApp\ThinkLibrary\helper
  */
 class Urls
 {

src/helper/Xmls.php

@@ -14,7 +14,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-namespace DtApp\ThinkLibrary;
+namespace DtApp\ThinkLibrary\helper;
 
 use DtApp\ThinkLibrary\exception\DtAppException;
 
@@ -22,7 +22,7 @@ use DtApp\ThinkLibrary\exception\DtAppException;
  * XML管理类
  * Class Xmls
  * @mixin Xmls
- * @package DtApp\ThinkLibrary
+ * @package DtApp\ThinkLibrary\helper
  */
 class Xmls
 {

src/lang/en-us.php

@@ -0,0 +1,30 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | Library for ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: https://gitee.com/zoujingli/ThinkLibrary
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 仓库地址 ：https://gitee.com/zoujingli/ThinkLibrary
+// | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary
+// +----------------------------------------------------------------------
+
+return [
+    'think_library_not_auth'       => 'Sorry, no permission to access the operation.',
+    'think_library_not_login'      => 'Sorry, requiring login to obtain view permission.',
+    'think_library_delete_success' => 'Data deletion completed.',
+    'think_library_delete_error'   => 'Sorry, data deletion failed, please try again later.',
+    'think_library_form_success'   => 'Data saving completed.',
+    'think_library_form_error'     => 'Sorry, data saving failed, please try again later.',
+    'think_library_save_success'   => 'Data update completed.',
+    'think_library_save_error'     => 'Sorry, data update failed, please try again later.',
+    'think_library_sort_success'   => 'Modification of list sort completed.',
+    'think_library_sort_error'     => 'Sorry, modification of list sort failed, please try again later.',
+    'think_library_page_html'      => 'Total %s records, display %s per page, total %s page current display %s page.',
+    'think_library_csrf_error'     => 'Form token validation failed, please refresh and try again later.',
+    'think_library_queue_exist'    => 'Task has been created, please wait for processing to complete.',
+];

src/lang/zh-cn.php

@@ -0,0 +1,30 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | Library for ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2020 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: https://gitee.com/zoujingli/ThinkLibrary
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 仓库地址 ：https://gitee.com/zoujingli/ThinkLibrary
+// | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary
+// +----------------------------------------------------------------------
+
+return [
+    'think_library_not_auth'       => '抱歉，没有访问该操作的权限！',
+    'think_library_not_login'      => '抱歉，需要登录获取访问权限！',
+    'think_library_delete_success' => '恭喜, 数据删除成功！',
+    'think_library_delete_error'   => '抱歉，数据删除失败, 请稍候再试！',
+    'think_library_form_success'   => '恭喜, 数据保存成功！',
+    'think_library_form_error'     => '抱歉，数据保存失败, 请稍候再试！',
+    'think_library_save_success'   => '恭喜，数据更新成功！',
+    'think_library_save_error'     => '抱歉，数据更新失败, 请稍候再试！',
+    'think_library_sort_success'   => '恭喜，列表排序成功！',
+    'think_library_sort_error'     => '抱歉，列表排序失败，请稍候再试！',
+    'think_library_page_html'      => '共 %s 条记录，每页显示 %s 条，共 %s 页当前显示第 %s 页。',
+    'think_library_csrf_error'     => '表单令牌验证失败，请刷新页面再试！',
+    'think_library_queue_exist'    => '任务已创建，请等待处理完成！',
+];

tests/test.php

@@ -14,8 +14,8 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-use DtApp\ThinkLibrary\facade\Preg;
-use DtApp\ThinkLibrary\facade\Time;
+use DtApp\ThinkLibrary\facade\Pregs;
+use DtApp\ThinkLibrary\facade\Times;
 use DtApp\ThinkLibrary\service\TestService;
 
 require '../vendor/autoload.php';
@@ -23,4 +23,4 @@ require '../vendor/autoload.php';
 
 //var_dump(TestService::instance()->index());
 
-var_dump(Time::getTime());
+var_dump(Times::getTime());