From 0b98d0abb4ed54fe70d7931b27fe87e9a0d8f6d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com>
Date: Thu, 11 May 2023 16:12:27 +0800
Subject: [PATCH] =?UTF-8?q?perf=EF=BC=9A=E9=83=A8=E7=BD=B2=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml                                         | 10 ++++++++++
 .../com/tiesheng/demo/controller/TestController.java   |  6 ++++--
 .../com/tiesheng/database/config/DbBackupConfig.java   |  8 ++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52409f1..00fe43e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,16 @@ stages:
   - deploy
   - package
 
+build-jar:
+  stage: deploy
+  tags:
+    - hzkepai
+  rules:
+    - if: $CI_COMMIT_BRANCH == "master"
+  script:
+    - mvn clean package -Dmaven.test.skip=true
+    - cp target/*.jar /usr/local/nginx/html/demo.tmp.kepai365.ltd/
+
 deploy-jar:
   stage: deploy
   tags:
diff --git a/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java b/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java
index d205ff6..2b6f290 100644
--- a/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java
+++ b/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java
@@ -13,6 +13,7 @@ import com.tiesheng.annotation.token.TokenIgnore;
 import com.tiesheng.core.service.CoreLogService;
 import com.tiesheng.core.service.CoreMessageService;
 import com.tiesheng.core.util.ProcessImportConsumer;
+import com.tiesheng.database.config.DbBackupConfig;
 import com.tiesheng.demo.pojos.PoiBean;
 import com.tiesheng.demo.pojos.TestFile;
 import com.tiesheng.login.config.token.TsTokenConfig;
@@ -51,13 +52,14 @@ public class TestController {
     CoreMessageService coreMessageService;
     @Autowired
     CoreLogService coreLogService;
+    @Autowired
+    DbBackupConfig dbBackupConfig;
 
 
     @RequestMapping("/index")
     public ApiResp<String> index() {
 
-        TokenBean tokenBean = new TokenBean("11", "", "fdfd");
-        LogFactory.get().info(tokenBean.toToken());
+        dbBackupConfig.dbBackup();
 
         return ApiResp.respOK("hello world");
     }
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 ad8f894..9ca4981 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
@@ -22,7 +22,7 @@ public class DbBackupConfig {
     /**
      * 数据库备份的路径
      */
-    private String path = "/root/backup/";
+    private String path = "/Users/hao/Downloads/backup/";
 
     /**
      * 备份文件的时间格式
@@ -30,6 +30,9 @@ public class DbBackupConfig {
     private String format = "yyyyMMdd";
 
 
+    /**
+     * 数据库备份
+     */
     public void dbBackup() {
         String url = SpringUtil.getProperty("spring.datasource.url");
         String username = SpringUtil.getProperty("spring.datasource.username");
@@ -45,7 +48,8 @@ public class DbBackupConfig {
             LogFactory.get().info("dbBackup: " + forStr);
             forStr = RuntimeUtil.execForStr(password);
             LogFactory.get().info("dbBackup: " + forStr);
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            LogFactory.get().info(e);
         }
 
     }