diff --git a/restagent/etc/restconf-t.yaml b/restagent/etc/restconf-t.yaml index ff7f7b68..1c9fba41 100644 --- a/restagent/etc/restconf-t.yaml +++ b/restagent/etc/restconf-t.yaml @@ -3,20 +3,40 @@ # 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-t.log + file: d:/local.git/be.ems/restagent/log/restagent.log level: trace duration: 24 count: 2 # rest agent listen ipv4/v6 and port, support multiple routines # ip: 0.0.0.0 or ::0, support IPv4/v6 +# clientAuthType: 0:NoClientCert (default), 1:RequestClientCert, 2:RequireAnyClientCert, +# 3:VerifyClientCertIfGiven, 4:RequireAndVerifyClientCerts rest: - ipv4: 0.0.0.0 ipv6: port: 33030 - ipv4: 0.0.0.0 ipv6: - port: 36060 + port: 33443 + scheme: https + clientAuthType: 0 + caFile: ./etc/certs/omc-ca.crt + certFile: ./etc/certs/omc-server.crt + keyFile: ./etc/certs/omc-server.key + +webServer: + enabled: false + rootDir: d:/local.git/fe.ems.vue3/dist + listen: + - addr: :80 + schema: http + - addr: :443 + scheme: https + clientAuthType: 0 + caFile: ./etc/certs/omc-ca.crt + certFile: ./etc/certs/omc-server.crt + keyFile: ./etc/certs/omc-server.key database: type: mysql @@ -25,6 +45,7 @@ database: host: 127.0.0.1 port: 33066 name: omc_db + connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True backup: d:/local.git/be.ems/restagent/database # Redis 缓存数据,数据源声明全小写 @@ -33,25 +54,34 @@ redis: # OMC系统使用库 default: port: 6379 # Redis port - host: "192.168.2.166" # Redis host - password: "" + host: "192.168.2.219" # Redis host + password: "123456" db: 10 # Redis db_num # UDM网元用户库 udmuser: port: 6379 # Redis port - host: "192.168.2.166" - password: "" + host: "192.168.2.219" + password: "123456" db: 0 # Redis db_num # 多个数据源时可以用这个指定默认的数据源 defaultDataSourceName: "default" - + +# sleep: time delay for after write buffer (millisecond) +# deadLine: timeout for io read and write (second) mml: port: 4100 + port2: 5002 sleep: 200 + deadLine: 10 + sizeRow: 100 + sizeCol: 128 + bufferSize: 65535 user: admin password: admin mmlHome: ./mmlhome + upload: /home/agtuser +# NE config ne: user: root etcdir: /usr/local/etc @@ -59,6 +89,13 @@ ne: omcdir: /usr/local/omc scpdir: /tmp licensedir: /usr/local/etc/{neType}/license + # backup etc list of IMS,no space + etcListIMS: '{*.yaml,mmtel,vars.cfg}' + etcListDefault: '{*.yaml,*.conf,*.cfg}' + # true/false to overwrite config file when dpkg ne software + dpkgOverwrite: false + # dpkg timeout (second) + dpkgTimeout: 180 # chk2ne: true/false, if put OmcNeConfig parameters to NE omc: @@ -71,42 +108,55 @@ omc: vendor: "" dn: 4600 chk2ne: false - sn: 13750650 + sn: "-" checksign: false + rootDir: ./ + binDir: ./bin backup: ./backup upload: ./upload frontUpload: d:/local.git/fe.ems/upload frontTraceDir: d:/local.git/fe.ems/trace software: ./software license: ./license - gtpUri: gtp:192.168.2.119:2152 + gtpUri: gtp:192.168.2.219:2152 checkContentType: false testMode: false rbacMode: true runDir: + cmdTimeout: 120 # Alarm module setting # Forward interface: -# email/sms +# email/sms +# smProxy: sms(Short Message Service)/smsc(SMS Centre) alarm: forwardAlarm: true email: - smtp: smtp@xxx.com.cn + smtp: mail.agrandtech.com port: 25 - user: smtpuser - password: smtpuser@omc + user: smtpext@agrandtech.com + password: "1000smtp@omc!" + # TLS skip verify: true/false + tlsSkipVerify: true + smProxy: smsc sms: - apiURL: http://smsc.xxx.com.cn/ + apiURL: http://smsc.xxx.com/ accessKeyID: xxxx accessKeySecret: xxxx signName: xxx SMSC templateCode: 1000 - + smsc: + addr: "192.168.13.114:2775" + systemID: "omc" + password: "omc123" + systemType: "UTRAN" + #User authorized information # crypt: mysql/md5/bcrypt # token: true/false to check accessToken # expires for session, unit: second # Support single/multiple session of user +# auth: crypt: bcrypt token: true @@ -129,6 +179,18 @@ params: subidmaxnum: 20 urimaxlen: 2100000 rmuidregexp: "[0-9]{4}[A-Z]{2}[A-Z]{2}[0-9A-Z]{1}[0-9A-Z]{3}[0-9A-Z]{1,16}" + testConfig: enabled: true - file: ./etc/testconfig.yaml \ No newline at end of file + file: ./etc/testconfig.yaml + +# 静态文件配置, 相对项目根路径或填绝对路径 +staticFile: + # 默认资源,dir目录需要预先创建 + default: + prefix: "/static" + dir: "./static" + # 文件上传资源目录映射,与项目目录同级 + upload: + prefix: "/upload" + dir: "./upload" diff --git a/restagent/etc/restconf.yaml b/restagent/etc/restconf.yaml index 8bf09af2..abc65bc3 100644 --- a/restagent/etc/restconf.yaml +++ b/restagent/etc/restconf.yaml @@ -18,7 +18,7 @@ rest: port: 33040 - ipv4: 0.0.0.0 ipv6: - port: 33443 + port: 34443 scheme: https clientAuthType: 0 caFile: ./etc/certs/omc-ca.crt