Skip to content

G
goods
Commit ed41140b authored by 耿鸿飞's avatar 耿鸿飞
Browse files
Options

Merge branch 'master' into 'develop' 

Master

See merge request bp/goods!2
parents 17f8f64c 3a12a297
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2372 additions and 0 deletions
.gitinore 0 → 100644
View file @ ed41140b
composer.lock
/yaconf/
.idea
.DS_Store
.project
ROOT_PATH
logs
.idea/goods.iml 0 → 100644
View file @ ed41140b
<?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 0 → 100644
View file @ ed41140b
<?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 0 → 100644
View file @ ed41140b
<?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 0 → 100644
View file @ ed41140b
<?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 0 → 100644
View file @ ed41140b
<?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 0 → 100644
View file @ ed41140b
This diff is collapsed.
ROOT_PATH/logs/daemon/GoodsToEs/GoodsToEs.log 0 → 100644
View file @ ed41140b
[26-Jun-2021 14:46:09 Asia/Shanghai] daemon:GoodsToEs 6245 [INFO]: process start now
[26-Jun-2021 14:46:09 Asia/Shanghai] daemon:GoodsToEs 6297 [INFO]: master process pid:6298
[26-Jun-2021 14:46:09 Asia/Shanghai] PHP Warning: Use of undefined constant ROOT_PATH - assumed 'ROOT_PATH' (this will throw an Error in a future version of PHP) in /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php on line 139
[26-Jun-2021 14:46:09 Asia/Shanghai] PHP Stack trace:
[26-Jun-2021 14:46:09 Asia/Shanghai] PHP 1. {main}() /Users/admin/works/php/goods/public/cli.php:0
[26-Jun-2021 14:46:09 Asia/Shanghai] PHP 2. Yaf\Dispatcher->dispatch($request = class Yaf\Request\Simple { public $method = ''; public $module = 'Cli'; public $controller = 'Daemon'; public $action = 'run'; public $uri:protected = ''; public $base_uri:protected = NULL; public $dispatched:protected = TRUE; public $routed:protected = TRUE; public $language:protected = ''; public $params:protected = ['t' => 'GoodsToEs'] }) /Users/admin/works/php/goods/public/cli.php:33
[26-Jun-2021 14:46:09 Asia/Shanghai] PHP 3. DaemonController->RunAction() /Users/admin/works/php/goods/public/cli.php:33
[26-Jun-2021 14:46:09 Asia/Shanghai] PHP 4. Api\PhpServices\Daemon\Daemon->start() /Users/admin/works/php/goods/application/modules/Cli/controllers/Daemon.php:52
[26-Jun-2021 14:46:09 Asia/Shanghai] PHP 5. Api\PhpServices\Daemon\Daemon->daemon() /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php:70
composer.lock 0 → 100644
View file @ ed41140b
This diff is collapsed.
deploy/deploy_configs/assemble-yidian-config.sh 0 → 100644
View file @ ed41140b
#!/usr/bin/env bash
PACKAGE_FILE_NAME="*.jar" #commit job生成的包。
HOME_DIR_INSIDE_CONTAINER="/home/services" #container中的根目录，SERVICE_DIR所在的目录
SERVICE_DIR=goods #container中服务所在的目录
LOG_DIRS="
${HOME_DIR_INSIDE_CONTAINER}/${SERVICE_DIR}/logs
" #运行时日志所在目录，会在deploy时map到宿主机的目录下去
START_SCRIPT="" #部署完后，启动服务的脚本，相对于start_env的路径。start_env最终会是HOME_DIR_INSIDE_CONTAINER
PACKAGE_FILE_PATH="start_env/${SERVICE_DIR}/bin/" #把package file拷贝到这个目录, 相对于start_env的路径。
BASE_IMAGE="docker2.yidian.com:5000/centos/compile-jdk8:20150720" #服务运行的基础镜像
#下面的选项一般不用
SYNC_DATA_OPERATIONS="
" #这里的命令是在启动docker前做的
DATA_DIRS="
" #会产生数据的一些目录，会在deploy时map到宿主机的目录下
DOCKERFILE="" #使用指定的Dockerfile, 不然用上面的配置项自动生成，一般不用
SET_KEYS="
" #每行格式id_ras.a->id_rsa.b, 可以多行，将keys目录下的id_rsa.a放到image内的/root/.ssh/id_rsa.b
deploy/deploy_configs/deploy-config.sh 0 → 100644
View file @ ed41140b
#!/usr/bin/env bash
QA_PRE_START_CMD="" #用于测试环境在START_CMDS执行之前执行，一般用来去掉服务启动时候的内存要求。
START_CMDS="cd /home/services/ && sh ${TARGET_ENV}" #进入docker container以后的服务启动命令
DOCKER_PORT_MAPS="9020:9020" #宿主机端口:container内部端口的映射关系
DOCKER_VOLUMN_MAPS="~/_logs/${COMPONENT}-${TARGET_ENV}:/home/services/goods/logs" #宿主机目录和container内部的目录映射关系
DOCKER_RUN_OPTIONS="--net=host" #docker启动时候额外的特殊的启动参数
DOCKER_PRESTOP_CMD="" #停止容器之前，执行的一些清理操作
SERVICE_PORT="9020" #服务的端口
DONT_CHECK_PORT='false' #如果服务不启动端口，那么这个设置为false
#只用于线上部署，服务降级命令（纯字符串，使用单括号），如果部署时downgrade_flag设置成true, 则在部署完成后，enable haproxy之前，在部署的container内部执行这个命令
#如果需要访问自己的某端口，使用, 代替。
DOWNGRADE_CMD=''
DEPLOY_BATCH_INTERVAL="" #只用于线上部署，每批(parallel)机器部署完以后的时间间隔
logs/daemon/GoodsToEs/GoodsToEs.log 0 → 100644
View file @ ed41140b
[26-Jun-2021 14:50:51 Asia/Shanghai] daemon:GoodsToEs 28767 [INFO]: process start now
[26-Jun-2021 14:50:51 Asia/Shanghai] daemon:GoodsToEs 28817 [INFO]: master process pid:28818
[26-Jun-2021 14:50:51 Asia/Shanghai] PHP Warning: cli_set_process_title(): cli_set_process_title had an error: Not initialized correctly in /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php on line 150
[26-Jun-2021 14:50:51 Asia/Shanghai] PHP Stack trace:
[26-Jun-2021 14:50:51 Asia/Shanghai] PHP 1. {main}() /Users/admin/works/php/goods/public/cli.php:0
[26-Jun-2021 14:50:51 Asia/Shanghai] PHP 2. Yaf\Dispatcher->dispatch($request = class Yaf\Request\Simple { public $method = ''; public $module = 'Cli'; public $controller = 'Daemon'; public $action = 'run'; public $uri:protected = ''; public $base_uri:protected = NULL; public $dispatched:protected = TRUE; public $routed:protected = TRUE; public $language:protected = ''; public $params:protected = ['t' => 'GoodsToEs'] }) /Users/admin/works/php/goods/public/cli.php:35
[26-Jun-2021 14:50:51 Asia/Shanghai] PHP 3. DaemonController->RunAction() /Users/admin/works/php/goods/public/cli.php:35
[26-Jun-2021 14:50:51 Asia/Shanghai] PHP 4. Api\PhpServices\Daemon\Daemon->start() /Users/admin/works/php/goods/application/modules/Cli/controllers/Daemon.php:52
[26-Jun-2021 14:50:51 Asia/Shanghai] PHP 5. Api\PhpServices\Daemon\Daemon->daemon() /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php:70
[26-Jun-2021 14:50:51 Asia/Shanghai] PHP 6. cli_set_process_title($title = 'GoodsToEs dev master process') /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php:150
[26-Jun-2021 14:51:05 Asia/Shanghai] daemon:GoodsToEs 30174 [INFO]: process start now
[26-Jun-2021 14:51:05 Asia/Shanghai] daemon:GoodsToEs 30214 [INFO]: master process pid:30217
[26-Jun-2021 14:51:05 Asia/Shanghai] PHP Warning: cli_set_process_title(): cli_set_process_title had an error: Not initialized correctly in /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php on line 150
[26-Jun-2021 14:51:05 Asia/Shanghai] PHP Stack trace:
[26-Jun-2021 14:51:05 Asia/Shanghai] PHP 1. {main}() /Users/admin/works/php/goods/public/cli.php:0
[26-Jun-2021 14:51:05 Asia/Shanghai] PHP 2. Yaf\Dispatcher->dispatch($request = class Yaf\Request\Simple { public $method = ''; public $module = 'Cli'; public $controller = 'Daemon'; public $action = 'run'; public $uri:protected = ''; public $base_uri:protected = NULL; public $dispatched:protected = TRUE; public $routed:protected = TRUE; public $language:protected = ''; public $params:protected = ['t' => 'GoodsToEs'] }) /Users/admin/works/php/goods/public/cli.php:35
[26-Jun-2021 14:51:05 Asia/Shanghai] PHP 3. DaemonController->RunAction() /Users/admin/works/php/goods/public/cli.php:35
[26-Jun-2021 14:51:05 Asia/Shanghai] PHP 4. Api\PhpServices\Daemon\Daemon->start() /Users/admin/works/php/goods/application/modules/Cli/controllers/Daemon.php:52
[26-Jun-2021 14:51:05 Asia/Shanghai] PHP 5. Api\PhpServices\Daemon\Daemon->daemon() /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php:70
[26-Jun-2021 14:51:05 Asia/Shanghai] PHP 6. cli_set_process_title($title = 'GoodsToEs dev master process') /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php:150
[26-Jun-2021 14:55:24 Asia/Shanghai] daemon:GoodsToEs 55063 [INFO]: process start now
[26-Jun-2021 14:55:24 Asia/Shanghai] daemon:GoodsToEs 55120 [INFO]: master process pid:55122
[26-Jun-2021 14:55:24 Asia/Shanghai] PHP Warning: cli_set_process_title(): cli_set_process_title had an error: Not initialized correctly in /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php on line 150
[26-Jun-2021 14:55:24 Asia/Shanghai] PHP Stack trace:
[26-Jun-2021 14:55:24 Asia/Shanghai] PHP 1. {main}() /Users/admin/works/php/goods/public/cli.php:0
[26-Jun-2021 14:55:24 Asia/Shanghai] PHP 2. Yaf\Dispatcher->dispatch($request = class Yaf\Request\Simple { public $method = ''; public $module = 'Cli'; public $controller = 'Daemon'; public $action = 'run'; public $uri:protected = ''; public $base_uri:protected = NULL; public $dispatched:protected = TRUE; public $routed:protected = TRUE; public $language:protected = ''; public $params:protected = ['t' => 'GoodsToEs'] }) /Users/admin/works/php/goods/public/cli.php:35
[26-Jun-2021 14:55:24 Asia/Shanghai] PHP 3. DaemonController->RunAction() /Users/admin/works/php/goods/public/cli.php:35
[26-Jun-2021 14:55:24 Asia/Shanghai] PHP 4. Api\PhpServices\Daemon\Daemon->start() /Users/admin/works/php/goods/application/modules/Cli/controllers/Daemon.php:52
[26-Jun-2021 14:55:24 Asia/Shanghai] PHP 5. Api\PhpServices\Daemon\Daemon->daemon() /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php:70
[26-Jun-2021 14:55:24 Asia/Shanghai] PHP 6. cli_set_process_title($title = 'GoodsToEs dev master process') /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php:150
[26-Jun-2021 14:55:43 Asia/Shanghai] daemon:GoodsToEs 57036 [INFO]: process start now
[26-Jun-2021 14:55:43 Asia/Shanghai] daemon:GoodsToEs 57081 [INFO]: master process pid:57083
[26-Jun-2021 14:55:43 Asia/Shanghai] PHP Warning: cli_set_process_title(): cli_set_process_title had an error: Not initialized correctly in /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php on line 150
[26-Jun-2021 14:55:43 Asia/Shanghai] PHP Stack trace:
[26-Jun-2021 14:55:43 Asia/Shanghai] PHP 1. {main}() /Users/admin/works/php/goods/public/cli.php:0
[26-Jun-2021 14:55:43 Asia/Shanghai] PHP 2. Yaf\Dispatcher->dispatch($request = class Yaf\Request\Simple { public $method = ''; public $module = 'Cli'; public $controller = 'Daemon'; public $action = 'run'; public $uri:protected = ''; public $base_uri:protected = NULL; public $dispatched:protected = TRUE; public $routed:protected = TRUE; public $language:protected = ''; public $params:protected = ['t' => 'GoodsToEs'] }) /Users/admin/works/php/goods/public/cli.php:35
[26-Jun-2021 14:55:43 Asia/Shanghai] PHP 3. DaemonController->RunAction() /Users/admin/works/php/goods/public/cli.php:35
[26-Jun-2021 14:55:43 Asia/Shanghai] PHP 4. Api\PhpServices\Daemon\Daemon->start() /Users/admin/works/php/goods/application/modules/Cli/controllers/Daemon.php:52
[26-Jun-2021 14:55:43 Asia/Shanghai] PHP 5. Api\PhpServices\Daemon\Daemon->daemon() /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php:70
[26-Jun-2021 14:55:43 Asia/Shanghai] PHP 6. cli_set_process_title($title = 'GoodsToEs dev master process') /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php:150
[26-Jun-2021 14:56:16 Asia/Shanghai] daemon:goodsToEs 60294 [INFO]: process start now
[26-Jun-2021 14:56:16 Asia/Shanghai] daemon:goodsToEs 60334 [INFO]: master process pid:60335
[26-Jun-2021 14:56:16 Asia/Shanghai] PHP Warning: cli_set_process_title(): cli_set_process_title had an error: Not initialized correctly in /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php on line 150
[26-Jun-2021 14:56:16 Asia/Shanghai] PHP Stack trace:
[26-Jun-2021 14:56:16 Asia/Shanghai] PHP 1. {main}() /Users/admin/works/php/goods/public/cli.php:0
[26-Jun-2021 14:56:16 Asia/Shanghai] PHP 2. Yaf\Dispatcher->dispatch($request = class Yaf\Request\Simple { public $method = ''; public $module = 'Cli'; public $controller = 'Daemon'; public $action = 'run'; public $uri:protected = ''; public $base_uri:protected = NULL; public $dispatched:protected = TRUE; public $routed:protected = TRUE; public $language:protected = ''; public $params:protected = ['t' => 'goodsToEs'] }) /Users/admin/works/php/goods/public/cli.php:35
[26-Jun-2021 14:56:16 Asia/Shanghai] PHP 3. DaemonController->RunAction() /Users/admin/works/php/goods/public/cli.php:35
[26-Jun-2021 14:56:16 Asia/Shanghai] PHP 4. Api\PhpServices\Daemon\Daemon->start() /Users/admin/works/php/goods/application/modules/Cli/controllers/Daemon.php:52
[26-Jun-2021 14:56:16 Asia/Shanghai] PHP 5. Api\PhpServices\Daemon\Daemon->daemon() /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php:70
[26-Jun-2021 14:56:16 Asia/Shanghai] PHP 6. cli_set_process_title($title = 'goodsToEs dev master process') /Users/admin/works/php/goods/vendor/api/php_services/src/Daemon/Daemon.php:150
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