Merge branch 'developing' into team

This commit is contained in:
JiaJu Zhuang
2023-07-30 16:04:13 +08:00
11 changed files with 141 additions and 71 deletions

View File

@ -4,7 +4,6 @@ import ai.chat2db.server.tools.common.model.ConfigJson;
import ai.chat2db.server.tools.common.util.ConfigUtils;
import com.dtflys.forest.springboot.annotation.ForestScan;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
@ -37,7 +36,7 @@ public class Application {
// Represents that the current version has been successfully launched
if (StringUtils.isNotBlank(currentVersion) && StringUtils.equals(currentVersion, configJson.getLatestStartupSuccessVersion())) {
// Flyway doesn't need to start every time to increase startup speed
args = ArrayUtils.add(args, "--spring.flyway.enabled=false");
//args = ArrayUtils.add(args, "--spring.flyway.enabled=false");
log.info("The current version {} has been successfully launched once and will no longer load Flyway.",
currentVersion);
}

View File

@ -37,13 +37,13 @@ public class MybatisGeneratorTest extends BaseTest {
private void doGenerator(List<String> tableList) {
// 当前项目地址 拿到的是ali-dbhub-server-start地址
// 当前项目地址 拿到的是chat2db-server-start地址
String outputDir = System.getProperty("user.dir")
+ "/../ali-dbhub-server-domain/ali-dbhub-server-domain-repository/src/main"
+ "/../chat2db-server-domain/chat2db-server-domain-repository/src/main"
+ "/java";
String xmlDir = System.getProperty("user.dir")
+ "/../ali-dbhub-server-domain/ali-dbhub-server-domain-repository/src/main"
+ "/resources/com/alibaba/dbhub/server/domain/repository";
+ "/../chat2db-server-domain/chat2db-server-domain-repository/src/main"
+ "/resources/ai/chat2db/server/domain/repository";
// 不要生成service controller
Map<OutputFile, String> pathInfo = new HashMap<>();
@ -58,7 +58,7 @@ public class MybatisGeneratorTest extends BaseTest {
//全局配置
.globalConfig(builder -> {
// 设置作者
builder.author("ali-dbhub")
builder.author("chat2db")
//执行完毕不打开文件夹
.disableOpenDir()
// 指定输出目录