wupengfei 2 years ago
parent
commit
9940f97342
2 changed files with 3 additions and 41 deletions
  1. 2 33
      .idea/workspace.xml
  2. 1 8
      application/common.php

+ 2 - 33
.idea/workspace.xml

@@ -3,38 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/container/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/container/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/container/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/container/LICENSE" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/container/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/container/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/container/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/container/composer.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/container/src/ContainerExceptionInterface.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/container/src/ContainerExceptionInterface.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/container/src/ContainerInterface.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/container/src/ContainerInterface.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/container/src/NotFoundExceptionInterface.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/container/src/NotFoundExceptionInterface.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/http-factory/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/http-factory/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/http-factory/.pullapprove.yml" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/http-factory/.pullapprove.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/http-factory/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/http-factory/LICENSE" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/http-factory/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/http-factory/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/http-factory/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/http-factory/composer.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/http-factory/src/RequestFactoryInterface.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/http-factory/src/RequestFactoryInterface.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/http-factory/src/ResponseFactoryInterface.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/http-factory/src/ResponseFactoryInterface.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/http-factory/src/ServerRequestFactoryInterface.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/http-factory/src/ServerRequestFactoryInterface.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/http-factory/src/StreamFactoryInterface.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/http-factory/src/StreamFactoryInterface.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/http-factory/src/UriFactoryInterface.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/http-factory/src/UriFactoryInterface.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/log/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/log/LICENSE" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/AbstractLogger.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/AbstractLogger.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/InvalidArgumentException.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/InvalidArgumentException.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/LogLevel.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/LogLevel.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/LoggerAwareInterface.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/LoggerAwareInterface.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/LoggerAwareTrait.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/LoggerAwareTrait.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/LoggerInterface.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/LoggerInterface.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/LoggerTrait.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/LoggerTrait.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/NullLogger.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/NullLogger.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/Test/DummyTest.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/Test/DummyTest.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/Test/TestLogger.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/log/Psr/Log/Test/TestLogger.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/log/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/log/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vendor/psr/log/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/psr/log/composer.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -287,7 +256,7 @@
       <workItem from="1678322422199" duration="23277000" />
       <workItem from="1678410737283" duration="21226000" />
       <workItem from="1678495559564" duration="25187000" />
-      <workItem from="1678668116151" duration="4901000" />
+      <workItem from="1678668116151" duration="4952000" />
     </task>
     <servers />
   </component>

+ 1 - 8
application/common.php

@@ -1,13 +1,6 @@
 <?php
 use think\Db;
-use Elastic\Elasticsearch\ClientBuilder;
-require_once '../vendor/elasticsearch/elasticsearch/src/ClientBuilder.php';
-function es()
-{
-    static $es;
-    if(!$es) $es= ClientBuilder::create()->build();
-    return $es;
-}
+
 /**
  * 秒转换为天
  */