🚧 Fix init mysql data failed of the docker-compose install

opsre · Nov 26, 2024 · 310e3fe · 310e3fe
1 parent 9066b69
commit 310e3fe
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 36 deletions.
diff --git a/config/config.yaml b/config/config.yaml
@@ -4,15 +4,15 @@ Server:
   mode: "release"
 
 MySQL:
-  host: 127.0.0.1
+  host: w8t-mysql
   port: 3306
   user: root
   pass: w8t.123
   dbName: watchalert
   timeout: 10s
 
 Redis:
-  host: 127.0.0.1
+  host: w8t-redis
   port: 6379
   pass: ""
 

diff --git a/deploy/docker-compose/config/config.yaml b/deploy/docker-compose/config/config.yaml
diff --git a/deploy/docker-compose/docker-compose.yaml b/deploy/docker-compose/docker-compose.yaml
@@ -71,10 +71,11 @@ services:
       - ../sql:/sql
     environment:
       - TZ=Asia/Shanghai
+      - MYSQL_HOST=w8t-mysql
       - MYSQL_ROOT_PASSWORD=w8t.123
       - MYSQL_DATABASE=watchalert
     restart: on-failure
-    command: ["sh", "-c", "/sql/auto_import.sh"]
+    command: ["sh", "-c", "chmod +x /sql/auto_import.sh; /sql/auto_import.sh"]
     depends_on:
       - w8t-mysql
       - w8t-service

diff --git a/deploy/sql/auto_import.sh b/deploy/sql/auto_import.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
-mysql -h w8t-mysql -u root -pw8t.123 --default-character-set=utf8mb4 -D watchalert < /sql/notice_template_examples.sql
-mysql -h w8t-mysql -u root -pw8t.123 --default-character-set=utf8mb4 -D watchalert < /sql/rule_template_groups.sql
-mysql -h w8t-mysql -u root -pw8t.123 --default-character-set=utf8mb4 -D watchalert < /sql/rule_templates.sql
-mysql -h w8t-mysql -u root -pw8t.123 --default-character-set=utf8mb4 -D watchalert < /sql/user_roles.sql
-mysql -h w8t-mysql -u root -pw8t.123 --default-character-set=utf8mb4 -D watchalert < /sql/tenants.sql
-mysql -h w8t-mysql -u root -pw8t.123 --default-character-set=utf8mb4 -D watchalert < /sql/tenants_linked_users.sql
+mysql -h ${MYSQL_HOST} -u root -p${MYSQL_ROOT_PASSWORD} --default-character-set=utf8mb4 -D ${MYSQL_DATABASE} < /sql/notice_template_examples.sql
+mysql -h ${MYSQL_HOST} -u root -p${MYSQL_ROOT_PASSWORD} --default-character-set=utf8mb4 -D ${MYSQL_DATABASE} < /sql/rule_template_groups.sql
+mysql -h ${MYSQL_HOST} -u root -p${MYSQL_ROOT_PASSWORD} --default-character-set=utf8mb4 -D ${MYSQL_DATABASE} < /sql/rule_templates.sql
+mysql -h ${MYSQL_HOST} -u root -p${MYSQL_ROOT_PASSWORD} --default-character-set=utf8mb4 -D ${MYSQL_DATABASE} < /sql/tenants.sql
+mysql -h ${MYSQL_HOST} -u root -p${MYSQL_ROOT_PASSWORD} --default-character-set=utf8mb4 -D ${MYSQL_DATABASE} < /sql/tenants_linked_users.sql
diff --git a/deploy/sql/user_roles.sql b/deploy/sql/user_roles.sql
diff --git a/initialization/sql.go b/initialization/sql.go
@@ -6,7 +6,6 @@ import (
 	"time"
 	"watchAlert/internal/models"
 	"watchAlert/pkg/ctx"
-	"watchAlert/pkg/tools"
 )
 
 var perms []models.UserPermissions
@@ -28,7 +27,7 @@ func InitUserRolesSQL(ctx *ctx.Context) {
 	var db = ctx.DB.DB().Model(&models.UserRole{})
 
 	roles := models.UserRole{
-		ID:          "ur-" + tools.RandId(),
+		ID:          "admin",
 		Name:        "admin",
 		Description: "system",
 		Permissions: perms,