bug kfix

admin/.env.production

@@ -1,9 +1,9 @@
-NODE_ENV = development
+NODE_ENV = production
 
-VITE_ENV = development
+VITE_ENV = production
 
-VITE_APP_BASE_URL = https://prodio.zltest.com.tw
+VITE_APP_BASE_URL =/ 
 
-VITE_APP_API_URL = https://prodio.zltest.com.tw/adminapi
+VITE_APP_API_URL = /adminapi
 
-VITE_APP_IMAGE_URL = https://prodio.zltest.com.tw/storage
+VITE_APP_IMAGE_URL = /storage

admin/.env.staging

@@ -0,0 +1,9 @@
+NODE_ENV = development
+
+VITE_ENV = development
+
+VITE_APP_BASE_URL = https://prodio.zltest.com.tw/
+
+VITE_APP_API_URL = https://prodio.zltest.com.tw/adminapi
+
+VITE_APP_IMAGE_URL = https://prodio.zltest.com.tw/storage

admin/package.json

@@ -6,8 +6,10 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
+    "build:sta": "vite build --mode staging",
     "preview": "vite preview",
-    "postbuild": "scp -r ./dist/* root@207.148.89.145:/www/wwwroot/prodio.zltest.com.tw/public/admin"    
+    "postbuild:sta": "scp -r ./dist/* root@207.148.89.145:/www/wwwroot/prodio.zltest.com.tw/public/admin",    
+    "postbuild": "cp -rf ./dist/* ../../prodio.prod/nginx/html/admin"
   },
   "dependencies": {
     "@ckeditor/ckeditor5-vue": "^5.1.0",

app/app/appapi/controller/SocialController.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace app\appapi\controller;
 
 use app\appapi\BaseController;
@@ -20,6 +19,7 @@ class SocialController extends BaseController
 
         $list = Db::name('news')
             ->where($where)
+            ->where('lang', $param['lang'])
             ->order('create_time', 'desc')
             ->page($page, $pageSize)
             ->select()
@@ -27,6 +27,7 @@ class SocialController extends BaseController
 
         $total = Db::name('news')
             ->where($where)
+            ->where('lang', $param['lang'])
             ->count();
 
         // foreach($list as $key => $val){

app/config/thinkorm.php

@@ -13,7 +13,7 @@ return [
             // 数据库用户名
             'username' => 'root',
             // 数据库密码
-            'password' => 'admin',
+            'password' => '1qazvfr4',
             // 数据库连接端口
             'hostport' => '3306',
             // 数据库连接参数

app/supervisord.pid

@@ -1 +0,0 @@
-1

docker-compose.yaml

@@ -11,7 +11,7 @@ services:
     volumes:
       - ./nuxt/app:/app
     networks:
-      - prodio-internal
+      - internal
   api:
     image: krisss/docker-webman:8.2-cli-alpine
     container_name: "prodio-api"
@@ -20,20 +20,21 @@ services:
     volumes:
       - ./app:/app
     networks:
-      - prodio-internal
+      - internal
   mysql:
     build:
       context: .
       dockerfile: ./mysql/Dockerfile
     container_name: "prodio-mysql"
-    #ports:
+    ports:
-    #  - "3306:3306"
+     - "3306:3306"
     networks:
-      - prodio-internal
+      - internal
     volumes:
-      - ./data/mysql:/var/lib/mysql
+      - ./data/mysql/data:/var/lib/mysql
+      - ./data/mysql/init:/docker-entrypoint-initdb.d
     environment:
-      MYSQL_ROOT_PASSWORD: admin  
+      MYSQL_ROOT_PASSWORD: 1qazvfr4  
   # redis:
   #   image: redis
   #   container_name: "prodio-redis"
@@ -45,11 +46,11 @@ services:
     ports:
       - "6069:80"
     networks:
-      - prodio-internal
+      - internal
     environment:
       PMA_HOST: mysql
       PMA_PORT: 3306
       UPLOAD_LIMIT: 100M
 networks:
-  prodio-internal:
+  internal:
     driver: bridge

prod.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/zsh
+
+

prodio.sql

@@ -3,15 +3,16 @@
 -- https://www.phpmyadmin.net/
 --
 -- 主機： mysql:3306
--- 產生時間： 2024 年 01 月 06 日 19:30
+-- 產生時間： 2024 年 01 月 18 日 09:28
 -- 伺服器版本： 8.0.35
--- PHP 版本： 8.2.8
+-- PHP 版本： 8.1.17
 
 SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
 START TRANSACTION;
 SET time_zone = "+00:00";
 
-
+CREATE DATABASE IF NOT EXISTS `prodio` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+USE `prodio`;
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
@@ -23,6 +24,28 @@ SET time_zone = "+00:00";
 
 -- --------------------------------------------------------
 
+--
+-- 資料表結構 `asc_activity`
+--
+
+CREATE TABLE `asc_activity` (
+  `id` int NOT NULL COMMENT '自增ID',
+  `lang` varchar(10) NOT NULL DEFAULT 'tw' COMMENT '語系',
+  `title1` varchar(255) NOT NULL DEFAULT '' COMMENT '標題(繁)',
+  `title2` varchar(255) NOT NULL DEFAULT '' COMMENT '標題(簡)',
+  `title3` varchar(255) NOT NULL DEFAULT '' COMMENT '標題(英)',
+  `image_list` text NOT NULL COMMENT '新聞內容',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '建立時間',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新時間',
+  `delete_time` datetime DEFAULT NULL COMMENT '刪除時間'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='最新消息';
+
+--
+-- 傾印資料表的資料 `asc_activity`
+--
+
+-- --------------------------------------------------------
+
 --
 -- 資料表結構 `asc_admin`
 --
@@ -50,12 +73,7 @@ CREATE TABLE `asc_admin` (
 --
 
 INSERT INTO `asc_admin` (`id`, `username`, `password`, `email`, `login_time`, `login_num`, `login_ip`, `action_list`, `is_super`, `is_main`, `role_id`, `status`, `create_time`, `update_time`, `delete_time`) VALUES
-(1, 'admin', '$2y$10$lIerY1.epUPPsblOUbr9pOk34z.62gd8eaSiM8lWNYpidtCg6y9zm', 'wayne@aaa.com', 1704549042, 13, '', '', 0, 0, 1, 0, NULL, NULL, NULL),
+(1, 'admin', '$2y$10$lIerY1.epUPPsblOUbr9pOk34z.62gd8eaSiM8lWNYpidtCg6y9zm', 'wayne@aaa.com', 1705558921, 67, '', '', 0, 0, 1, 0, NULL, NULL, NULL);
-(29, 'admin1', '$2y$10$EBQ2eRhLG/Vca9l9DwFcNOCR03u/hKq1qt5vhzE5PhMSKimoghMQm', '', 0, 0, '', '', 0, 0, 0, 1, '2024-01-01 21:53:08', NULL, NULL),
-(32, 'admin2', '$2y$10$/jFN5NtdhM7U6eOqEGdG0uUoU8dRGwI6m5drr3q6qkXN3l1evvpX2', '', 0, 0, '', '', 0, 0, 0, 1, '2024-01-02 00:47:00', NULL, NULL),
-(33, 'admin3', '$2y$10$UNoKH9lpgQ2LRREMVEJWYO/6Le3exfJBQtCd0ub0mzq97mO.6LRyy', '', 0, 0, '', '', 0, 0, 0, 1, '2024-01-02 00:47:42', NULL, NULL),
-(34, 'admin4', '$2y$10$LnQPk3jJr86OiprLlstYSODs/oYZdq/Uo6LHb9/iM03pH5lqjaw.e', '', 0, 0, '', '', 0, 0, 0, 1, '2024-01-02 00:48:19', NULL, NULL);
-
 -- --------------------------------------------------------
 
 --
@@ -76,94 +94,6 @@ CREATE TABLE `asc_admin_log` (
 -- 傾印資料表的資料 `asc_admin_log`
 --
 
-INSERT INTO `asc_admin_log` (`id`, `admin_id`, `admin_name`, `content`, `time`, `ip`, `url`) VALUES
-(141, 1, 'admin', '新增管理員 admin6', '2024-01-02 04:50:43', '', ''),
-(142, 1, 'admin', '新增管理員 admin6', '2024-01-01 17:00:17', '', ''),
-(143, 1, 'admin', '刪除管理員 admin6', '2024-01-01 17:53:41', '', ''),
-(144, 1, 'admin', '刪除管理員 admin5', '2024-01-01 17:55:45', '', ''),
-(145, 0, '', '刪除輪撥 [2]', '2024-01-03 17:15:52', '', ''),
-(146, 0, '', '刪除輪撥 [2]', '2024-01-03 17:21:23', '', ''),
-(147, 0, '', '新增輪撥 [4]', '2024-01-03 17:21:29', '', ''),
-(148, 0, '', '刪除輪撥 [4]', '2024-01-03 17:23:54', '', ''),
-(149, 0, '', '修改輪撥 [1]', '2024-01-03 17:27:31', '', ''),
-(150, 0, '', '新增輪撥 [5]', '2024-01-03 18:34:01', '', ''),
-(151, 0, '', '修改輪撥 [3]', '2024-01-03 18:39:49', '', ''),
-(152, 0, '', '修改輪撥 [1]', '2024-01-03 18:40:10', '', ''),
-(153, 0, '', '新增輪撥 [6]', '2024-01-04 17:43:42', '', ''),
-(154, 0, '', '修改輪撥 [6]', '2024-01-04 17:44:03', '', ''),
-(155, 0, '', '修改輪撥 [6]', '2024-01-04 17:44:25', '', ''),
-(156, 0, '', '修改輪撥 [6]', '2024-01-04 17:44:38', '', ''),
-(157, 0, '', '修改輪撥 [6]', '2024-01-04 18:31:13', '', ''),
-(158, 0, '', '刪除輪撥 [1]', '2024-01-04 22:04:22', '', ''),
-(159, 0, '', '刪除輪撥 [5]', '2024-01-04 22:04:26', '', ''),
-(160, 0, '', '修改內容 [1]', '2024-01-04 22:24:11', '', ''),
-(161, 0, '', '修改內容 [1]', '2024-01-04 22:24:18', '', ''),
-(162, 0, '', '新增輪撥 [7]', '2024-01-04 21:10:21', '', ''),
-(163, 0, '', '新增輪撥 [8]', '2024-01-04 21:36:10', '', ''),
-(164, 0, '', '新增輪撥 [9]', '2024-01-05 17:09:34', '', ''),
-(165, 0, '', '刪除輪撥 [8]', '2024-01-05 17:10:01', '', ''),
-(166, 0, '', '新增輪撥 [10]', '2024-01-05 18:39:09', '', ''),
-(167, 0, '', '修改輪撥 [10]', '2024-01-05 18:40:05', '', ''),
-(168, 0, '', '修改輪撥 [10]', '2024-01-05 18:41:02', '', ''),
-(169, 0, '', '刪除輪撥 [3]', '2024-01-05 18:41:17', '', ''),
-(170, 0, '', '新增輪撥 [11]', '2024-01-05 18:42:34', '', ''),
-(171, 0, '', '新增輪撥 [12]', '2024-01-05 18:43:39', '', ''),
-(172, 0, '', '新增輪撥 [13]', '2024-01-05 18:45:04', '', ''),
-(173, 0, '', '新增輪撥 [14]', '2024-01-05 18:45:39', '', ''),
-(174, 0, '', '修改輪撥 [14]', '2024-01-05 18:45:53', '', ''),
-(175, 0, '', '修改輪撥 [13]', '2024-01-05 18:46:30', '', ''),
-(176, 0, '', '新增供應商 [1]', '2024-01-05 19:13:15', '', ''),
-(177, 0, '', '新增供應商 [2]', '2024-01-05 19:14:52', '', ''),
-(178, 0, '', '新增供應商 [3]', '2024-01-05 19:18:15', '', ''),
-(179, 0, '', '修改內容 [1]', '2024-01-05 20:18:14', '', ''),
-(180, 0, '', '修改內容 [1]', '2024-01-05 20:18:27', '', ''),
-(181, 0, '', '修改內容 [2]', '2024-01-05 20:18:33', '', ''),
-(182, 0, '', '修改內容 [2]', '2024-01-05 20:19:54', '', ''),
-(183, 0, '', '修改內容 [1]', '2024-01-05 20:20:17', '', ''),
-(184, 0, '', '修改內容 [1]', '2024-01-05 20:20:47', '', ''),
-(185, 0, '', '修改內容 [2]', '2024-01-05 20:21:02', '', ''),
-(186, 0, '', '修改內容 [1]', '2024-01-05 20:23:18', '', ''),
-(187, 0, '', '修改內容 [2]', '2024-01-05 20:23:23', '', ''),
-(188, 0, '', '修改內容 [1]', '2024-01-05 20:24:15', '', ''),
-(189, 0, '', '修改內容 [1]', '2024-01-05 20:24:33', '', ''),
-(190, 0, '', '修改內容 [2]', '2024-01-05 20:24:48', '', ''),
-(191, 0, '', '修改內容 [2]', '2024-01-05 20:25:08', '', ''),
-(192, 0, '', '修改內容 [2]', '2024-01-05 20:25:23', '', ''),
-(193, 0, '', '修改內容 [1]', '2024-01-05 20:26:04', '', ''),
-(194, 0, '', '修改內容 [1]', '2024-01-05 20:49:23', '', ''),
-(195, 0, '', '修改內容 [2]', '2024-01-05 20:49:30', '', ''),
-(196, 0, '', '修改內容 [1]', '2024-01-06 02:10:55', '', ''),
-(197, 0, '', '新增據點 [1]', '2024-01-06 02:49:41', '', ''),
-(198, 0, '', '新增供應商 [4]', '2024-01-06 03:05:50', '', ''),
-(199, 0, '', '新增供應商 [5]', '2024-01-06 03:06:35', '', ''),
-(200, 0, '', '新增據點 [2]', '2024-01-06 03:08:52', '', ''),
-(201, 0, '', '刪除據點 [2]', '2024-01-06 03:09:00', '', ''),
-(202, 0, '', '新增據點 [3]', '2024-01-06 03:11:01', '', ''),
-(203, 0, '', '新增據點 [4]', '2024-01-06 03:11:41', '', ''),
-(204, 0, '', '修改輪撥 [4]', '2024-01-06 03:13:23', '', ''),
-(205, 0, '', '修改輪撥 [4]', '2024-01-06 03:13:47', '', ''),
-(206, 0, '', '修改據點 [4]', '2024-01-06 03:14:54', '', ''),
-(207, 0, '', '刪除聯絡內容 [1]', '2024-01-07 04:01:47', '', ''),
-(208, 0, '', '刪除管理員 admin', '2024-01-07 04:35:10', '', ''),
-(209, 0, '', '新增產業動態 2', '2024-01-06 18:00:29', '', ''),
-(210, 0, '', '新增產業動態 3', '2024-01-06 18:00:46', '', ''),
-(211, 0, '', '新增產業動態 4', '2024-01-06 18:01:57', '', ''),
-(212, 0, '', '修改產業動態 [4]', '2024-01-06 18:04:00', '', ''),
-(213, 0, '', '刪除管理員 ', '2024-01-06 18:04:17', '', ''),
-(214, 0, '', '刪除管理員 ', '2024-01-06 18:04:31', '', ''),
-(215, 0, '', '新增產業動態 5', '2024-01-06 18:06:36', '', ''),
-(216, 0, '', '新增產業動態 6', '2024-01-06 18:06:40', '', ''),
-(217, 0, '', '新增產業動態 7', '2024-01-06 18:06:43', '', ''),
-(218, 0, '', '新增產業動態 8', '2024-01-06 18:06:47', '', ''),
-(219, 0, '', '新增產業動態 9', '2024-01-06 18:06:50', '', ''),
-(220, 0, '', '新增產業動態 10', '2024-01-06 18:06:53', '', ''),
-(221, 0, '', '新增產業動態 11', '2024-01-06 18:06:58', '', ''),
-(222, 0, '', '新增產業動態 12', '2024-01-06 18:07:03', '', ''),
-(223, 0, '', '新增產業動態 13', '2024-01-06 18:07:09', '', ''),
-(224, 0, '', '新增產業動態 14', '2024-01-06 18:07:23', '', ''),
-(225, 0, '', '修改產業動態 [4]', '2024-01-06 18:14:30', '', ''),
-(226, 0, '', '修改產業動態 [4]', '2024-01-06 18:15:09', '', '');
-
 -- --------------------------------------------------------
 
 --
@@ -186,6 +116,18 @@ CREATE TABLE `asc_article` (
 -- 傾印資料表的資料 `asc_article`
 --
 
+INSERT INTO `asc_article` (`id`, `lang`, `cat_id`, `title`, `content`, `imageurl`, `create_time`, `update_time`, `delete_time`) VALUES
+(1, 'tw', 1, '公司簡介', '', '', '2024-01-05 06:11:34', '2024-01-15 15:34:58', NULL),
+(2, 'cn', 1, '公司簡介', '', '', '2024-01-05 06:11:34', '2024-01-06 04:24:15', NULL),
+(3, 'en', 1, '公司簡介', '', '', '2024-01-05 06:11:34', '2024-01-10 03:53:53', NULL),
+(4, 'tw', 2, '經營理念', '', '', '2024-01-05 06:11:34', '2024-01-16 19:17:21', NULL),
+(5, 'cn', 2, '經營理念', '', '', '2024-01-05 06:11:34', '2024-01-06 04:25:08', NULL);
+INSERT INTO `asc_article` (`id`, `lang`, `cat_id`, `title`, `content`, `imageurl`, `create_time`, `update_time`, `delete_time`) VALUES
+(6, 'en', 2, '經營理念', '', '', '2024-01-05 06:11:34', '2024-01-10 03:53:41', NULL);
+INSERT INTO `asc_article` (`id`, `lang`, `cat_id`, `title`, `content`, `imageurl`, `create_time`, `update_time`, `delete_time`) VALUES
+(7, 'tw', 3, '公司據點', '', '', '2024-01-05 06:11:34', '2024-01-05 06:11:34', NULL),
+(8, 'cn', 3, '公司據點', '', '', '2024-01-05 06:11:34', '2024-01-05 06:11:34', NULL),
+(9, 'en', 3, '公司據點', '', '', '2024-01-05 06:11:34', '2024-01-05 06:11:34', NULL);
 
 -- --------------------------------------------------------
 
@@ -218,7 +160,7 @@ CREATE TABLE `asc_banner` (
   `imageurl2` varchar(255) NOT NULL DEFAULT '' COMMENT '手機圖',
   `slogon` varchar(100) NOT NULL DEFAULT '' COMMENT '大標語',
   `describe` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '描述',
-  `sort_order` int NOT NULL COMMENT '排序',
+  `sort_order` int NOT NULL DEFAULT '100' COMMENT '排序',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '建立時間',
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新時間',
   `delete_time` datetime NOT NULL COMMENT '刪除時間'
@@ -228,15 +170,6 @@ CREATE TABLE `asc_banner` (
 -- 傾印資料表的資料 `asc_banner`
 --
 
-INSERT INTO `asc_banner` (`id`, `lang`, `imageurl1`, `imageurl2`, `slogon`, `describe`, `sort_order`, `create_time`, `update_time`, `delete_time`) VALUES
-(6, 'tw', '/storage/banner/6596ee41e8150.jpg', '/storage/banner/6596ee4b9a9ef.jpg', '大', '小', 0, '2024-01-05 01:43:42', '2024-01-05 02:31:13', '0000-00-00 00:00:00'),
-(7, 'tw', '/storage/banner/6597c76657cfb.jpg', '/storage/banner/6597c77c18683.jpg', '', '', 0, '2024-01-05 17:10:21', '2024-01-05 17:10:21', '0000-00-00 00:00:00'),
-(9, 'tw', '/storage/banner/659837b17deb9.jpg', '/storage/banner/659837ba36e2d.jpg', '大', '小', 0, '2024-01-06 01:09:34', '2024-01-06 01:09:34', '0000-00-00 00:00:00'),
-(10, 'tw', '/storage/banner/65984d26e7ce1.jpg', '/storage/banner/65984ccbb7101.jpg', '', '', 0, '2024-01-06 02:39:09', '2024-01-06 02:41:02', '0000-00-00 00:00:00'),
-(11, 'tw', '/storage/banner/65984d9082f57.jpg', '/storage/banner/65984d9854f91.jpg', 'Slogon', 'Description', 0, '2024-01-06 02:42:34', '2024-01-06 02:42:34', '0000-00-00 00:00:00'),
-(12, 'tw', '/storage/banner/65984dcdc241c.jpg', '/storage/banner/65984dd582c3b.jpg', '', '', 0, '2024-01-06 02:43:39', '2024-01-06 02:43:39', '0000-00-00 00:00:00'),
-(13, 'cn', '/storage/banner/65984e2ae1d70.jpg', '/storage/banner/65984e2f0d61e.jpg', '標語', '描述', 0, '2024-01-06 02:45:04', '2024-01-06 02:46:30', '0000-00-00 00:00:00'),
-(14, 'en', '/storage/banner/65984e4898404.jpg', '/storage/banner/65984e51c1762.jpg', 'Slogon', 'Desc', 0, '2024-01-06 02:45:39', '2024-01-06 02:45:53', '0000-00-00 00:00:00');
 
 -- --------------------------------------------------------
 
@@ -254,7 +187,7 @@ CREATE TABLE `asc_branch` (
   `url` varchar(255) NOT NULL DEFAULT '' COMMENT '網址',
   `email` varchar(50) NOT NULL DEFAULT '' COMMENT 'Email',
   `imageurl` varchar(255) NOT NULL DEFAULT '' COMMENT '圖片網址',
-  `sort_order` int NOT NULL DEFAULT '50' COMMENT '排序編號',
+  `sort_order` int NOT NULL DEFAULT '100' COMMENT '排序編號',
   `status` int NOT NULL DEFAULT '1' COMMENT '狀態(0:無效,1:有效)'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='公司據點';
 
@@ -262,11 +195,6 @@ CREATE TABLE `asc_branch` (
 -- 傾印資料表的資料 `asc_branch`
 --
 
-INSERT INTO `asc_branch` (`id`, `lang`, `name`, `address`, `tel`, `fax`, `url`, `email`, `imageurl`, `sort_order`, `status`) VALUES
-(1, 'tw', '芝普企業股份有限公司(台灣總公司)', '台湾桃園市八德區型成街22號', '+886-3-365-3300', '+886-3-365-3301', 'http://www.echemsemi.com', 'service@echemsemi.com', '', 10, 1),
-(3, 'cn', '博仲国际贸易上海有限公司', '', '', '', '', '', '', 30, 1),
-(4, 'en', 'PRODIO INTERNATIONAL TRADING SHANGHAI CO., LTD.', '**********巷18號1樓', '', '', '', '', '', 40, 1);
-
 -- --------------------------------------------------------
 
 --
@@ -277,21 +205,60 @@ CREATE TABLE `asc_category` (
   `id` int NOT NULL COMMENT '自增ID',
   `lang` varchar(10) NOT NULL DEFAULT 'tw' COMMENT '語系',
   `name` varchar(100) NOT NULL DEFAULT '' COMMENT '類別名稱',
+  `description` varchar(255) NOT NULL COMMENT '類別說明',
+  `imageurl` varchar(255) NOT NULL DEFAULT '' COMMENT '類別圖檔',
   `parent_id` int NOT NULL DEFAULT '0' COMMENT '父ID',
-  `sort_order` int NOT NULL DEFAULT '50' COMMENT '排序'
+  `sort_order` int NOT NULL DEFAULT '100' COMMENT '排序'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='產品類別';
 
 --
 -- 傾印資料表的資料 `asc_category`
 --
 
-INSERT INTO `asc_category` (`id`, `lang`, `name`, `parent_id`, `sort_order`) VALUES
+-- --------------------------------------------------------
-(1, 'tw', '塗料與油墨', 0, 50),
+
-(2, 'tw', '分散劑', 1, 50),
+--
-(3, 'tw', '潤濕劑', 1, 50),
+-- 資料表結構 `asc_config`
-(4, 'tw', '電子化學材料', 0, 50),
+--
-(5, 'tw', '電子化學材料', 4, 50),
+
-(6, 'tw', '電子化學材料', 4, 50);
+CREATE TABLE `asc_config` (
+  `id` int NOT NULL COMMENT '自增ID',
+  `lang` varchar(10) NOT NULL DEFAULT '' COMMENT '語系',
+  `parent_id` int NOT NULL,
+  `code` varchar(30) NOT NULL,
+  `type` varchar(10) NOT NULL,
+  `srange` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `sdir` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `value` text NOT NULL,
+  `sort_order` int NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+--
+-- 傾印資料表的資料 `asc_config`
+--
+
+INSERT INTO `asc_config` (`id`, `lang`, `parent_id`, `code`, `type`, `srange`, `sdir`, `value`, `sort_order`) VALUES
+(101, 'tw', 1, 'company_name', 'text', '', '', '', 50),
+(102, 'cn', 1, 'company_name', 'text', '', '', '', 50),
+(103, 'en', 1, 'company_name', 'text', '', '', '', 50),
+(104, 'tw', 1, 'address', 'text', '', '', '', 50),
+(105, 'cn', 1, 'address', 'text', '', '', '', 50),
+(106, 'en', 1, 'address', 'text', '', '', '', 50),
+(107, 'tw', 1, 'email', 'text', '', '', '', 50),
+(108, 'cn', 1, 'email', 'text', '', '', '', 50),
+(109, 'en', 1, 'email', 'text', '', '', '', 50),
+(110, 'tw', 1, 'tel', 'text', '', '', '', 50),
+(111, 'cn', 1, 'tel', 'text', '', '', '', 50),
+(112, 'en', 1, 'tel', 'text', '', '', '', 50),
+(113, 'tw', 1, 'fax', 'text', '', '', '', 50),
+(114, 'cn', 1, 'fax', 'text', '', '', '', 50),
+(115, 'en', 1, 'fax', 'text', '', '', '', 50),
+(116, 'tw', 1, 'products', 'text', '', '', '', 50),
+(117, 'cn', 1, 'products', 'text', '', '', '', 50),
+(118, 'en', 1, 'products', 'text', '', '', '', 50),
+(119, 'tw', 1, 'development', 'text', '', '', '', 50),
+(120, 'cn', 1, 'development', 'text', '', '', '', 50),
+(121, 'en', 1, 'development', 'text', '', '', '', 50);
 
 -- --------------------------------------------------------
 
@@ -302,6 +269,7 @@ INSERT INTO `asc_category` (`id`, `lang`, `name`, `parent_id`, `sort_order`) VAL
 CREATE TABLE `asc_contact` (
   `id` int NOT NULL COMMENT '自增ID',
   `lang` varchar(10) NOT NULL COMMENT '語系',
+  `company` varchar(100) NOT NULL COMMENT '公司名稱',
   `name` varchar(100) NOT NULL COMMENT '名稱',
   `tel` varchar(50) NOT NULL COMMENT '電話',
   `address` varchar(255) NOT NULL COMMENT '地址',
@@ -314,10 +282,6 @@ CREATE TABLE `asc_contact` (
 -- 傾印資料表的資料 `asc_contact`
 --
 
-INSERT INTO `asc_contact` (`id`, `lang`, `name`, `tel`, `address`, `email`, `content`, `create_time`) VALUES
-(2, 'tw', 'name', 'tel', 'address', 'email', 'content', '2024-01-07 00:03:05'),
-(3, 'tw', 'name2', 'tel2', 'address2', 'email2', 'content2', '2024-01-07 00:03:05');
-
 -- --------------------------------------------------------
 
 --
@@ -339,6 +303,30 @@ CREATE TABLE `asc_news` (
 -- 傾印資料表的資料 `asc_news`
 --
 
+-- --------------------------------------------------------
+
+--
+-- 資料表結構 `asc_product`
+--
+
+CREATE TABLE `asc_product` (
+  `id` int NOT NULL COMMENT '自增ID',
+  `lang` varchar(10) NOT NULL DEFAULT 'tw' COMMENT '語系',
+  `name` varchar(100) NOT NULL DEFAULT '' COMMENT '產品名稱',
+  `cat_id` int NOT NULL DEFAULT '0' COMMENT '類別ID',
+  `imageurl` varchar(255) NOT NULL DEFAULT '' COMMENT '產品圖片',
+  `description` varchar(500) NOT NULL DEFAULT '' COMMENT '產品簡述',
+  `content` text NOT NULL COMMENT '產品描述',
+  `sort_order` int NOT NULL DEFAULT '100' COMMENT '排序ID',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '建立時間',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新時間',
+  `delete_time` datetime DEFAULT NULL COMMENT '刪除時間'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+
+--
+-- 傾印資料表的資料 `asc_product`
+--
+
 
 -- --------------------------------------------------------
 
@@ -349,9 +337,11 @@ CREATE TABLE `asc_news` (
 CREATE TABLE `asc_supplier` (
   `id` int NOT NULL COMMENT '自增ID',
   `lang` varchar(10) NOT NULL DEFAULT 'tw',
-  `name` varchar(200) NOT NULL DEFAULT '' COMMENT '供應商名稱',
+  `name1` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '供應商名稱',
+  `name2` varchar(200) NOT NULL COMMENT '供應商名稱(簡)',
+  `name3` varchar(200) NOT NULL COMMENT '供應商名稱(英)',
   `imageurl` varchar(255) NOT NULL DEFAULT '' COMMENT '供應商圖檔',
-  `sort_order` int NOT NULL DEFAULT '50' COMMENT '供應商排序',
+  `sort_order` int NOT NULL DEFAULT '100' COMMENT '供應商排序',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '建立時間',
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新時間',
   `delete_time` datetime DEFAULT NULL COMMENT '刪除時間'
@@ -361,17 +351,17 @@ CREATE TABLE `asc_supplier` (
 -- 傾印資料表的資料 `asc_supplier`
 --
 
-INSERT INTO `asc_supplier` (`id`, `lang`, `name`, `imageurl`, `sort_order`, `create_time`, `update_time`, `delete_time`) VALUES
-(1, 'tw', '測試', '', 10, '2024-01-06 03:13:15', '2024-01-06 03:13:15', NULL),
-(2, 'tw', 'aaa', '/storage/supplier/6598552926f0d.jpg', 20, '2024-01-06 03:14:52', '2024-01-06 03:14:52', NULL),
-(3, 'cn', 'supplier', '/storage/supplier/659855efc025e.jpg', 30, '2024-01-06 03:18:15', '2024-01-06 03:18:15', NULL),
-(4, 'tw', 'TEST', '/storage/branch/65996c466cda4.jpg', 40, '2024-01-06 23:05:50', '2024-01-06 23:05:50', NULL),
-(5, 'tw', 'test', '/storage/branch/65996c74a019c.jpg', 50, '2024-01-06 23:06:35', '2024-01-06 23:06:35', NULL);
 
 --
 -- 已傾印資料表的索引
 --
 
+--
+-- 資料表索引 `asc_activity`
+--
+ALTER TABLE `asc_activity`
+  ADD PRIMARY KEY (`id`);
+
 --
 -- 資料表索引 `asc_admin`
 --
@@ -414,6 +404,12 @@ ALTER TABLE `asc_branch`
 ALTER TABLE `asc_category`
   ADD PRIMARY KEY (`id`);
 
+--
+-- 資料表索引 `asc_config`
+--
+ALTER TABLE `asc_config`
+  ADD PRIMARY KEY (`id`);
+
 --
 -- 資料表索引 `asc_contact`
 --
@@ -426,6 +422,12 @@ ALTER TABLE `asc_contact`
 ALTER TABLE `asc_news`
   ADD PRIMARY KEY (`id`);
 
+--
+-- 資料表索引 `asc_product`
+--
+ALTER TABLE `asc_product`
+  ADD PRIMARY KEY (`id`);
+
 --
 -- 資料表索引 `asc_supplier`
 --
@@ -436,6 +438,12 @@ ALTER TABLE `asc_supplier`
 -- 在傾印的資料表使用自動遞增(AUTO_INCREMENT)
 --
 
+--
+-- 使用資料表自動遞增(AUTO_INCREMENT) `asc_activity`
+--
+ALTER TABLE `asc_activity`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=1;
+
 --
 -- 使用資料表自動遞增(AUTO_INCREMENT) `asc_admin`
 --
@@ -446,13 +454,13 @@ ALTER TABLE `asc_admin`
 -- 使用資料表自動遞增(AUTO_INCREMENT) `asc_admin_log`
 --
 ALTER TABLE `asc_admin_log`
-  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=227;
+  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=1;
 
 --
 -- 使用資料表自動遞增(AUTO_INCREMENT) `asc_article`
 --
 ALTER TABLE `asc_article`
-  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=10;
+  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=1;
 
 --
 -- 使用資料表自動遞增(AUTO_INCREMENT) `asc_article_cate`
@@ -464,37 +472,49 @@ ALTER TABLE `asc_article_cate`
 -- 使用資料表自動遞增(AUTO_INCREMENT) `asc_banner`
 --
 ALTER TABLE `asc_banner`
-  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=15;
+  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=1;
 
 --
 -- 使用資料表自動遞增(AUTO_INCREMENT) `asc_branch`
 --
 ALTER TABLE `asc_branch`
-  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=5;
+  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=1;
 
 --
 -- 使用資料表自動遞增(AUTO_INCREMENT) `asc_category`
 --
 ALTER TABLE `asc_category`
-  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=7;
+  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=1;
+
+--
+-- 使用資料表自動遞增(AUTO_INCREMENT) `asc_config`
+--
+ALTER TABLE `asc_config`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=1;
 
 --
 -- 使用資料表自動遞增(AUTO_INCREMENT) `asc_contact`
 --
 ALTER TABLE `asc_contact`
-  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=4;
+  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=1;
 
 --
 -- 使用資料表自動遞增(AUTO_INCREMENT) `asc_news`
 --
 ALTER TABLE `asc_news`
-  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=15;
+  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=1;
+
+--
+-- 使用資料表自動遞增(AUTO_INCREMENT) `asc_product`
+--
+ALTER TABLE `asc_product`
+  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=1;
 
 --
 -- 使用資料表自動遞增(AUTO_INCREMENT) `asc_supplier`
 --
 ALTER TABLE `asc_supplier`
-  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=6;
+  MODIFY `id` int NOT NULL AUTO_INCREMENT COMMENT '自增ID', AUTO_INCREMENT=1;
 COMMIT;
 
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

showdoc_db.sh

@@ -2,10 +2,10 @@
 #
 #
 #
-host="172.23.64.1"				#數據庫所在地址。默認是localhost
+host="127.0.0.1"				#數據庫所在地址。默認是localhost
 port=3306						#數據庫所在端口。默認是3306
 user="root"   	 			#數據庫的用戶名
-password="admin" 			#密碼
+password="1qazvfr4" 			#密碼
 db="prodio" 					#要同步的數據庫名。要同步多個db可以將本腳本複製多份
 api_key="6609532c2f496383893d8fd9dfddf3611656642534" 			#api_key
 api_token="dcd833347fb245662a872ea056b1e8ef81705506" 	#api_token

web/app.vue

@@ -1,4 +1,6 @@
 <script setup>
+import Cookies from 'js-cookie';
+
 useHead({
   title: '普達國際',
   viewport: 'width=device-width, initial-scale=1, maximum-scale=1',
@@ -16,6 +18,12 @@ import useStore from '@/store';
 const store = useStore();
 
 store.getConfig();
+
+//檢查cookie i18n_redirected是否存在不存在就設定語系
+if(!Cookies.get('i18n_redirected')){
+  Cookies.set('i18n_redirected', 'tw');
+}
+
 </script>
 <template>
   <div>

web/components/PageBanner.vue

@@ -1,6 +1,4 @@
 <script setup>
-import { useRouter } from "vue-router";
-
 import featureImg from '@/assets/img/feature.jpg';
 
 const router = useRouter();
@@ -8,6 +6,7 @@ const router = useRouter();
 const props = defineProps({
     item: {type: Object}
 })
+
 </script>
 
 <template>

web/layouts/default.vue

@@ -34,9 +34,9 @@ const { data: cateRes } = await useMyFetch('/index/getCateList', "GET")
               <div class="nav-link">{{ $t('aboutus') }}</div>
               <ul class="dropdown-menu">
                 <li><a class="dropdown-item" href="javascript:;" @click="router.push(localeLocation('/about/company'))">{{
-                  $t('about.company') }}</a></li>
+                  $t('About.company') }}</a></li>
                 <li><a class="dropdown-item" href="javascript:;" @click="router.push(localeLocation('/about/concept'))">{{
-                  $t('about.concept') }}</a></li>
+                  $t('About.concept') }}</a></li>
               </ul>
             </li>
             <li class="nav-item">

web/locales/cn.js

@@ -11,7 +11,7 @@ export default {
     Form: {
         submit: '确认送出',
     },
-    about: {
+    About: {
         company: '公司简介',
         concept: '经营理念',
     },

web/locales/en.js

@@ -11,7 +11,7 @@ export default {
     Form: {
         submit: 'Submit',
     },
-    about: {
+    About: {
         company: 'Company Overview',
         concept: 'Business Philosophy',
     },

web/locales/tw.js

@@ -11,7 +11,7 @@ export default {
     Form: {
         submit: '確認送出',
     },
-    about: {
+    About: {
         company: '公司簡介',
         concept: '經營理念',
     },

web/nuxt.config.ts

@@ -61,11 +61,6 @@ export default defineNuxtConfig({
     // strategy: 'prefix',
     langDir: 'locales',
     locales: [
-      {
-        code: 'en',
-        iso: 'en-US',
-        file: 'en.js'
-      },
       {
         code: 'tw',
         iso: 'zh-TW',
@@ -75,6 +70,11 @@ export default defineNuxtConfig({
         code: 'cn',
         iso: 'zh-CN',
         file: 'cn.js'
+      },
+      {
+        code: 'en',
+        iso: 'en-US',
+        file: 'en.js'
       }
     ],
     defaultLocale: 'tw',

web/package.json

@@ -4,11 +4,13 @@
   "type": "module",
   "scripts": {
     "build": "nuxt build --dotenv .env",
+    "build:sta": "nuxt build --dotenv .env.staging",
     "dev": "nuxt dev --dotenv .env.development",
     "generate": "nuxt generate --dotenv .env.staging",
     "preview": "nuxt preview",
     "postinstall": "nuxt prepare",
-    "postbuild": "cp -r .output/* ../nuxt/app && scp -r ../nuxt/app/* root@test:/www/wwwroot/prodio.zltest.com.tw/nuxt/app"
+    "postbuild:sta": "cp -rf .output/* ../nuxt/app && scp -r ../nuxt/app/* root@test:/www/wwwroot/prodio.zltest.com.tw/nuxt/app",
+    "postbuild": "rm -rf ../../prodio.prod/web/app/* && cp -rf .output/* ../../prodio.prod/web/app"
   },
   "devDependencies": {
     "@element-plus/nuxt": "^1.0.7",

web/pages/about.vue

@@ -8,20 +8,30 @@ const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 
-const bannerObj = {
+const bannerObj = computed(() => {
+  let title;
+
+  if( route.path.includes('/about/company') ){
+    title = t('About.company');
+  }else{
+    title = t('About.concept');
+  }
+
+  return {
     "bImg": bannerImg,
     "pageName": t('aboutus'),
-  "path": t('about.company'),
+    "path": title,
-  "title":"關於普達"
+    "title": title
   }
+});
 
 const menuList = [
   {
-    "name": t('about.company'), 
+    "name": t('About.company'),
     "path": "/about/company"
   },
   {
-    "name": t('about.concept'),
+    "name": t('About.concept'),
     "path": "/about/concept"
   },
 ]
@@ -51,12 +61,8 @@ watch(() => route.params,
           <div class="row">
             <div class="col-12 col-lg-auto">
               <div class="list-group">
-                <a class="list-group-item"
+                <a class="list-group-item" :class="{ 'active': currentRoute.includes(item.path) }" href="javascript:;"
-                  :class="{ 'active': currentRoute.includes(item.path) }"
+                  v-for="(item, index) in menuList" :key="index" @click="router.push(localeLocation(item.path));">
-                  href="javascript:;" 
-                  v-for="(item,index) in menuList" :key="index"
-                  @click="router.push(localeLocation(item.path));"
-                >
                   {{ item.name }}
                 </a>
               </div>
@@ -70,9 +76,6 @@ watch(() => route.params,
 
     </div>
   </div>
-  
 </template>
 
-<style lang="less">
+<style lang="less"></style>
-
-</style>

web/pages/about/company.vue

@@ -11,7 +11,7 @@ if (res.value.code === 200) {
 
 <template>
   <div class="toolbar">
-    <div class="tTitle">{{ $t('about.company') }}</div>
+    <div class="tTitle">{{ $t('About.company') }}</div>
   </div>
   <div class="content ck-content" v-html="content">
   </div>

web/pages/about/concept.vue

@@ -11,7 +11,7 @@ if (res.value.code === 200) {
 
 <template>
   <div class="toolbar">
-    <div class="tTitle">{{ $t('about.concept') }}</div>
+    <div class="tTitle">{{ $t('About.concept') }}</div>
   </div>
   <div class="content ck-content" v-html="content">
   </div>

web/pages/contact.vue

@@ -10,12 +10,23 @@ const router = useRouter();
 
 const { t } = useI18n();
 
-const bannerObj = {
+
+const bannerObj = computed(() => {
+  let title;
+
+  if( route.path.includes('/contact/form') ){
+    title = t('Contact.form');
+  }else{
+    title = t('Contact.branch');
+  }
+
+  return {
     "bImg": testimonialImg,
     "pageName": t('contact'),
-  "path":"",
+    "path": title,
-  "title":t('contact')
+    "title": title
   }
+});
 
 const menuList = [
   {

web/pages/social.vue

@@ -12,12 +12,24 @@ const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 
-const bannerObj = {
+const bannerObj = computed(() => {
+  let title, path;
+
+  if( route.path.includes('/social/news') ){
+    title = t('Social.news');
+    path = t('Social.news');
+  }else{
+    title = t('Social.activity');
+    path = t('Social.activity');
+  }
+
+  return {
     "bImg": bannerImg,
-  "pageName":"Social",
+    "pageName": t('news'),
-  "path":"News",
+    "path": path,
-  "title":"最新消息"
+    "title": title
   }
+});
 
 const menuList = [
   {

web/pages/social/activity/detail/[id].vue

@@ -19,7 +19,7 @@ onMounted(() => {
           <div class="row">
             <div class="col-12">
               <div class="toolbar">
-                <div class="tTitle">公司活動</div>
+                <div class="tTitle">{{ $t('Social.activity')}}</div>
               </div>		
               <div class="content">
                 <div class="block">

web/pages/social/activity/index.vue

@@ -25,7 +25,7 @@ const handlePageChange = async (npage,npageSize) => {
 
 <template>
   <div class="toolbar">
-    <div class="tTitle">公司活動</div>
+    <div class="tTitle">{{ $t('Social.activity')}}</div>
   </div>
   <div class="content">
     <div>

web/pages/social/news/detail/[id].vue

@@ -18,7 +18,8 @@ const { data: newsRes } = await useMyFetch('/social/getNews', "GET", {id: route.
       <!-- <div class="imgCnt me-4 mb-4" style="float: left;width:350px;">
         <img :src="newsData.imageurl" alt="">
       </div> -->
-      <div class="desc" v-html="newsData.content">
+      <div class="desc">
+        <div class="ck-content" v-html="newsData.content"></div>
       </div>
       <div class="d-flex justify-content-end">
         <a class="backBtn" href="javascript:;" @click="$router.push(localeLocation('/social/news'))">back</a>