Skip to content

G
goods
Commit 9369864e authored by luhongguang's avatar luhongguang
Browse files
Options

Merge branch 'develop' into test

parents 6a447375 2aef3345
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 312 deletions
.gitinore deleted 100644 → 0
View file @ 6a447375
composer.lock
/yaconf/
.idea
.DS_Store
.project
ROOT_PATH
logs
.idea/goods.iml deleted 100644 → 0
View file @ 6a447375
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/application/services" isTestSource="false" packagePrefix="App\Services\" />
<sourceFolder url="file://$MODULE_DIR$/daemon" isTestSource="false" packagePrefix="Daemon\" />
<sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/application/modules/Base" isTestSource="false" packagePrefix="App\Base\" />
<sourceFolder url="file://$MODULE_DIR$/application/plugins" isTestSource="false" packagePrefix="App\Plugins\" />
<sourceFolder url="file://$MODULE_DIR$/application/models" isTestSource="false" packagePrefix="App\Models\" />
<sourceFolder url="file://$MODULE_DIR$/application/exception" isTestSource="false" packagePrefix="App\Exception\" />
<excludeFolder url="file://$MODULE_DIR$/vendor/api/php_services" />
<excludeFolder url="file://$MODULE_DIR$/vendor/api/php_utils" />
<excludeFolder url="file://$MODULE_DIR$/vendor/bacon/bacon-qr-code" />
<excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/dasprid/enum" />
<excludeFolder url="file://$MODULE_DIR$/vendor/elasticsearch/elasticsearch" />
<excludeFolder url="file://$MODULE_DIR$/vendor/endroid/qr-code" />
<excludeFolder url="file://$MODULE_DIR$/vendor/ezimuel/guzzlestreams" />
<excludeFolder url="file://$MODULE_DIR$/vendor/ezimuel/ringphp" />
<excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/guzzle" />
<excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/promises" />
<excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/psr7" />
<excludeFolder url="file://$MODULE_DIR$/vendor/khanamiryan/qrcode-detector-decoder" />
<excludeFolder url="file://$MODULE_DIR$/vendor/mongodb/mongodb" />
<excludeFolder url="file://$MODULE_DIR$/vendor/myclabs/php-enum" />
<excludeFolder url="file://$MODULE_DIR$/vendor/perftools/php-profiler" />
<excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-message" />
<excludeFolder url="file://$MODULE_DIR$/vendor/psr/log" />
<excludeFolder url="file://$MODULE_DIR$/vendor/ralouphie/getallheaders" />
<excludeFolder url="file://$MODULE_DIR$/vendor/react/promise" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/deprecation-contracts" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/options-resolver" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-ctype" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-grapheme" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-intl-normalizer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php73" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php80" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/property-access" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/property-info" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/string" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
.idea/misc.xml deleted 100644 → 0
View file @ 6a447375
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
</project>
\ No newline at end of file
.idea/modules.xml deleted 100644 → 0
View file @ 6a447375
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/goods.iml" filepath="$PROJECT_DIR$/.idea/goods.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/php.xml deleted 100644 → 0
View file @ 6a447375
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PhpIncludePathManager">
<include_path>
<path value="$PROJECT_DIR$/vendor/api/php_utils" />
<path value="$PROJECT_DIR$/vendor/api/php_services" />
<path value="$PROJECT_DIR$/vendor/psr/http-message" />
<path value="$PROJECT_DIR$/vendor/psr/log" />
<path value="$PROJECT_DIR$/vendor/react/promise" />
<path value="$PROJECT_DIR$/vendor/ezimuel/guzzlestreams" />
<path value="$PROJECT_DIR$/vendor/ezimuel/ringphp" />
<path value="$PROJECT_DIR$/vendor/mongodb/mongodb" />
<path value="$PROJECT_DIR$/vendor/perftools/php-profiler" />
<path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
<path value="$PROJECT_DIR$/vendor/composer" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" />
<path value="$PROJECT_DIR$/vendor/elasticsearch/elasticsearch" />
<path value="$PROJECT_DIR$/vendor/symfony/options-resolver" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
<path value="$PROJECT_DIR$/vendor/symfony/property-access" />
<path value="$PROJECT_DIR$/vendor/symfony/string" />
<path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
<path value="$PROJECT_DIR$/vendor/symfony/property-info" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-grapheme" />
<path value="$PROJECT_DIR$/vendor/myclabs/php-enum" />
<path value="$PROJECT_DIR$/vendor/khanamiryan/qrcode-detector-decoder" />
<path value="$PROJECT_DIR$/vendor/dasprid/enum" />
<path value="$PROJECT_DIR$/vendor/endroid/qr-code" />
<path value="$PROJECT_DIR$/vendor/bacon/bacon-qr-code" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php73" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
</include_path>
</component>
<component name="PhpProjectSharedConfiguration" php_language_level="7.2" />
</project>
\ No newline at end of file
.idea/vcs.xml deleted 100644 → 0
View file @ 6a447375
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
.idea/workspace.xml deleted 100644 → 0
View file @ 6a447375
This diff is collapsed.
application/exception/ExceptionHandler.php
View file @ 9369864e
......@@ -52,8 +52,8 @@ class ExceptionHandler
$file_name = $e->getFile();
$line_num = $e->getLine();
$msg = ' file_name : ' . $file_name . ' line_num : ' . $line_num . ' message : ' . $message;
FileLog::error(get_class($e) . ' handler', $msg, $e, 'luhongguang@yidian-inc.com');
// $msg = ' file_name : ' . $file_name . ' line_num : ' . $line_num . ' message : ' . $message;
// FileLog::error(get_class($e) . ' handler', $msg, $e, 'luhongguang@yidian-inc.com');
}
if (is_string($e) || is_int($e)) {
FileLog::error('exception handler', $e);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment