fyy

app/Http/Controllers/Api/LoginController.php

@@ -26,9 +26,6 @@ class LoginController extends BaseController
         list($bool, $return) = $result;
         if(! $bool) return $this->json_return(201,'',$return);
 
-        //账套信息
-        $this->setSqlServer($request->all(), $return['id']);
-
         //生成token
         $jwtToken = TokenService::getToken($return['id']);
         $jwtToken = self::PERSONAL_COMPUTER . $jwtToken;
@@ -44,9 +41,6 @@ class LoginController extends BaseController
         list($bool, $return) = $result;
         if(! $bool) return $this->json_return(201,'',$return);
 
-        //账套信息
-        $this->setSqlServer($request->all(), $return['id']);
-
         //生成token
         $jwtToken = TokenService::getToken($return['id']);
         $jwtToken = self::MOBILE . $jwtToken;

app/Http/Controllers/Api/ScreenController.php

@@ -256,7 +256,7 @@ class ScreenController extends BaseController
         $end_week = $previousWeekEndDate->toDateString();
         $last_week_key = $start_week . $end_week;
         list($status, $return_last_week) = $this->getRedisData($last_week_key);
-        if(! $status){dump(1);
+        if(! $status){
             $previousWeekStartTimeStamp = $previousWeekStartDate->timestamp * 1000;
             $previousWeekEndTimeStamp = $previousWeekEndDate->timestamp * 1000;
             //获取上周数据
@@ -282,7 +282,7 @@ class ScreenController extends BaseController
         $end_month = $previousMonthEndDate->toDateString();
         $last_month_key = $start_month . $end_month;
         list($status, $return_last_month) = $this->getRedisData($last_month_key);
-        if(! $status){dump(2);
+        if(! $status){
             $previousMonthStartTimeStamp = $previousMonthStartDate->timestamp * 1000;
             $previousMonthEndTimeStamp = $previousMonthEndDate->timestamp * 1000;
             //获取上月数据

app/Service/FyySqlServerService.php

@@ -45,7 +45,12 @@ class FyySqlServerService extends Service
         $this->sUserID = $emp->sqlserver_account ?? '';
         $this->sPassword = $emp->sqlserver_password ?? '';
 
-        //缓存数据提取  主要是账套
+        //账套
+        $zt = Request()->header('zt');
+        $this->database = $this->database_select[$zt] ?? '';
+        $this->sAccID = '(default)@' . $zt;
+
+        //之前测试留下的入口  现在没用
         $key = 'fyy_sql_server' . $user_id;
         $fyy_array = Redis::get($key);
         if(! empty($fyy_array)) {
@@ -59,6 +64,7 @@ class FyySqlServerService extends Service
             if(! empty($fyy_array['sqlserver_password'])) $this->sPassword = $fyy_array['sqlserver_password'];
         }
         $this->url = $this->host_api . "/U8Sys/U8API";
+        //----------
 
         if(! $this->db){
             $config = [

config/database.php

@@ -1,7 +1,11 @@
 <?php
 
 use Illuminate\Support\Str;
-
+//账套
+$zt = Request()->header('zt');
+$mysql = "mysql";//默认
+if($zt === '001') $mysql = "mysql_001";
+if($zt === '002') $mysql = "mysql_002";
 return [
 
     /*
@@ -15,7 +19,8 @@ return [
     |
     */
 
-    'default' => env('DB_CONNECTION', 'mysql'),
+//    'default' => env('DB_CONNECTION', 'mysql'),
+    'default' => $mysql,
 
     /*
     |--------------------------------------------------------------------------
@@ -34,7 +39,6 @@ return [
     */
 
     'connections' => [
-
         'sqlite' => [
             'driver' => 'sqlite',
             'url' => env('DATABASE_URL'),
@@ -42,7 +46,6 @@ return [
             'prefix' => '',
             'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
         ],
-
         'mysql' => [
             'driver' => 'mysql',
             'url' => env('DATABASE_URL'),
@@ -62,7 +65,44 @@ return [
                 PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
             ]) : [],
         ],
-
+        'mysql_001' => [
+            'driver' => 'mysql',
+            'url' => env('DATABASE_URL'),
+            'host' => env('DB_HOST', '127.0.0.1'),
+            'port' => env('DB_PORT', '3306'),
+            'database' => env('DB_DATABASE_001', 'forge'),
+            'username' => env('DB_USERNAME', 'forge'),
+            'password' => env('DB_PASSWORD', ''),
+            'unix_socket' => env('DB_SOCKET', ''),
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix' => '',
+            'prefix_indexes' => true,
+            'strict' => false,
+            'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
+        ],
+        'mysql_002' => [
+            'driver' => 'mysql',
+            'url' => env('DATABASE_URL'),
+            'host' => env('DB_HOST', '127.0.0.1'),
+            'port' => env('DB_PORT', '3306'),
+            'database' => env('DB_DATABASE_002', 'forge'),
+            'username' => env('DB_USERNAME', 'forge'),
+            'password' => env('DB_PASSWORD', ''),
+            'unix_socket' => env('DB_SOCKET', ''),
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix' => '',
+            'prefix_indexes' => true,
+            'strict' => false,
+            'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
+        ],
         'pgsql' => [
             'driver' => 'pgsql',
             'url' => env('DATABASE_URL'),
@@ -77,7 +117,6 @@ return [
             'schema' => 'public',
             'sslmode' => 'prefer',
         ],
-
         'sqlsrv' => [
             'driver' => 'sqlsrv',
             'url' => env('DATABASE_URL'),
@@ -98,7 +137,6 @@ return [
             'username' => env('SQLSRV_USERNAME'),
             'password' => env('SQLSRV_PASSWORD'),
         ],
-
     ],
 
     /*