Skip to content

CnChunfeng / scm_wms_outstore_api

Go to a project
Commit b7d27cdf by Joneq
Options

增加注释

parent 9edea337
Inline Side-by-side
Showing with 317 additions and 50 deletions
.DS_Store 0 → 100644
No preview for this file type
.idea/liexin_api_initial.iml
......@@ -27,6 +27,7 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/pagination" />
<excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/pipeline" />
<excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/queue" />
<excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/redis" />
<excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/session" />
<excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/support" />
<excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/translation" />
......@@ -50,6 +51,7 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-token-stream" />
<excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit" />
<excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit-mock-objects" />
<excludeFolder url="file://$MODULE_DIR$/vendor/predis/predis" />
<excludeFolder url="file://$MODULE_DIR$/vendor/psr/log" />
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" />
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/diff" />
......
.idea/php.xml
......@@ -69,6 +69,8 @@
<path value="$PROJECT_DIR$/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/vendor/composer" />
<path value="$PROJECT_DIR$/vendor/mtdowling/cron-expression" />
<path value="$PROJECT_DIR$/vendor/illuminate/redis" />
<path value="$PROJECT_DIR$/vendor/predis/predis" />
</include_path>
</component>
<component name="PhpProjectSharedConfiguration" php_language_level="5.5.0" />
......
app/Http/Controllers/Controller.php
......@@ -35,9 +35,9 @@ class Controller extends BaseController
$Domain = config('website.OUT_STORE_SERVICE_URL');
$warehousing_url = $Domain . $Url;
// $data['admin_id'] = $request->user->userId;
// $data['admin_name'] = $request->user->name;
// $data['store_id'] = $request->store_id;
$data['admin_id'] = $request->user->userId;
$data['admin_name'] = $request->user->name;
$data['store_id'] = $request->store_id;
$response = curl($warehousing_url, $data, true);
return json_decode($response, true);
}
......
app/Http/Controllers/OutStoreController.php
......@@ -112,7 +112,6 @@ class OutStoreController extends Controller
{
$data = $request->all();
try{
CommonLogic::checkEmpty(['box_id_arr','pallet_sn'],$data);
$returnData = $this->curl('/out_store/palletActive',$data,$request);
......@@ -135,7 +134,7 @@ class OutStoreController extends Controller
try{
CommonLogic::checkEmpty(['pallet_box_sn'],$data);
$returnData = $this->curl('/out_store/scan_out_store_list',$data,$request);
//jiagezhushi
if (isset($returnData['errcode']) && !empty($returnData['errcode'])){
CommonLogic::$errCode = $returnData['errcode'];
throw new \Exception($returnData['data']);
......
bootstrap/app.php
......@@ -29,7 +29,6 @@ $app = new Laravel\Lumen\Application(
$app->withFacades();
$app->withEloquent();
/*
|--------------------------------------------------------------------------
......@@ -89,6 +88,8 @@ $app->singleton(
// $app->register(App\Providers\AppServiceProvider::class);
// $app->register(App\Providers\AuthServiceProvider::class);
// $app->register(App\Providers\EventServiceProvider::class);
$app->register(Illuminate\Redis\RedisServiceProvider::class);
$app->withEloquent();
/*
|--------------------------------------------------------------------------
......
common @ a2ccb5e4
Subproject commit 12225c4c5e9df543c24b66c1de8d26f59fac33d8
Subproject commit a2ccb5e4c01af94885bf8280f5e69802a0070150
composer.json
......@@ -7,7 +7,9 @@
"require": {
"php": ">=5.5.9",
"laravel/lumen-framework": "5.2.*",
"vlucas/phpdotenv": "~2.2"
"vlucas/phpdotenv": "~2.2",
"predis/predis": "^1.1",
"illuminate/redis": "5.2"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
......@@ -29,5 +31,11 @@
"tests/",
"database/"
]
},
"repositories": {
"packagist": {
"type": "composer",
"url": "https://mirrors.aliyun.com/composer/"
}
}
}
composer.lock
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "be56596918ef42a15b75d881aaedbd55",
"content-hash": "eced544e944ceece83a8ff108ae14be3",
"packages": [
{
"name": "doctrine/inflector",
......@@ -993,6 +993,57 @@
"time": "2016-08-01T13:49:14+00:00"
},
{
"name": "illuminate/redis",
"version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/redis.git",
"reference": "d0762e064fa46cf8620168dabcdc35d4dbf84c84"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/redis/zipball/d0762e064fa46cf8620168dabcdc35d4dbf84c84",
"reference": "d0762e064fa46cf8620168dabcdc35d4dbf84c84",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
},
"require": {
"illuminate/contracts": "5.2.*",
"illuminate/support": "5.2.*",
"php": ">=5.5.9",
"predis/predis": "~1.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.2-dev"
}
},
"autoload": {
"psr-4": {
"Illuminate\\Redis\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Taylor Otwell",
"email": "taylorotwell@gmail.com"
}
],
"description": "The Illuminate Redis package.",
"homepage": "http://laravel.com",
"time": "2015-06-22T20:36:58+00:00"
},
{
"name": "illuminate/session",
"version": "v5.2.45",
"source": {
......@@ -1721,6 +1772,62 @@
"time": "2018-04-04T21:48:54+00:00"
},
{
"name": "predis/predis",
"version": "v1.1.1",
"source": {
"type": "git",
"url": "https://github.com/nrk/predis.git",
"reference": "f0210e38881631afeafb56ab43405a92cafd9fd1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nrk/predis/zipball/f0210e38881631afeafb56ab43405a92cafd9fd1",
"reference": "f0210e38881631afeafb56ab43405a92cafd9fd1",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
"phpunit/phpunit": "~4.8"
},
"suggest": {
"ext-curl": "Allows access to Webdis when paired with phpiredis",
"ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol"
},
"type": "library",
"autoload": {
"psr-4": {
"Predis\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Daniele Alessandri",
"email": "suppakilla@gmail.com",
"homepage": "http://clorophilla.net"
}
],
"description": "Flexible and feature-complete Redis client for PHP and HHVM",
"homepage": "http://github.com/nrk/predis",
"keywords": [
"nosql",
"predis",
"redis"
],
"time": "2016-06-16T16:22:20+00:00"
},
{
"name": "psr/log",
"version": "1.1.3",
"source": {
......@@ -1904,7 +2011,7 @@
},
{
"name": "symfony/event-dispatcher",
"version": "v3.4.39",
"version": "v3.4.40",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
......@@ -2175,16 +2282,16 @@
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.15.0",
"version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14"
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
"reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"shasum": "",
"mirrors": [
{
......@@ -2202,7 +2309,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.15-dev"
"dev-master": "1.17-dev"
}
},
"autoload": {
......@@ -2235,20 +2342,20 @@
"polyfill",
"portable"
],
"time": "2020-02-27T09:26:54+00:00"
"time": "2020-05-12T16:14:59+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.15.0",
"version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac"
"reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
"reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
"reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
"shasum": "",
"mirrors": [
{
......@@ -2266,7 +2373,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.15-dev"
"dev-master": "1.17-dev"
}
},
"autoload": {
......@@ -2300,20 +2407,20 @@
"portable",
"shim"
],
"time": "2020-03-09T19:04:49+00:00"
"time": "2020-05-12T16:47:27+00:00"
},
{
"name": "symfony/polyfill-php56",
"version": "v1.15.0",
"version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php56.git",
"reference": "d51ec491c8ddceae7dca8dd6c7e30428f543f37d"
"reference": "e3c8c138280cdfe4b81488441555583aa1984e23"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/d51ec491c8ddceae7dca8dd6c7e30428f543f37d",
"reference": "d51ec491c8ddceae7dca8dd6c7e30428f543f37d",
"url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e3c8c138280cdfe4b81488441555583aa1984e23",
"reference": "e3c8c138280cdfe4b81488441555583aa1984e23",
"shasum": "",
"mirrors": [
{
......@@ -2329,7 +2436,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.15-dev"
"dev-master": "1.17-dev"
}
},
"autoload": {
......@@ -2362,20 +2469,20 @@
"portable",
"shim"
],
"time": "2020-03-09T19:04:49+00:00"
"time": "2020-05-12T16:47:27+00:00"
},
{
"name": "symfony/polyfill-util",
"version": "v1.15.0",
"version": "v1.17.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-util.git",
"reference": "d8e76c104127675d0ea3df3be0f2ae24a8619027"
"reference": "4afb4110fc037752cf0ce9869f9ab8162c4e20d7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-util/zipball/d8e76c104127675d0ea3df3be0f2ae24a8619027",
"reference": "d8e76c104127675d0ea3df3be0f2ae24a8619027",
"url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4afb4110fc037752cf0ce9869f9ab8162c4e20d7",
"reference": "4afb4110fc037752cf0ce9869f9ab8162c4e20d7",
"shasum": "",
"mirrors": [
{
......@@ -2390,7 +2497,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.15-dev"
"dev-master": "1.17-dev"
}
},
"autoload": {
......@@ -2420,7 +2527,7 @@
"polyfill",
"shim"
],
"time": "2020-03-02T11:55:35+00:00"
"time": "2020-05-12T16:14:59+00:00"
},
{
"name": "symfony/process",
......@@ -2549,16 +2656,16 @@
},
{
"name": "vlucas/phpdotenv",
"version": "v2.6.3",
"version": "v2.6.4",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
"reference": "df4c4d08a639be4ef5d6d1322868f9e477553679"
"reference": "67d472b1794c986381a8950e4958e1adb779d561"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/df4c4d08a639be4ef5d6d1322868f9e477553679",
"reference": "df4c4d08a639be4ef5d6d1322868f9e477553679",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/67d472b1794c986381a8950e4958e1adb779d561",
"reference": "67d472b1794c986381a8950e4958e1adb779d561",
"shasum": "",
"mirrors": [
{
......@@ -2568,7 +2675,7 @@
]
},
"require": {
"php": ">=5.3.9",
"php": "^5.3.9 || ^7.0 || ^8.0",
"symfony/polyfill-ctype": "^1.9"
},
"require-dev": {
......@@ -2597,9 +2704,14 @@
],
"authors": [
{
"name": "Graham Campbell",
"email": "graham@alt-three.com",
"homepage": "https://gjcampbell.co.uk/"
},
{
"name": "Vance Lucas",
"email": "vance@vancelucas.com",
"homepage": "http://www.vancelucas.com"
"homepage": "https://vancelucas.com/"
}
],
"description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
......@@ -2608,7 +2720,7 @@
"env",
"environment"
],
"time": "2020-04-12T15:11:38+00:00"
"time": "2020-05-02T13:38:00+00:00"
}
],
"packages-dev": [
......@@ -2732,16 +2844,16 @@
},
{
"name": "phpdocumentor/reflection-common",
"version": "2.0.0",
"version": "2.1.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionCommon.git",
"reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a"
"reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a",
"reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
"reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
"shasum": "",
"mirrors": [
{
......@@ -2753,9 +2865,6 @@
"require": {
"php": ">=7.1"
},
"require-dev": {
"phpunit/phpunit": "~6"
},
"type": "library",
"extra": {
"branch-alias": {
......@@ -2786,7 +2895,7 @@
"reflection",
"static analysis"
],
"time": "2018-08-07T13:53:10+00:00"
"time": "2020-04-27T09:25:28+00:00"
},
{
"name": "phpdocumentor/reflection-docblock",
......
config/.DS_Store 0 → 100644
No preview for this file type
config/database.php 0 → 100644
<?php
return [
/*
|--------------------------------------------------------------------------
| PDO Fetch Style
|--------------------------------------------------------------------------
|
| By default, database results will be returned as instances of the PHP
| stdClass object; however, you may desire to retrieve records in an
| array format for simplicity. Here you can tweak the fetch style.
|
*/
'fetch' => PDO::FETCH_ASSOC,
/*
|--------------------------------------------------------------------------
| Default Database Connection Name
|--------------------------------------------------------------------------
|
| Here you may specify which of the database connections below you wish
| to use as your default connection for all database work. Of course
| you may use many connections at once using the Database library.
|
*/
'default' => env('DB_CONNECTION', 'mysql'),
/*
|--------------------------------------------------------------------------
| Database Connections
|--------------------------------------------------------------------------
|
| Here are each of the database connections setup for your application.
| Of course, examples of configuring each database platform that is
| supported by Laravel is shown below to make development simple.
|
|
| All database work in Laravel is done through the PHP PDO facilities
| so make sure you have the driver for your particular database of
| choice installed on your machine before you begin development.
|
*/
'connections' => [
'testing' => [
'driver' => 'sqlite',
'database' => ':memory:',
],
'sqlite' => [
'driver' => 'sqlite',
'database' => env('DB_DATABASE', base_path('database/database.sqlite')),
'prefix' => env('DB_PREFIX', ''),
],
'mysql' => [
'driver' => 'mysql',
'host' => env('DB_HOST', 'localhost'),
'port' => env('DB_PORT', 3306),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'charset' => env('DB_CHARSET', 'utf8'),
'collation' => env('DB_COLLATION', 'utf8_unicode_ci'),
'prefix' => env('DB_PREFIX', ''),
'timezone' => env('DB_TIMEZONE', '+00:00'),
'strict' => env('DB_STRICT_MODE', false),
'options' => [
// 开启持久连接
\PDO::ATTR_PERSISTENT => true,
],
],
'pgsql' => [
'driver' => 'pgsql',
'host' => env('DB_HOST', 'localhost'),
'port' => env('DB_PORT', 5432),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'charset' => env('DB_CHARSET', 'utf8'),
'prefix' => env('DB_PREFIX', ''),
'schema' => env('DB_SCHEMA', 'public'),
],
'sqlsrv' => [
'driver' => 'sqlsrv',
'host' => env('DB_HOST', 'localhost'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'charset' => env('DB_CHARSET', 'utf8'),
'prefix' => env('DB_PREFIX', ''),
],
],
/*
|--------------------------------------------------------------------------
| Migration Repository Table
|--------------------------------------------------------------------------
|
| This table keeps track of all the migrations that have already run for
| your application. Using this information, we can determine which of
| the migrations on disk haven't actually been run in the database.
|
*/
'migrations' => 'migrations',
/*
|--------------------------------------------------------------------------
| Redis Databases
|--------------------------------------------------------------------------
|
| Redis is an open source, fast, and advanced key-value store that also
| provides a richer set of commands than a typical key-value systems
| such as APC or Memcached. Laravel makes it easy to dig right in.
|
*/
'redis' => [
'cluster' => env('REDIS_CLUSTER', false),
'default' => [
'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379),
'database' => 0,
'persistent' => true, // 开启持久连接
],
'read' =>[
'host' => env('REDIS_READ_HOST', ''),
'password' => env('REDIS_READ_PASSWORD', null),
'port' => env('REDIS_READ_PORT', 6379),
'database' => 0,
'persistent' => true, // 开启持久连接
]
],
];
scm_wms_common @ b7a43f3b
Subproject commit 4f50ddcaa8aeeb37c143f31c654564b7c5b144d4
Subproject commit b7a43f3b5c302da482e01750ff029be3d00d069e
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 sign in to comment