From 3a5cab5f8af2557bd645ee58c8f1f5cafb8512d9 Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Tue, 24 Oct 2023 15:50:04 +0800
Subject: [PATCH] create env

---
 .env                                 | 15 +++++++++++----
 app/db/database.php                  | 21 +++++++++++++++++----
 mkt/database.php                     | 22 ++++++++++++++++++----
 wms/account_log/M0174-2023-10-24.ini |  1 +
 wms/contract/conn.php                | 22 ++++++++++++++++++----
 wms/database.php                     |  2 +-
 wms/fnh/database.php                 | 22 ++++++++++++++++++----
 7 files changed, 84 insertions(+), 21 deletions(-)

diff --git a/.env b/.env
index 7e6946fe..4b81a2cd 100644
--- a/.env
+++ b/.env
@@ -1,6 +1,13 @@
 DB_CONNECTION=mysql
-DB_HOST='db-104.coowo.com:3306'
+DB_HOST=db-104.coowo.com:3306
 DB_PORT=3306
-DB_DATABASE='appwms'
-DB_USERNAME='masadaroot'
-DB_PASSWORD='x6h5E5p#u8y'
\ No newline at end of file
+DB_DATABASE=appwms
+DB_USERNAME=masadaroot
+DB_PASSWORD=x6h5E5p#u8y
+
+# DB_CONNECTION=mysql
+# DB_HOST=localhost
+# DB_PORT=3306
+# DB_DATABASE=appwms
+# DB_USERNAME=root
+# DB_PASSWORD=
\ No newline at end of file
diff --git a/app/db/database.php b/app/db/database.php
index 77e272cf..7b16f923 100644
--- a/app/db/database.php
+++ b/app/db/database.php
@@ -1,9 +1,22 @@
 <?php 
+$envFile = __DIR__ . '/../.env'; // .env 文件的路径
 
-$host = 'db-104.coowo.com:3306';
-$dbuser ='masadaroot';
-$dbpassword = 'x6h5E5p#u8y';
-$dbname = 'appwms';
+if (file_exists($envFile)) {
+    $lines = file($envFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+    if ($lines !== false) {
+        foreach ($lines as $line) {
+            list($key, $value) = explode('=', $line, 2);
+            $key = trim($key);
+            $value = trim($value);
+            // 设置环境变量
+            putenv("$key=$value");
+        }
+    }
+}
+$host = getenv('DB_HOST');
+$dbuser = getenv('DB_USERNAME');
+$dbpassword = getenv('DB_PASSWORD');
+$dbname = getenv('DB_DATABASE');
 $link = mysqli_connect($host,$dbuser,$dbpassword,$dbname);
 if($link){
     mysqli_query($link,'SET NAMES utf8');
diff --git a/mkt/database.php b/mkt/database.php
index 3de45c7e..833945ae 100644
--- a/mkt/database.php
+++ b/mkt/database.php
@@ -1,9 +1,23 @@
 <?php 
+$envFile = __DIR__ . '/../.env'; // .env 文件的路径
+
+if (file_exists($envFile)) {
+    $lines = file($envFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+    if ($lines !== false) {
+        foreach ($lines as $line) {
+            list($key, $value) = explode('=', $line, 2);
+            $key = trim($key);
+            $value = trim($value);
+            // 设置环境变量
+            putenv("$key=$value");
+        }
+    }
+}
 date_default_timezone_set("Asia/Taipei");
-$host = 'db-104.coowo.com:3306';
-$dbuser ='masadaroot';
-$dbpassword = 'x6h5E5p#u8y';
-$dbname = 'appwms';
+$host = getenv('DB_HOST');
+$dbuser = getenv('DB_USERNAME');
+$dbpassword = getenv('DB_PASSWORD');
+$dbname = getenv('DB_DATABASE');
 $link = mysqli_connect($host,$dbuser,$dbpassword,$dbname);
 //print_r($link);exit;
 if($link){
diff --git a/wms/account_log/M0174-2023-10-24.ini b/wms/account_log/M0174-2023-10-24.ini
index b9aa626f..6ae0451d 100644
--- a/wms/account_log/M0174-2023-10-24.ini
+++ b/wms/account_log/M0174-2023-10-24.ini
@@ -1 +1,2 @@
 a:3:{s:4:"list";s:0:"";s:4:"note";s:7:"success";s:5:"token";s:115:"M0174.JUU2JTlEJThFJUU2JTg5JUJGJUU4JUFCJUJB.2023-10-24 11:40:03.2023-10-25 11:40:03.0fab03939c2b072ec9e4d2c39a6a1f25";}11:40:03
+a:3:{s:4:"list";s:0:"";s:4:"note";s:7:"success";s:5:"token";s:115:"M0174.JUU2JTlEJThFJUU2JTg5JUJGJUU4JUFCJUJB.2023-10-24 15:47:40.2023-10-25 15:47:40.75a83416d0f079e46f15ec04d73bae7a";}15:47:40
diff --git a/wms/contract/conn.php b/wms/contract/conn.php
index 7926f57a..de066d5a 100644
--- a/wms/contract/conn.php
+++ b/wms/contract/conn.php
@@ -1,8 +1,22 @@
 <?php
-$db_hostname = 'db-104.coowo.com:3306';        //資料庫主機名稱
-$db_username = 'masadaroot';             //登入資料庫的管理者的帳號
-$db_password = 'x6h5E5p#u8y';        //登入密碼
-$db_name     = 'appwms';            //使用的資料庫
+$envFile = __DIR__ . '/../.env'; // .env 文件的路径
+
+if (file_exists($envFile)) {
+    $lines = file($envFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+    if ($lines !== false) {
+        foreach ($lines as $line) {
+            list($key, $value) = explode('=', $line, 2);
+            $key = trim($key);
+            $value = trim($value);
+            // 设置环境变量
+            putenv("$key=$value");
+        }
+    }
+}
+$db_hostname = getenv('DB_HOST');        //資料庫主機名稱
+$db_username = getenv('DB_USERNAME');             //登入資料庫的管理者的帳號
+$db_password = getenv('DB_PASSWORD');        //登入密碼
+$db_name     = getenv('DB_DATABASE');            //使用的資料庫
 $db_charset  = 'utf8';             //設定字元編碼
  
 //建立PDO的指定工作
diff --git a/wms/database.php b/wms/database.php
index 50e718cd..621fd3ff 100644
--- a/wms/database.php
+++ b/wms/database.php
@@ -1,5 +1,5 @@
 <?php 
-$envFile = __DIR__ . '/.env'; // .env 文件的路径
+$envFile = __DIR__ . '/../.env'; // .env 文件的路径
 
 if (file_exists($envFile)) {
     $lines = file($envFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
diff --git a/wms/fnh/database.php b/wms/fnh/database.php
index eb6da4c3..d6b7c3ab 100644
--- a/wms/fnh/database.php
+++ b/wms/fnh/database.php
@@ -1,9 +1,23 @@
 <?php 
+$envFile = __DIR__ . '/../.env'; // .env 文件的路径
+
+if (file_exists($envFile)) {
+    $lines = file($envFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+    if ($lines !== false) {
+        foreach ($lines as $line) {
+            list($key, $value) = explode('=', $line, 2);
+            $key = trim($key);
+            $value = trim($value);
+            // 设置环境变量
+            putenv("$key=$value");
+        }
+    }
+}
 date_default_timezone_set("Asia/Taipei");
-$host = 'db-104.coowo.com:3306';
-$dbuser ='masadaroot';
-$dbpassword = 'x6h5E5p#u8y';
-$dbname = 'appwms';
+$host = getenv('DB_HOST');
+$dbuser = getenv('DB_USERNAME');
+$dbpassword = getenv('DB_PASSWORD');
+$dbname = getenv('DB_DATABASE');
 $link = mysqli_connect($host,$dbuser,$dbpassword,$dbname);
 if($link){
     mysqli_query($link,'SET NAMES utf8');