|
@@ -29,6 +29,13 @@ public class DatabaseInitializer implements CommandLineRunner {
|
|
|
|
|
|
|
|
private static final Logger log = LoggerFactory.getLogger(DatabaseInitializer.class);
|
|
private static final Logger log = LoggerFactory.getLogger(DatabaseInitializer.class);
|
|
|
|
|
|
|
|
|
|
+ /** 迁移是否已全部完成(供定时任务判断,避免启动期时序竞态) */
|
|
|
|
|
+ private static volatile boolean migrationsComplete = false;
|
|
|
|
|
+
|
|
|
|
|
+ public static boolean isMigrationsComplete() {
|
|
|
|
|
+ return migrationsComplete;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
@Resource
|
|
@Resource
|
|
|
private JdbcTemplate jdbcTemplate;
|
|
private JdbcTemplate jdbcTemplate;
|
|
|
|
|
|
|
@@ -63,6 +70,7 @@ public class DatabaseInitializer implements CommandLineRunner {
|
|
|
log.info("init-test-data=false,跳过测试/种子数据初始化(生产模式)");
|
|
log.info("init-test-data=false,跳过测试/种子数据初始化(生产模式)");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ migrationsComplete = true;
|
|
|
log.info("数据库初始化完成!");
|
|
log.info("数据库初始化完成!");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -11074,7 +11082,7 @@ log.info("迁移298: 已为无 openid 的 child 账号补齐 family_members 记
|
|
|
"popup_id BIGINT NOT NULL COMMENT '关联 guide_popup.id', " +
|
|
"popup_id BIGINT NOT NULL COMMENT '关联 guide_popup.id', " +
|
|
|
"step_order INT NOT NULL DEFAULT 0 COMMENT '步骤顺序', " +
|
|
"step_order INT NOT NULL DEFAULT 0 COMMENT '步骤顺序', " +
|
|
|
"title VARCHAR(128) NOT NULL DEFAULT '' COMMENT '步骤标题', " +
|
|
"title VARCHAR(128) NOT NULL DEFAULT '' COMMENT '步骤标题', " +
|
|
|
- "desc TEXT COMMENT '步骤描述', " +
|
|
|
|
|
|
|
+ "`desc` TEXT COMMENT '步骤描述', " +
|
|
|
"icon VARCHAR(256) NOT NULL DEFAULT '' COMMENT '步骤图标', " +
|
|
"icon VARCHAR(256) NOT NULL DEFAULT '' COMMENT '步骤图标', " +
|
|
|
"icon_type TINYINT NOT NULL DEFAULT 0 COMMENT '图标类型:0=emoji 1=图片', " +
|
|
"icon_type TINYINT NOT NULL DEFAULT 0 COMMENT '图标类型:0=emoji 1=图片', " +
|
|
|
"is_intro TINYINT NOT NULL DEFAULT 0 COMMENT '是否为开场身份定义页', " +
|
|
"is_intro TINYINT NOT NULL DEFAULT 0 COMMENT '是否为开场身份定义页', " +
|