Skip to content

CnChunfeng / scm_wms_outstore_api

Go to a project
Commit b7d27cdf by Joneq
Options

增加注释

parent 9edea337
Expand all
Inline Side-by-side
Showing with 167 additions and 9 deletions
.DS_Store 0 → 100644
No preview for this file type
.idea/liexin_api_initial.iml
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/pagination" /> <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/pagination" />
<excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/pipeline" /> <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/pipeline" />
<excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/queue" /> <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/session" />
<excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/support" /> <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/support" />
<excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/translation" /> <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/translation" />
...@@ -50,6 +51,7 @@ ...@@ -50,6 +51,7 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-token-stream" /> <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" />
<excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit-mock-objects" /> <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/psr/log" />
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" /> <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" />
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/diff" /> <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/diff" />
......
.idea/php.xml
...@@ -69,6 +69,8 @@ ...@@ -69,6 +69,8 @@
<path value="$PROJECT_DIR$/vendor/monolog/monolog" /> <path value="$PROJECT_DIR$/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/vendor/composer" /> <path value="$PROJECT_DIR$/vendor/composer" />
<path value="$PROJECT_DIR$/vendor/mtdowling/cron-expression" /> <path value="$PROJECT_DIR$/vendor/mtdowling/cron-expression" />
<path value="$PROJECT_DIR$/vendor/illuminate/redis" />
<path value="$PROJECT_DIR$/vendor/predis/predis" />
</include_path> </include_path>
</component> </component>
<component name="PhpProjectSharedConfiguration" php_language_level="5.5.0" /> <component name="PhpProjectSharedConfiguration" php_language_level="5.5.0" />
......
app/Http/Controllers/Controller.php
...@@ -35,9 +35,9 @@ class Controller extends BaseController ...@@ -35,9 +35,9 @@ class Controller extends BaseController
$Domain = config('website.OUT_STORE_SERVICE_URL'); $Domain = config('website.OUT_STORE_SERVICE_URL');
$warehousing_url = $Domain . $Url; $warehousing_url = $Domain . $Url;
// $data['admin_id'] = $request->user->userId; $data['admin_id'] = $request->user->userId;
// $data['admin_name'] = $request->user->name; $data['admin_name'] = $request->user->name;
// $data['store_id'] = $request->store_id; $data['store_id'] = $request->store_id;
$response = curl($warehousing_url, $data, true); $response = curl($warehousing_url, $data, true);
return json_decode($response, true); return json_decode($response, true);
} }
......
app/Http/Controllers/OutStoreController.php
...@@ -112,7 +112,6 @@ class OutStoreController extends Controller ...@@ -112,7 +112,6 @@ class OutStoreController extends Controller
{ {
$data = $request->all(); $data = $request->all();
try{ try{
CommonLogic::checkEmpty(['box_id_arr','pallet_sn'],$data); CommonLogic::checkEmpty(['box_id_arr','pallet_sn'],$data);
$returnData = $this->curl('/out_store/palletActive',$data,$request); $returnData = $this->curl('/out_store/palletActive',$data,$request);
...@@ -135,7 +134,7 @@ class OutStoreController extends Controller ...@@ -135,7 +134,7 @@ class OutStoreController extends Controller
try{ try{
CommonLogic::checkEmpty(['pallet_box_sn'],$data); CommonLogic::checkEmpty(['pallet_box_sn'],$data);
$returnData = $this->curl('/out_store/scan_out_store_list',$data,$request); $returnData = $this->curl('/out_store/scan_out_store_list',$data,$request);
//jiagezhushi
if (isset($returnData['errcode']) && !empty($returnData['errcode'])){ if (isset($returnData['errcode']) && !empty($returnData['errcode'])){
CommonLogic::$errCode = $returnData['errcode']; CommonLogic::$errCode = $returnData['errcode'];
throw new \Exception($returnData['data']); throw new \Exception($returnData['data']);
......
bootstrap/app.php
...@@ -29,7 +29,6 @@ $app = new Laravel\Lumen\Application( ...@@ -29,7 +29,6 @@ $app = new Laravel\Lumen\Application(
$app->withFacades(); $app->withFacades();
$app->withEloquent();
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
...@@ -89,6 +88,8 @@ $app->singleton( ...@@ -89,6 +88,8 @@ $app->singleton(
// $app->register(App\Providers\AppServiceProvider::class); // $app->register(App\Providers\AppServiceProvider::class);
// $app->register(App\Providers\AuthServiceProvider::class); // $app->register(App\Providers\AuthServiceProvider::class);
// $app->register(App\Providers\EventServiceProvider::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 @@ ...@@ -7,7 +7,9 @@
"require": { "require": {
"php": ">=5.5.9", "php": ">=5.5.9",
"laravel/lumen-framework": "5.2.*", "laravel/lumen-framework": "5.2.*",
"vlucas/phpdotenv": "~2.2" "vlucas/phpdotenv": "~2.2",
"predis/predis": "^1.1",
"illuminate/redis": "5.2"
}, },
"require-dev": { "require-dev": {
"fzaninotto/faker": "~1.4", "fzaninotto/faker": "~1.4",
...@@ -29,5 +31,11 @@ ...@@ -29,5 +31,11 @@
"tests/", "tests/",
"database/" "database/"
] ]
},
"repositories": {
"packagist": {
"type": "composer",
"url": "https://mirrors.aliyun.com/composer/"
}
} }
} }
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