diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index a185769..0acaa09 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -163,6 +163,8 @@ jobs: admin-password: ${{ secrets.GRAFANA_ADMIN_PASSWORD }} EOF + $KUBECTL -n ecommerce wait --for=condition=Ready pod -l app=mysql --timeout=10m + TAG="${{ env.IMAGE_TAG }}" REGISTRY="crpi-crgxq2ovcvhcn869.cn-chengdu.personal.cr.aliyuncs.com/maonamao" diff --git a/k8s/ecommerce/02-mysql-initdb-configmap.yml b/k8s/ecommerce/02-mysql-initdb-configmap.yml index fd927f4..1a91484 100644 --- a/k8s/ecommerce/02-mysql-initdb-configmap.yml +++ b/k8s/ecommerce/02-mysql-initdb-configmap.yml @@ -8,6 +8,8 @@ data: CREATE DATABASE IF NOT EXISTS docker_last_work CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; USE docker_last_work; + SET NAMES utf8mb4; + CREATE TABLE IF NOT EXISTS products ( id BIGINT NOT NULL AUTO_INCREMENT, name VARCHAR(255) NOT NULL, @@ -24,7 +26,7 @@ data: TRUNCATE TABLE products; INSERT INTO products (name, description, price, stock, category, image_url, created_at, updated_at) VALUES - ('iPhone 14', '苹果最新款手机', 6999.00, 100, '手机数码', 'https://store.storeimages.cdn-apple.com/8756/as-images.apple.com/is/iphone-14-pro-model-unselect-gallery-2-202209?wid=5120&hei=2880&fmt=p-jpg&qlt=80&.v=1660753617553', NOW(), NOW()), - ('小米电视 4K', '55英寸4K超高清智能电视', 2999.00, 50, '家用电器', 'https://cdn.cnbj1.fds.api.mi-img.com/mi-mall/0a89c9e76d61ad33a3ab99065e828715.jpg', NOW(), NOW()), - ('华为笔记本电脑', 'MateBook 14 2023款', 5999.00, 30, '电脑办公', 'https://consumer-img.huawei.com/content/dam/huawei-cbg-site/common/mkt/pdp/pc/matebook-14-2022/img/pc-section1-banner.jpg', NOW(), NOW()), - ('耐克运动鞋', 'Air Max 270 气垫跑鞋', 899.00, 200, '运动户外', 'https://static.nike.com/a/images/t_PDP_1728_v1/f_auto,q_auto:eco/awjogtdnqxniot40d4ne/air-max-270-mens-shoes-KkLcGR.png', NOW(), NOW()); + ('iPhone 14', '苹果最新款手机', 6999.00, 100, '手机数码', 'https://picsum.photos/seed/iphone14/600/400', NOW(), NOW()), + ('小米电视 4K', '55英寸4K超高清智能电视', 2999.00, 50, '家用电器', 'https://picsum.photos/seed/xiaomi-tv/600/400', NOW(), NOW()), + ('华为笔记本电脑', 'MateBook 14 2023款', 5999.00, 30, '电脑办公', 'https://picsum.photos/seed/huawei-laptop/600/400', NOW(), NOW()), + ('耐克运动鞋', 'Air Max 270 气垫跑鞋', 899.00, 200, '运动户外', 'https://picsum.photos/seed/nike-shoes/600/400', NOW(), NOW()); diff --git a/k8s/ecommerce/05-mysql-statefulset.yml b/k8s/ecommerce/05-mysql-statefulset.yml index b909c1b..604b969 100644 --- a/k8s/ecommerce/05-mysql-statefulset.yml +++ b/k8s/ecommerce/05-mysql-statefulset.yml @@ -16,7 +16,7 @@ spec: spec: containers: - name: mysql - image: registry.cn-hangzhou.aliyuncs.com/library/mysql:8.0 + image: crpi-crgxq2ovcvhcn869.cn-chengdu.personal.cr.aliyuncs.com/maonamao/mysql:8.0 ports: - name: mysql containerPort: 3306 diff --git a/mysql/init/schema.sql b/mysql/init/schema.sql index 111f673..04be018 100644 --- a/mysql/init/schema.sql +++ b/mysql/init/schema.sql @@ -2,6 +2,8 @@ CREATE DATABASE IF NOT EXISTS docker_last_work CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; USE docker_last_work; +SET NAMES utf8mb4; + -- 创建products表(如果不存在) CREATE TABLE IF NOT EXISTS products ( id BIGINT NOT NULL AUTO_INCREMENT, @@ -21,7 +23,7 @@ TRUNCATE TABLE products; -- 插入示例数据(使用UTF-8编码) INSERT INTO products (name, description, price, stock, category, image_url, created_at, updated_at) VALUES -('iPhone 14', '苹果最新款手机', 6999.00, 100, '手机数码', 'https://store.storeimages.cdn-apple.com/8756/as-images.apple.com/is/iphone-14-pro-model-unselect-gallery-2-202209?wid=5120&hei=2880&fmt=p-jpg&qlt=80&.v=1660753617553', NOW(), NOW()), -('小米电视 4K', '55英寸4K超高清智能电视', 2999.00, 50, '家用电器', 'https://cdn.cnbj1.fds.api.mi-img.com/mi-mall/0a89c9e76d61ad33a3ab99065e828715.jpg', NOW(), NOW()), -('华为笔记本电脑', 'MateBook 14 2023款', 5999.00, 30, '电脑办公', 'https://consumer-img.huawei.com/content/dam/huawei-cbg-site/common/mkt/pdp/pc/matebook-14-2022/img/pc-section1-banner.jpg', NOW(), NOW()), -('耐克运动鞋', 'Air Max 270 气垫跑鞋', 899.00, 200, '运动户外', 'https://static.nike.com/a/images/t_PDP_1728_v1/f_auto,q_auto:eco/awjogtdnqxniot40d4ne/air-max-270-mens-shoes-KkLcGR.png', NOW(), NOW()); +('iPhone 14', '苹果最新款手机', 6999.00, 100, '手机数码', 'https://picsum.photos/seed/iphone14/600/400', NOW(), NOW()), +('小米电视 4K', '55英寸4K超高清智能电视', 2999.00, 50, '家用电器', 'https://picsum.photos/seed/xiaomi-tv/600/400', NOW(), NOW()), +('华为笔记本电脑', 'MateBook 14 2023款', 5999.00, 30, '电脑办公', 'https://picsum.photos/seed/huawei-laptop/600/400', NOW(), NOW()), +('耐克运动鞋', 'Air Max 270 气垫跑鞋', 899.00, 200, '运动户外', 'https://picsum.photos/seed/nike-shoes/600/400', NOW(), NOW());