diff --git a/src/common/conf/options.go b/src/common/conf/options.go index 36e0d11ac72086b1aeb91195c602d5b3416e62a6..06e1a5671e1ace04fc7b18501f1cfad0be40a2ba 100644 --- a/src/common/conf/options.go +++ b/src/common/conf/options.go @@ -30,7 +30,7 @@ type Config struct { MinioAccessKey string MinioSecretKey string MinioBucket string - TempDirPrefix string + //TempDirPrefix string PrometheusHost string } diff --git a/src/controller/host_manage.go b/src/controller/host_manage.go index f5152bde86169f2f36b8ac22556031316368c088..070363b0d59d2285cc6830f93753ebeb4f210f27 100644 --- a/src/controller/host_manage.go +++ b/src/controller/host_manage.go @@ -7,7 +7,6 @@ import ( json "github.com/json-iterator/go" "github.com/spf13/cast" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/bean/vo/request" - "gitlab.wodcloud.com/smart-operation/so-operation-api/src/common/conf" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/pkg/beagle/resp" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/service" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/util" @@ -390,7 +389,7 @@ func ExportIp(c *gin.Context) { c.Writer.Header().Add("Content-Transfer-Encoding", "binary") c.Writer.Header().Add("Content-Disposition", "filename="+fileName) - c.File(conf.Options.TempDirPrefix + fileName) + c.File("/app/xlsx/" + fileName) } // ListHostManage 列表 diff --git a/src/main.go b/src/main.go index 8023ec2dd0f6d3055ea253313e9912ec6288dffc..a3d132fd05e2e640ec2469aa31557f15ccf7ecf3 100644 --- a/src/main.go +++ b/src/main.go @@ -60,17 +60,17 @@ func initConfig() { RedisURL: util.SetEnvStr("REDIS_URL", "localhost:7001"), RedisDB: 0, RedisTag: "bg", - LogDirPrefix: util.SetEnvStr("LOG_DIR_PREFIX", "/app/log"), // 日志目录 - LogDirName: util.SetEnvStr("LOG_NAME", "syslog"), // 日志名称 - LogSaveDays: util.SetEnvInt("LOG_SAVE_DAYS", 7), // 日志最大存储天数 - LogMode: util.SetEnvInt("LOG_MODE", 1), // 1.标准打印 2.输出文件 - ArgBool: util.SetEnvBool("ARG_BOOL", false), // 示例参数 - ArgInt: util.SetEnvInt("ARG_INT", 10), // 示例参数 - MinioServer: util.SetEnvStr("MINIO_SERVER", "https://cache.wodcloud.com"), // Minio 服务地址 - MinioAccessKey: util.SetEnvStr("MINIO_ACCESS_KEY", "beagleadmin"), // Minio Access Key - MinioSecretKey: util.SetEnvStr("MINIO_SECRET_KEY", "H76cPmwvH7vJ"), // Minio Secret - MinioBucket: util.SetEnvStr("MINIO_BUCKET", "so-operation"), // Minio Bucket - TempDirPrefix: util.SetEnvStr("TEMP_DIR_PREFIX", "/app/xlsx/"), //模板目录前缀 + LogDirPrefix: util.SetEnvStr("LOG_DIR_PREFIX", "/app/log"), // 日志目录 + LogDirName: util.SetEnvStr("LOG_NAME", "syslog"), // 日志名称 + LogSaveDays: util.SetEnvInt("LOG_SAVE_DAYS", 7), // 日志最大存储天数 + LogMode: util.SetEnvInt("LOG_MODE", 1), // 1.标准打印 2.输出文件 + ArgBool: util.SetEnvBool("ARG_BOOL", false), // 示例参数 + ArgInt: util.SetEnvInt("ARG_INT", 10), // 示例参数 + MinioServer: util.SetEnvStr("MINIO_SERVER", "https://cache.wodcloud.com"), // Minio 服务地址 + MinioAccessKey: util.SetEnvStr("MINIO_ACCESS_KEY", "beagleadmin"), // Minio Access Key + MinioSecretKey: util.SetEnvStr("MINIO_SECRET_KEY", "H76cPmwvH7vJ"), // Minio Secret + MinioBucket: util.SetEnvStr("MINIO_BUCKET", "so-operation"), // Minio Bucket + //TempDirPrefix: util.SetEnvStr("TEMP_DIR_PREFIX", "/app/xlsx/"), //模板目录前缀 PrometheusHost: util.SetEnvStr("PROMETHEUS_HOST", "https://prometheus.wodcloud.com"), // Prometheus Host } } @@ -132,7 +132,7 @@ func initAnsibleHosts() { } func initTempDirPrefix() { - err := os.Mkdir(conf.Options.TempDirPrefix, os.ModePerm) + err := os.Mkdir("/app/xlsx/", os.ModePerm) if err != nil { fmt.Println("创建目录失败!") } diff --git a/src/service/host_manage.go b/src/service/host_manage.go index 8f52c7632ac92ff1fc0cf8ef1b571be9befcfc1c..93a28060b1d513bcd6671fff129c696e4b5da320 100644 --- a/src/service/host_manage.go +++ b/src/service/host_manage.go @@ -10,7 +10,6 @@ import ( "gitlab.wodcloud.com/smart-operation/so-operation-api/src/bean/vo/request" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/bean/vo/response" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/common/client" - "gitlab.wodcloud.com/smart-operation/so-operation-api/src/common/conf" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/common/tools" "gitlab.wodcloud.com/smart-operation/so-operation-api/src/pkg/beagle/resp" "os/exec" @@ -670,7 +669,7 @@ func generatePushExportXlsx(push []ExportIpStr) (string, error) { } saveFileName := "IP列表导出数据.xlsx" - err := file.Save(conf.Options.TempDirPrefix + saveFileName) + err := file.Save("/app/xlsx/" + saveFileName) return saveFileName, err }