From 573bb7d3e69bfeef230442e85ab4b944c58997a0 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Thu, 24 Oct 2024 18:33:30 +0800 Subject: [PATCH] change git local root directory --- .vscode/launch.json | 10 +++++----- captrace/etc/capconf.yaml | 2 +- crontask/etc/crontask.yaml | 4 ++-- makefile | 2 +- mkpkg.sh | 2 +- restagent/etc/restconf-t.yaml | 10 +++++----- restagent/etc/restconf.yaml | 6 +++--- sshsvc/etc/sshsvc.yaml | 4 ++-- tools/misc/dumpdb.sh | 2 +- tools/misc/dumpsql.sh | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 3ce5d98b..fd457359 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -18,7 +18,7 @@ "type": "go", "request": "launch", "mode": "debug", - "program": "d:/local.git/be.ems/restagent/", + "program": "d:/omc.git/be.ems/restagent/", "console": "integratedTerminal" }, { @@ -26,7 +26,7 @@ "type": "go", "request": "launch", "mode": "debug", - "program": "d:/local.git/be.ems/sshsvc/sshsvc.go", + "program": "d:/omc.git/be.ems/sshsvc/sshsvc.go", "console": "integratedTerminal" }, { @@ -34,7 +34,7 @@ "type": "go", "request": "launch", "mode": "debug", - "program": "d:/local.git/be.ems/tools/loadpconf", + "program": "d:/omc.git/be.ems/tools/loadpconf", "args": ["-p","../../config/param/smf_param_config.yaml"], "console": "integratedTerminal" }, @@ -43,7 +43,7 @@ "type": "go", "request": "launch", "mode": "debug", - "program": "d:/local.git/be.ems/crontask", + "program": "d:/omc.git/be.ems/crontask", "console": "integratedTerminal" }, { @@ -51,7 +51,7 @@ "type": "go", "request": "launch", "mode": "debug", - "program": "d:/local.git/be.ems/tools/encode", + "program": "d:/omc.git/be.ems/tools/encode", //"args": ["-p","../../config/param/smf_param_config.yaml"], "console": "integratedTerminal" } diff --git a/captrace/etc/capconf.yaml b/captrace/etc/capconf.yaml index 42c92214..190bb0a2 100644 --- a/captrace/etc/capconf.yaml +++ b/captrace/etc/capconf.yaml @@ -2,7 +2,7 @@ # level: /trace/debug/info/error/warn/error/fatal, default: debug # duration: saved days, default is 30 days logger: - file: d:/local.git/be.ems/captrace/log/captrace.log + file: d:/omc.git/be.ems/captrace/log/captrace.log level: trace duration: 24 count: 10 diff --git a/crontask/etc/crontask.yaml b/crontask/etc/crontask.yaml index 20aadc18..dbe926ad 100644 --- a/crontask/etc/crontask.yaml +++ b/crontask/etc/crontask.yaml @@ -2,7 +2,7 @@ # level: /trace/debug/info/error/warn/error/fatal, default: debug # duration: saved days, default is 30 days logger: - file: d:/local.git/be.ems/crontask/log/crontask.log + file: d:/omc.git/be.ems/crontask/log/crontask.log level: trace duration: 24 count: 10 @@ -26,7 +26,7 @@ database: port: 33066 name: tenants_db connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True - backup: d:/local.git/be.ems/restagent/database + backup: d:/omc.git/be.ems/restagent/database # northbound interface, cm/pm # duration(day): saved days diff --git a/makefile b/makefile index ba83566d..a1aa4afb 100644 --- a/makefile +++ b/makefile @@ -9,7 +9,7 @@ Release = $(RelDate) RelVer = $(VERSION)-$(RelDate) PLATFORM = amd64 ARMPLATFORM = aarch64 -GitLocalRoot = $(HOME)/local.git +GitLocalRoot = $(HOME)/omc.git EmsBuildRoot=$(GitLocalRoot)/build.ems BuildDir = $(EmsBuildRoot)/build BuildOMCDir = $(BuildDir)/usr/local/omc diff --git a/mkpkg.sh b/mkpkg.sh index c998a5b0..fc245950 100755 --- a/mkpkg.sh +++ b/mkpkg.sh @@ -10,7 +10,7 @@ Ky10Arch=ky10.aarch64 RpmPkgName=${ProjectL}-${RelVer}.ky10.aarch64.rpm RpmPkgRename=${ProjectL}-r${RelVer}-ky10.rpm DebPkgName=${ProjectL}-r${RelVer}-ub*.deb -GitLocalRoot=${HOME}/local.git +GitLocalRoot=${HOME}/omc.git EmsBEDir=${GitLocalRoot}/be.ems EmsBuildRoot=${GitLocalRoot}/build.ems RpmArch=`arch` diff --git a/restagent/etc/restconf-t.yaml b/restagent/etc/restconf-t.yaml index b11dabbf..5a7b6be1 100644 --- a/restagent/etc/restconf-t.yaml +++ b/restagent/etc/restconf-t.yaml @@ -3,7 +3,7 @@ # duration: rotation time with xx hours, example: 1/12/24 hours # count: rotation count of log, default is 30 rotation logger: - file: d:/local.git/be.ems/restagent/log/restagent.log + file: d:/omc.git/be.ems/restagent/log/restagent.log level: trace duration: 24 count: 2 @@ -27,7 +27,7 @@ rest: webServer: enabled: false - rootDir: d:/local.git/fe.ems.vue3/dist + rootDir: d:/omc.git/fe.ems.vue3/dist listen: - addr: :80 schema: http @@ -46,7 +46,7 @@ database: port: 33066 name: tenants_db connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True - backup: d:/local.git/be.ems/restagent/database + backup: d:/omc.git/be.ems/restagent/database # Redis 缓存数据，数据源声明全小写 redis: @@ -113,8 +113,8 @@ omc: binDir: ./bin backup: ./backup upload: ./upload - frontUpload: d:/local.git/fe.ems/upload - frontTraceDir: d:/local.git/fe.ems/trace + frontUpload: d:/omc.git/fe.ems/upload + frontTraceDir: d:/omc.git/fe.ems/trace software: ./software license: ./license gtpUri: gtp:192.168.2.219:2152 diff --git a/restagent/etc/restconf.yaml b/restagent/etc/restconf.yaml index 86dd8349..5664e573 100644 --- a/restagent/etc/restconf.yaml +++ b/restagent/etc/restconf.yaml @@ -4,7 +4,7 @@ # count: rotation count of log, default is 30 rotation # pprof: false(default)/true to disable/enable pprof logger: - file: d:/local.git/be.ems/restagent/log/restagent.log + file: d:/omc.git/be.ems/restagent/log/restagent.log level: trace duration: 24 count: 2 @@ -24,7 +24,7 @@ rest: webServer: enabled: true - rootDir: d:/local.git/fe.ems.vue3/dist + rootDir: d:/omc.git/fe.ems.vue3/dist listen: - addr: :80 schema: http @@ -43,7 +43,7 @@ database: port: 33066 name: tenants_db connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True - backup: d:/local.git/be.ems/restagent/database + backup: d:/omc.git/be.ems/restagent/database # Redis data cache redis: diff --git a/sshsvc/etc/sshsvc.yaml b/sshsvc/etc/sshsvc.yaml index 739df3ab..fa634d7f 100644 --- a/sshsvc/etc/sshsvc.yaml +++ b/sshsvc/etc/sshsvc.yaml @@ -3,7 +3,7 @@ # duration: rotation time with xx hours, example: 1/12/24 hours # count: rotation count of log, default is 30 rotation logger: - file: d:/local.git/be.ems/sshsvc/log/sshsvc.log + file: d:/omc.git/be.ems/sshsvc/log/sshsvc.log level: trace duration: 24 count: 30 @@ -13,7 +13,7 @@ logger: # count: rotation count of log, default is 30 rotation # level: cmd/ret log cmd/log cmd & result logmml: - file: d:/local.git/be.ems/sshsvc/mmllog/omcmml.log + file: d:/omc.git/be.ems/sshsvc/mmllog/omcmml.log duration: 24 count: 30 level: ret diff --git a/tools/misc/dumpdb.sh b/tools/misc/dumpdb.sh index 780b9210..c0acf4c7 100644 --- a/tools/misc/dumpdb.sh +++ b/tools/misc/dumpdb.sh @@ -1,7 +1,7 @@ #!/bin/bash Home=/home/simon -GitLocalRoot=${Home}/local.git +GitLocalRoot=${Home}/omc.git EmsBEDir=${GitLocalRoot}/be.ems user="root" password="1000omc@kp!" diff --git a/tools/misc/dumpsql.sh b/tools/misc/dumpsql.sh index fe66d515..5f747650 100644 --- a/tools/misc/dumpsql.sh +++ b/tools/misc/dumpsql.sh @@ -1,7 +1,7 @@ #!/bin/bash Home=/home/simon -GitLocalRoot=${Home}/local.git +GitLocalRoot=${Home}/omc.git EmsBEDir=${GitLocalRoot}/be.ems EMSBuildDir=${GitLocalRoot}/build.ems user="root"