From e66ddbd9bc1d68691427de7d84ba514f85d25044 Mon Sep 17 00:00:00 2001
From: Chaim <gc@dtapp.net>
Date: Sat, 18 Apr 2020 11:07:01 +0800
Subject: [PATCH] - edit service

---
 composer.json   |  7 ++-----
 src/helpers.php | 50 -------------------------------------------------
 tests/test.php  |  3 +--
 3 files changed, 3 insertions(+), 57 deletions(-)
 delete mode 100644 src/helpers.php

diff --git a/composer.json b/composer.json
index 3c02799..9acec00 100644
--- a/composer.json
+++ b/composer.json
@@ -32,8 +32,7 @@
   },
   "autoload": {
     "files": [
-      "src/common.php",
-      "src/helpers.php"
+      "src/common.php"
     ],
     "psr-4": {
       "DtApp\\ThinkLibrary\\": "src"
@@ -42,9 +41,7 @@
   "extra": {
     "think": {
       "services": [
-        "DtApp\\ThinkLibrary",
-        "DtApp\\ThinkLibrary\\service",
-        "DtApp\\ThinkLibrary\\service\\TimeService"
+        "DtApp\\ThinkLibrary"
       ],
       "config": {
         "dtapp": "src/config.php"
diff --git a/src/helpers.php b/src/helpers.php
deleted file mode 100644
index 754deea..0000000
--- a/src/helpers.php
+++ /dev/null
@@ -1,50 +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
-// +----------------------------------------------------------------------
-
-
-//------------------------
-// 助手函数
-//-------------------------
-
-use DtApp\ThinkLibrary\helper\Time;
-use DtApp\ThinkLibrary\Xmls;
-use think\App;
-
-if (strpos(App::VERSION, '5.1') !== false) {
-    bind('timed', Time::class);
-}
-
-if (!function_exists('xmld')) {
-    /**
-     * 获取当前XML对象实例
-     * @return Xmls|object|App
-     */
-    function xmld(): Xmls
-    {
-        return app('xmld');
-    }
-}
-
-if (!function_exists('timed')) {
-    /**
-     * 获取当前时间对象实例
-     * @return Time|object|App
-     */
-    function timed(): Time
-    {
-        return app('timed');
-    }
-}
diff --git a/tests/test.php b/tests/test.php
index 549bb7c..0703422 100644
--- a/tests/test.php
+++ b/tests/test.php
@@ -25,6 +25,5 @@ require '../vendor/autoload.php';
 
 var_dump(Time::getTime());
 
-var_dump(timed()->getTime());
-var_dump(app('timed')->getTime());
+var_dump(app()->timed->getTime());