diff --git a/conf/global.go b/conf/global.go index 747408e..bd18501 100644 --- a/conf/global.go +++ b/conf/global.go @@ -37,9 +37,6 @@ type Config struct { // FTP文件服务 FTPRoot string `json:"ftp_root"` - // 登录认证公钥 - PublicKey string `json:"public_key"` - //证书配置 CA struct { RootCert string `json:"root_cert"` //root CA证书存放路径 @@ -76,7 +73,7 @@ func Init(path string) { if err != nil { pwd = "." } - path = pwd + "/conf/nbi_alarm_agent.json" + path = pwd + "/conf/nbi_alarm.json" fmt.Println("path", path) } diff --git a/conf/nbi_alarm_agent.json b/conf/nbi_alarm.json similarity index 94% rename from conf/nbi_alarm_agent.json rename to conf/nbi_alarm.json index 59ea4bd..c04a59e 100644 --- a/conf/nbi_alarm_agent.json +++ b/conf/nbi_alarm.json @@ -20,8 +20,6 @@ "ftp_root": "/data/ftp", - "public_key":"./conf/public.txt", - "ca":{ "root_cert":"ca/CA/demoCA/cacert.pem", "cert":"/ca/CA/certs/test1.crt", diff --git a/conf/private.txt b/conf/private.txt deleted file mode 100644 index 3017ca0..0000000 --- a/conf/private.txt +++ /dev/null @@ -1,13 +0,0 @@ -MIICXAIBAAKBgQCszlmrPvlvxuwnT4Gu8eZPJNvNJdxjow58QL/y+vGdQB+wMWlV -hBUSLTs9FgUjn5P6iMpsHGOxIz6+mvG6DMylL+7rlNbGMpBUYeTJEVxXeP+fZL96 -5PELyp49rRkRmQJMNFgborpsxDn1oeACnD/kfnQwK+yeolIMA+9E/fOQEwIDAQAB -AoGAZS+jM/H5DymUyGP21ODScg9sIVEFHtawubMUcovchK6yn3IfcrKXv//6Swek -1LoxZSdKGEn7WhMAP43s83thLHXcaBg2+0RNCnM8kSYfitChSoSH+SvgSXNUWMCx -5yWVqMS5nY0NC+G2ItPZCCc1yXD2W5hvz0NR3RaA5g+ZMyECQQDhikbVveI8X+Gt -5lpgcSqMruDL/1J4xuHdmGMklrq8NOYgy5DBXscXwSOGud4Ws3CDvAQFZa8kS8jF -u2TL07nxAkEAxCTedbxSATiWnjMXPHi4rEXjyetay9t2tIAxV8J7bE3A1u1NvG4S -rEdDzo2riN1SRAkAWZq0Jx0bsCgrydJGQwJBAMag1dNlwDm1o3ZYeV2YLIXreZSP -Dp3JYZ+bliziBiC8YbOeM6TpCGPWN6huRrYtX7jUu6HZNI69o1rot1N+6rECQFbs -z/n1f5Iy9e0eT0npZk5SmuS9fPujQzQzK6rs8a3Jt5CIkk7TqUrYOmCrwD1jeDXW -l2UefoBnEgI7i0xh9+kCQG+YTC4FIv3alnGwIdsOqEEUJe1pyp+9GrtTnzS0BZx8 -QONLs1nG+J8QVGDjwOXyH/z9uxh8xJIwMyOpC5Gy9EQ= \ No newline at end of file diff --git a/conf/public.txt b/conf/public.txt deleted file mode 100644 index 4cc8a1b..0000000 --- a/conf/public.txt +++ /dev/null @@ -1,3 +0,0 @@ -MIGJAoGBAKzOWas++W/G7CdPga7x5k8k280l3GOjDnxAv/L68Z1AH7AxaVWEFRIt -Oz0WBSOfk/qIymwcY7EjPr6a8boMzKUv7uuU1sYykFRh5MkRXFd4/59kv3rk8QvK -nj2tGRGZAkw0WBuiumzEOfWh4AKcP+R+dDAr7J6iUgwD70T985ATAgMBAAE= \ No newline at end of file