diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37ef96e..ccfd08d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,3 +17,13 @@ deploy-jar: - git commit -m "deploy $CI_PROJECT_NAME $CI_COMMIT_TAG" - git push origin master +build-jar: + stage: package + tags: + - hzkepai + rules: + - if: $CI_COMMIT_BRANCH == "master" + script: + - mvn clean package -Dmaven.test.skip=true + - cd springboot-ademo + - nohup java -Xms=64m -Xmx=64m -Dspring.profiles.active=test -jar springboot-ademo-1.0.0.jar diff --git a/springboot-ademo/src/main/resources/application.yml b/springboot-ademo/src/main/resources/application.yml index 42c80f9..0c95fe3 100644 --- a/springboot-ademo/src/main/resources/application.yml +++ b/springboot-ademo/src/main/resources/application.yml @@ -1,6 +1,7 @@ server: compression: enabled: true + port: 8100 ## Spring配置 spring: diff --git a/springboot-database/src/main/java/com/tiesheng/database/config/DbBackupConfig.java b/springboot-database/src/main/java/com/tiesheng/database/config/DbBackupConfig.java index e7f9e30..75fb6ee 100644 --- a/springboot-database/src/main/java/com/tiesheng/database/config/DbBackupConfig.java +++ b/springboot-database/src/main/java/com/tiesheng/database/config/DbBackupConfig.java @@ -1,9 +1,11 @@ package com.tiesheng.database.config; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.RuntimeUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; +import com.tiesheng.database.utls.TieshengDbUtil; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; @@ -33,10 +35,12 @@ public class DbBackupConfig { String url = SpringUtil.getProperty("spring.datasource.url"); String username = SpringUtil.getProperty("spring.datasource.username"); String password = SpringUtil.getProperty("spring.datasource.password"); + String dbName = TieshengDbUtil.getTableSchema(url); try { - RuntimeUtil.exec(StrUtil.format("mysqldump -u{} -p{} {} > {}{}.sql", username, password, username, - getPath(), DateUtil.format(new Date(), format) + String saveFile = StrUtil.format("{}{}/{}.sql", getPath(), dbName, DateUtil.format(new Date(), format)); + FileUtil.mkParentDirs(saveFile); + RuntimeUtil.exec(StrUtil.format("mysqldump -u{} -p{} {} > {}", username, password, dbName, saveFile )); } catch (Exception ignored) { } diff --git a/springboot-database/src/main/java/com/tiesheng/database/utls/TieshengDbUtil.java b/springboot-database/src/main/java/com/tiesheng/database/utls/TieshengDbUtil.java new file mode 100644 index 0000000..ef23b9a --- /dev/null +++ b/springboot-database/src/main/java/com/tiesheng/database/utls/TieshengDbUtil.java @@ -0,0 +1,17 @@ +package com.tiesheng.database.utls; + +import cn.hutool.core.util.StrUtil; + +public class TieshengDbUtil { + + /** + * 通过url获取table_schema + * + * @param url + * @return + */ + public static String getTableSchema(String url) { + return StrUtil.sub(url, url.lastIndexOf('/') + 1, StrUtil.indexOf(url, '?')); + } + +}