From bac3da7d8f7193c2efd2e5df8254b49bb32df982 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Tue, 11 Feb 2025 15:32:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../software/backup/pojo/BackupPro.java | 13 ++++++++-- .../src/main/resources/application.yml | 5 ++-- .../src/main/resources/application.properties | 26 ++++++++++--------- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/pojo/BackupPro.java b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/pojo/BackupPro.java index c690ea4..b4c5814 100644 --- a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/pojo/BackupPro.java +++ b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/pojo/BackupPro.java @@ -1,10 +1,10 @@ package com.electromagnetic.industry.software.backup.pojo; -import lombok.Data; +import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; -@Data +@Setter @Component @ConfigurationProperties(prefix = "ele.backup") public class BackupPro { @@ -13,4 +13,13 @@ public class BackupPro { private String logPath; + private String winPrefix; + + public String getSaveFolder() { + return System.getProperty("os.name").toLowerCase().startsWith("win") ? winPrefix + saveFolder : saveFolder; + } + + public String getLogPath() { + return System.getProperty("os.name").toLowerCase().startsWith("win") ? winPrefix + logPath : logPath; + } } diff --git a/electrmangnetic-backup/src/main/resources/application.yml b/electrmangnetic-backup/src/main/resources/application.yml index 1999a62..cfe6996 100644 --- a/electrmangnetic-backup/src/main/resources/application.yml +++ b/electrmangnetic-backup/src/main/resources/application.yml @@ -1,8 +1,9 @@ ele: backup: - saveFolder: "E:/szsd/ele/data/backup/" - logPath: "E:/szsd/ele/data/backup.log" + saveFolder: "/szsd/ele/data/backup/" + logPath: "/szsd/ele/data/backup.log" + winPrefix: "D:/tmp" spring: servlet: diff --git a/electrmangnetic/src/main/resources/application.properties b/electrmangnetic/src/main/resources/application.properties index b63fb91..e364943 100644 --- a/electrmangnetic/src/main/resources/application.properties +++ b/electrmangnetic/src/main/resources/application.properties @@ -1,25 +1,27 @@ #required spring.application.name=electromagnetic-data spring.datasource.typd=com.alibaba.druid.pool.DruidDataSource -spring.datasource.url=jdbc:mysql://139.224.43.89:3306/em_data?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true -spring.datasource.username=comac -spring.datasource.password=2024*Comac +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/em_data_dev?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true +spring.datasource.username=user +spring.datasource.password=123123 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.type=com.alibaba.druid.pool.DruidDataSource mybatis-plus.mapper-locations=classpath:sqlmapper/*.xml mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl spring.servlet.multipart.max-file-size=500MB -spring.servlet.multipart.max-request-size=10MB +spring.servlet.multipart.max-request-size=500MB pagehelper.helperDialect=mysql pagehelper.reasonable=false -server.port=12395 -file.security.passwd=adknfhkj87654knd +server.port=12396 #windows文件存储目录,用于测试 -data.windows.path=D:/tmp/eleData/project/ -data.linux.path=/szsd/data/eleData/project/ -data.upload.windows.tmp.path=D:/tmp/eleData/upload/ -data.upload.linux.tmp.path=/szsd/data/eleData/upload/ -data.download.windows.tmp.path=D:/tmp/eleData/download/ -data.download.linux.tmp.path=/szsd/data/eleData/download/ +data.windows.path=D:/tmp/szsd/data/eleData/dev/project/ +data.upload.windows.tmp.path=D:/tmp/szsd/data/eleData/dev/upload/ +data.download.windows.tmp.path=D:/tmp/szsd/data/eleData/dev/download/ + +data.linux.path=/szsd/data/eleData/dev/project/ +data.upload.linux.tmp.path=/szsd/data/eleData/dev/upload/ +data.download.linux.tmp.path=/szsd/data/eleData/dev/download/ + prj.folder.max.length=6 +spring.jackson.time-zone=GMT+8 \ No newline at end of file