Merge pull request #35 from dromara/dev

Dev
dromara · Jun 27, 2024 · 5e7b7eb · 5e7b7eb
2 parents 1eb07d0 + 8d85cdf
commit 5e7b7eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -11,12 +11,12 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  test:
+  testing:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: E2E Testing
         run: |
           sudo curl -L https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
           sudo chmod u+x /usr/local/bin/docker-compose
-          docker compose up --build testing --exit-code-from testing --remove-orphans -f docker-compose-testing.yml
+          docker compose -f docker-compose-testing.yml up --build testing --exit-code-from testing --remove-orphans
diff --git a/sql/init-2-schema-tables.sql b/sql/init-2-schema-tables.sql
@@ -597,7 +597,7 @@ CREATE TABLE `preference`
 (
     `id`          bigint(0)                                                    NOT NULL AUTO_INCREMENT COMMENT 'id',
     `user_id`     bigint(0)                                                    NULL DEFAULT NULL COMMENT '用户id',
-    `type`        char(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci    NULL DEFAULT NULL COMMENT '偏好类型',
+    `type`        char(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci    NULL DEFAULT NULL COMMENT '偏好类型',
     `item`        varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '配置项',
     `value`       json                                                         NULL COMMENT '配置值',
     `create_time` datetime(0)                                                  NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',