gx

@@ -575,13 +575,13 @@ class ProjectLogic extends BaseLogic
     }
     }
 
 
     //复制数据库
     //复制数据库
-    public function copyMysql($new_project_id){
+    public function copyMysql($project_id,$new_project_id){
         //切换数据库配置
         //切换数据库配置
         ProjectServer::useProject($new_project_id);
         ProjectServer::useProject($new_project_id);
         //创建数据库
         //创建数据库
         ProjectServer::createDatabase($new_project_id);
         ProjectServer::createDatabase($new_project_id);
         //创建表
         //创建表
-        $this->initTable();
+        $this->initTable($project_id,$new_project_id);
         //初始数据
         //初始数据
         ProjectServer::saveInitParam($new_project_id);
         ProjectServer::saveInitParam($new_project_id);
     }
     }
@@ -595,22 +595,21 @@ class ProjectLogic extends BaseLogic
      */
      */
     public  function initTable($project_id,$news_project_id)
     public  function initTable($project_id,$news_project_id)
     {
     {
-        config(['database.connections.custom_tmp_mysql.database' => 'gl_data_'.$project_id]);
-        $database_name = DB::connection('custom_tmp_mysql')->getDatabaseName();
-        $table = Schema::connection('custom_tmp_mysql')->getAllTables();
+        config(['database.connections.custom_tmp_mysql_copy.database' => 'gl_data_'.$project_id]);
+        $database_name = DB::connection('custom_tmp_mysql_copy')->getDatabaseName();
+        $table = Schema::connection('custom_tmp_mysql_copy')->getAllTables();
         $table = array_column($table, 'Tables_in_' . $database_name);
         $table = array_column($table, 'Tables_in_' . $database_name);
         foreach ($table as $v) {
         foreach ($table as $v) {
             $has_table = Schema::connection('custom_mysql')->hasTable($v);
             $has_table = Schema::connection('custom_mysql')->hasTable($v);
             if ($has_table) {
             if ($has_table) {
                 continue;
                 continue;
             }
             }
-            $sql = DB::connection('custom_tmp_mysql')->select("SHOW CREATE TABLE {$v}");
+            $sql = DB::connection('custom_tmp_mysql_copy')->select("SHOW CREATE TABLE {$v}");
             DB::connection('custom_mysql')->statement(get_object_vars($sql[0])['Create Table']);
             DB::connection('custom_mysql')->statement(get_object_vars($sql[0])['Create Table']);
             Schema::table($v, function ($v) use ($news_project_id) {
             Schema::table($v, function ($v) use ($news_project_id) {
                 $v->update(['project_id' => $news_project_id]);
                 $v->update(['project_id' => $news_project_id]);
             });
             });
         }
         }
-        config(['database.connections.custom_tmp_mysql.database' => 'gl_data_tmp']);
         return true;
         return true;
     }
     }
 
 

@@ -83,6 +83,26 @@ return [
             ]) : [],
             ]) : [],
         ],
         ],
 
 
+        'custom_tmp_mysql_copy' => [
+            'driver' => 'mysql',
+            'url' => env('DATABASE_URL'),
+            'host' => env('DB_HOST', '127.0.0.1'),
+            'port' => env('DB_PORT', '3306'),
+            'database' => env('DB_DATABASE_TMP', ''),
+            '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' => true,
+            'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
+        ],
+
         'custom_mysql' => [
         'custom_mysql' => [
             'driver' => 'mysql',
             'driver' => 'mysql',
             'url' => '', // DB_DATABASE_URL
             'url' => '', // DB_DATABASE_URL