From a4a9f04b743de517b69ed141e17f31bcd9333131 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 24 Mar 2025 14:17:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/etc/default/restconf.yaml | 36 -------------------------------- misc/nehosts | 2 ++ src/config/config.default.yaml | 4 ---- src/config/config.prod.yaml | 28 +++++++++++-------------- 4 files changed, 14 insertions(+), 56 deletions(-) diff --git a/config/etc/default/restconf.yaml b/config/etc/default/restconf.yaml index 5cacb595..3ebc102f 100644 --- a/config/etc/default/restconf.yaml +++ b/config/etc/default/restconf.yaml @@ -16,14 +16,6 @@ rest: - ipv4: 127.0.0.100 ipv6: port: 33030 - - ipv4: 127.0.0.100 - ipv6: - port: 33443 - schema: https - clientAuthType: 0 - caFile: /usr/local/omc/etc/certs/omc-ca.crt - certFile: /usr/local/omc/etc/certs/omc-server.crt - keyFile: /usr/local/omc/etc/certs/omc-server.key webServer: enabled: true @@ -31,34 +23,6 @@ webServer: listen: - addr: :80 schema: http - - addr: :443 - schema: https - clientAuthType: 0 - caFile: /usr/local/omc/etc/certs/omc-ca.crt - certFile: /usr/local/omc/etc/certs/omc-server.crt - keyFile: /usr/local/omc/etc/certs/omc-server.key - -# data sources -database: - dataSource: - # Default database instance - default: - type: "sqlite" - database: "/usr/local/omc/database/omc_db.sqlite" - # used to specify the default data source for multiple data resourece - defaultDataSourceName: "default" - -# Redis data cache -redis: - dataSource: - # OMC system db - default: - port: 6379 # Redis port - host: "127.0.0.1" # Redis host - password: "helloearth" - db: 10 # Redis db_num - # used to specify the default data source for multiple data resourece - defaultDataSourceName: "default" # sleep: time delay for after write buffer (millisecond) # deadLine: timeout for io read and write (second) diff --git a/misc/nehosts b/misc/nehosts index 96f19036..32aa8519 100755 --- a/misc/nehosts +++ b/misc/nehosts @@ -1,2 +1,4 @@ # host user password # Example: 172.16.5.100 omcuser password + +127.0.0.1 new_user password diff --git a/src/config/config.default.yaml b/src/config/config.default.yaml index 00159330..6d3c8f4b 100644 --- a/src/config/config.default.yaml +++ b/src/config/config.default.yaml @@ -2,10 +2,6 @@ server: # 是否开启代理 proxy: false - # 运行版本 standards/lite/tenants - runVersion: "standards" - # 运行模式 system/docker - runMode: "system" # 日志 logger: diff --git a/src/config/config.prod.yaml b/src/config/config.prod.yaml index fbba0f9a..5deaaf72 100644 --- a/src/config/config.prod.yaml +++ b/src/config/config.prod.yaml @@ -2,30 +2,26 @@ server: # 是否开启代理 proxy: true - # 运行版本 standards/lite/tenants - runVersion: "standards" - # 运行模式 system/docker - runMode: "system" # DB 数据源 database: dataSource: # 默认数据库实例 - default: - type: "mysql" - host: "127.0.0.1" - port: 3306 - username: "" - password: "" - database: "" - logging: false + # default: + # type: "mysql" + # host: "127.0.0.1" + # port: 3306 + # username: "" + # password: "" + # database: "" + # logging: false # 内置轻量级数据库 lite: type: "sqlite" - database: "" + database: "/usr/local/omc/database/omc_db.sqlite" logging: false # 多个数据源时可以用这个指定默认的数据源 - defaultDataSourceName: "default" + defaultDataSourceName: "lite" # Redis 缓存数据 redis: @@ -33,7 +29,7 @@ redis: default: port: 6379 # Redis port host: "127.0.0.1" # Redis host - password: "" - db: 0 # Redis db_num + password: "helloearth" + db: 10 # Redis db_num # 多个数据源时可以用这个指定默认的数据源 defaultDataSourceName: "default"