simonzhangsz/omc_api
1
0
Fork 0
Code Activity

marge: 合并代码，包名变更be.ems

Browse Source
This commit is contained in:
TsMask
2024-03-18 15:22:47 +08:00
parent df904f5328
commit 78bd110b03
393 changed files with 7870 additions and 5170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
restagent/config/config.go
View File

@@ -5,8 +5,8 @@ import (
"os"
"strings"
"ems.agt/lib/global"
"ems.agt/lib/log"
"be.ems/lib/global"
"be.ems/lib/log"
"gopkg.in/yaml.v3"
)
@@ -92,18 +92,24 @@ type YamlConfig struct {
User string `yaml:"user"`
Password string `yaml:"password"`
TlsSkipVerify bool `yaml:"tlsSkipVerify"`
} `json:"email"`
} `yaml:"email"`
SMS struct {
ApiURL string `yaml:"apiURL"`
AccessKeyID string `yaml:"AccessKeyID"`
AccessKeySecret string `yaml:"accessKeySecret"`
SignName string `yaml:"signName"`
TemplateCode string `yaml:"templateCode"`
} `json:"sms"`
} `yaml:"sms"`
SMSC struct {
Addr string `yaml:"addr"`
UserName string `yaml:"userName"`
Password string `yaml:"password"`
} `yaml:"smsc"`
} `yaml:"alarm"`
MML struct {
Port int `yaml:"port"`
Port2 int `yaml:"port2"`
Sleep int64 `yaml:"sleep"`
DeadLine int64 `yaml:"deadLine"`
User string `yaml:"user"`

2
restagent/config/map.go
View File

@@ -6,7 +6,7 @@ import (
"gopkg.in/yaml.v3"
"ems.agt/lib/global"
"be.ems/lib/global"
)
type Uri2Object struct {

104
restagent/dev.yaml
View File

@@ -6,76 +6,95 @@ logger:
file: "../temp/log/restagent.log"
level: "trace"
duration: 24
count: 2
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: 3186
ipv6:
port: 33040
- ipv4: 0.0.0.0
ipv6:
port: 3187
ipv6:
port: 33443
scheme: https
caFile: ./etc/certs/rootca.crt
certFile: ./etc/certs/tsa-omc.crt
keyFile: ./etc/certs/tsa-omc_pri.key
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"
listen:
- addr: :8080
rootDir: d:/local.git/fe.ems.vue3/dist
listen:
- addr: :80
schema: http
- addr: :8443
- addr: :443
scheme: https
caFile: ./etc/certs/rootca.crt
certFile: ./etc/certs/tsa-omc.crt
keyFile: ./etc/certs/tsa-omc_pri.key
clientAuthType: 0
caFile: ./etc/certs/omc-ca.crt
certFile: ./etc/certs/omc-server.crt
keyFile: ./etc/certs/omc-server.key
database:
type: mysql
user: root
password: "1000omc@kp!"
host: "192.168.2.166"
port: 33066
name: "omc_db_dev"
backup: "../temp/database"
# password: 1000omc@kp!
# host: "192.168.8.103"
# port: 33066
name: omc_db
backup: d:/local.git/be.ems/restagent/database
password: "root@1234"
host: "192.168.5.59"
port: 3306
# Redis 缓存数据，数据源声明全小写
redis:
dataSource:
# OMC系统使用库
default:
port: 3189 # Redis port
host: "192.168.2.166" # Redis host
port: 6379 # Redis port
host: "192.168.5.59" # Redis host
password: "redis@1234"
db: 10 # Redis db_num
# UDM网元用户库
udmuser:
port: 3189 # Redis port
host: "192.168.2.166"
password: "redis@1234"
port: 6379 # Redis port
host: "192.168.13.140"
password: ""
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
user: admin
password: admin
mmlHome: "../temp/mmlhome"
mmlHome: ./mmlhome
upload: /home/agtuser
# NE config
ne:
user: root
user: agtuser
etcdir: /usr/local/etc
bindir: /usr/local/bin
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:
@@ -88,37 +107,46 @@ omc:
vendor: ""
dn: 4600
chk2ne: false
sn: 13750650
sn: "-"
checksign: false
rootDir: ./
binDir: ./bin
backup: ./backup
upload: ./upload
frontUpload: C:\AMP\Probject\ems_frontend\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:
runDir:
cmdTimeout: 120
# Alarm module setting
# Forward interface:
# email/sms
# email/sms
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
sms:
apiURL: http://smsc.xxx.com.cn/
accessKeyID: xxxx
accessKeySecret: xxxx
signName: xxx SMSC
templateCode: 1000
smsc:
addr: "192.168.14.211:2775"
userName: OMC
password: "123456"
#User authorized information
# crypt: mysql/md5/bcrypt
# token: true/false to check accessToken
@@ -133,7 +161,7 @@ auth:
publicKey: ./etc/certs/omc_pub.key
privateKey: ./etc/certs/omc_pri.key
# Parameter for limit number
# Parameter for limit number
# rmuid_maxnum: the max number of rmUID, default: 50
# alarmid_maxnum: the max number of AlarmID, default: 50
# pmid_maxnum: the max number of pmID, default: 50
@@ -150,4 +178,4 @@ params:
testConfig:
enabled: true
file: ./etc/testconfig.yaml
file: ./etc/testconfig.yaml

18
restagent/etc/certs/ca_cert.pem
View File

@@ -1,18 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIC4jCCAcqgAwIBAgICB+cwDQYJKoZIhvcNAQELBQAwEjEQMA4GA1UEAxMHUm9v
dCBDQTAeFw0yMzA4MTIxODA5MzZaFw0zMzA4MTIxODA5MzZaMBIxEDAOBgNVBAMT
B1Jvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCUTcFiT1GT
Zq9ROKTuWm6IfFthO6ysthEKevwkgJGDRCwF+K6rx3j7izTDfLkXum5OPbcd/yiE
B40Yrq9X2ckX260xG9PjDmGUaq8q5sza85Gg2hrW6wiLF9y8yYK3/v7716d0y6st
jt71pH554R98m0zHkbkmrFEagWR5cEoVM6MPZp2wdDnOFBBRiB1BrbHMpAFiKJ6s
oqm1yhUwCeeR/Hs09JF8KfOFhV4qAEVvE1cviHucCEvLBaG6xBzbKvYV2iOPu6u2
o818wphqmSZYoj3/O4/EyVgvj1VdSqmkTSudiiIhLAa8/2JKrW1v7wFQjRkwNwdf
h6UR5liIUwk7AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTAD
AQH/MB0GA1UdDgQWBBRtEF/Jyw6Zz3v0K5uA6aMOr9LXRTANBgkqhkiG9w0BAQsF
AAOCAQEAErmFo6JjEoFZv8R2gwNUq7ln+YEh2hX4myLlNDfTpYeGnn2Ge70Kmb0o
dkSyanDd9tGImcbEOttWAYve3vetvN3g+GONbf5pV7ClIbVV5MsjN/aGwj/TQWhu
ttmfu9IV2b5HyFEM61eoHVrNoWiNpbNHTu5D/XF8sg5JkseTnJF06foykzAx28i6
JcttunYn5SoWTIS9Ydu07X7uBcTeFBcKfH0xg4QlsNppiM5lIxBbp0WjQ8jyWw+b
Lyef4N6hmiaOf6P6qwaVZkEBhK6MVf1zadURuUSWAkhwGFjA7IbjbJ7OfYLXkYp3
mIrXQzjxz6AfyOcY/FsgcaDLf5xbYw==
-----END CERTIFICATE-----

BIN
restagent/etc/certs/omc_pri.key.aes_en
View File

Binary file not shown.

9
restagent/etc/certs/omc_pub.key
View File

@@ -1,9 +0,0 @@
-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA10O52xwLqvwrrof3Ckso
QAXgQOMfIHB5HfrJYrd31tJlJbFw+bR1JHXIAdqh9Cz+H0ir8KfBXS/U2XgI5fbI
upkzg3cRv86nuksGtrKHzi9Q7lYYzGWVW9Tc/hcvdibG6XwLSNYemFN6JrOa5mZ7
IabtZLuPRwFCBx2XC/dg45wxrGWIe7fbw2SpGId76erwSn/oKJtoy5Ash7LrOkp6
lu8L0QQNfs9cRntjf4aQo99ppWvUF0H6OFBsGymwRfPRtWqLiwK824zrpXKMLFX3
e4FjFO7WQNR1spOuL0bH+Ym1cEPYUn8LJN9OaiodjEXc1pM1E5MHWXGMhnhiE9q3
jwIDAQAB
-----END PUBLIC KEY-----

27
restagent/etc/certs/private_key.pem
View File

@@ -1,27 +0,0 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEAlE3BYk9Rk2avUTik7lpuiHxbYTusrLYRCnr8JICRg0QsBfiu
q8d4+4s0w3y5F7puTj23Hf8ohAeNGK6vV9nJF9utMRvT4w5hlGqvKubM2vORoNoa
1usIixfcvMmCt/7++9endMurLY7e9aR+eeEffJtMx5G5JqxRGoFkeXBKFTOjD2ad
sHQ5zhQQUYgdQa2xzKQBYiierKKptcoVMAnnkfx7NPSRfCnzhYVeKgBFbxNXL4h7
nAhLywWhusQc2yr2Fdojj7urtqPNfMKYapkmWKI9/zuPxMlYL49VXUqppE0rnYoi
ISwGvP9iSq1tb+8BUI0ZMDcHX4elEeZYiFMJOwIDAQABAoIBAFVJVhIsXVRwdBg4
hBkS5ogVRBPp1obIeYpWadSwH36m4M5aUlE1eKzoRGK7wlIUA8V5FmroxysOkKUG
KI5UD6Jp0fLw9uyX46QPqkb4zgyIkFI5u7+nEJW1Flt3Y3Ze7dJ1FbdEPWAIzs3j
WFzNC2eEhCYs9pZ3+HhOuzJfUitYU6ts83tazSms+7E027e/v2ubtYOzluEoj4YK
MM+ocqJOlXUOhyTATDaLs4fM567bwwFeriODQqmMIhXLf3HiBPfPYhoAlwPUV51L
bAjIPwG2/jy0yXPenYOUqSMP1i+XkyTL4eVqOLLQUI+BsEaToS8M7Lf4KRQE0vQm
uAkEA9ECgYEAxCsKXtkYXrma8UziSJgQBj88TfACyuYZBPkpBFJhffPVOreYzqmn
gsE38oHlLhCrezsxvScivS/Cwt7kgBTE9r6xmH8y2f0P3PNmtazQCqovG1gsNZ1t
9PZQmxbVUfx/7KRJ1Q5zX3x5C0P2c6XYv/1h/SQQ8PYXDhRxWZFVSikCgYEAwYlt
AoP8j6yHDMk10vJd0fKT1lztcHcQLvH3HQn2kHci2GCxySvcac49hpXTDeNdUzcQ
I9UWo1MggNojME3WHUTiZD5DYUzuNUBTkc0kMHWy79/YNAzvF9312MSyJ0NlytBQ
ISh0z0sPSxDjW+XCi/8LGu1rrremBqvh0rNIrMMCgYEAt+C8VNHcZRZHpX3y8icP
hjuKFGgwxe3Pb/j5uKJb3ktMCUEFjFo8uXTSM5AMuhRIGTgQVIS1rG5zemSh/Wj6
g2uWXyKEEQ+D6hGBqjP1wrlpdJE+x3btFdw5DFbn2HT9mF0bFAn6nXu4npWzEw5X
UQd67WT8OFIEpF8HLPTs5JkCgYBQlL6dmITU8Vm9mh1d+mnT23NwgnqeJATJ9xcT
sS1HE0Of4grEHw4Dw8pcOg+JLcyStE91C+kEEb1ryOdz2kS3JRI5+K6nWZeo9mKV
R1u1DZx2QbZMXcJDJriRC7y9mlNMsZVbaPPRx4fTknGHts9c6NEf4hC+y1pGVtSM
nPc6bwKBgQCrtb6srow9o0acH7mMmieDuqvT8DQ6rHWoizgneZTuvIo6SPO6nRnR
jfgfQkqr9IiLh9awSblQEN9fnddog7a1yS4cUZueiP5dmtFvp4B9Scnt+BoHpOLk
rrU2i7grAye4Cd003+pqhSERGCKSzb3fTSYiMypKsxeH2bs8nrRu2A==
-----END RSA PRIVATE KEY-----

8
restagent/etc/certs/public_key.pem
View File

@@ -1,8 +0,0 @@
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAlE3BYk9Rk2avUTik7lpuiHxbYTusrLYRCnr8JICRg0QsBfiuq8d4
+4s0w3y5F7puTj23Hf8ohAeNGK6vV9nJF9utMRvT4w5hlGqvKubM2vORoNoa1usI
ixfcvMmCt/7++9endMurLY7e9aR+eeEffJtMx5G5JqxRGoFkeXBKFTOjD2adsHQ5
zhQQUYgdQa2xzKQBYiierKKptcoVMAnnkfx7NPSRfCnzhYVeKgBFbxNXL4h7nAhL
ywWhusQc2yr2Fdojj7urtqPNfMKYapkmWKI9/zuPxMlYL49VXUqppE0rnYoiISwG
vP9iSq1tb+8BUI0ZMDcHX4elEeZYiFMJOwIDAQAB
-----END RSA PUBLIC KEY-----

30
restagent/etc/certs/rootca.crt
View File

@@ -1,30 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIFKTCCAxGgAwIBAgIUIN48tRvspOjaIxbavyrZ/M7IvacwDQYJKoZIhvcNAQEL
BQAwHjELMAkGA1UEBhMCQ04xDzANBgNVBAMMBlJvb3RDQTAgFw0yMzA4MjIwMzQw
MDVaGA8yMTIzMDcyOTAzNDAwNVowHjELMAkGA1UEBhMCQ04xDzANBgNVBAMMBlJv
b3RDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALzyKbRc0hIDXsnI
Yo0DLjfGexwFmhgE6jFR6EWc4V2jVenkTrEahzpKYkhf2SrnEZuuZN/XU0JDAzUE
k8sNF6AUQOAQ6rwaHLB8ZZVEbl8F49F376RGAicg/AzIPytL1ebT1WR8YxoQgd6i
+B7H+6zcKDS8RREwpuVngNdVJ7/mUsxDFPVGpOsQQUsEdkZb/S7txRktHYBAXmiX
fZFC6aL/L9tXKJDcDiTQTyRuA08+uzFxgCF6/8XL8PD8+i8FzZLl0enadDy4ZiLA
pk+vrFmre+ETHHPf4lI1Ptz3fPNsvCS1HO73SJTgpGK0zpcvB32EqPuhPEKy33C0
dsY+CQcuACvhEk1EQjsSXkuoaPCV/aCmBhS3AMMRuD+73rs9G2DbJQc2KTkyiqM6
FO9MNGKUHDIEE9O8iBqagBZ7XXqwcf0zr+YdjT47RAM31uROKBECipc0BOSEHJ3w
sjMjLvqDHpP5NeoTnAIVt6djGQK8AWRKuICCtJ59llSmAMWjvsT4VD6ooVRln6ye
j6tLzlnmZvtxEmdOXL/Y7A/HnEb+uAtifsOvZUw/CQpdHRsrUdNUSOozTW/uXgp3
5lHx9B6HWuxOGagxaaLhD8W5TsqjdSc2BqX23Up/p84RaLrwHjXaesTq7Y/Ckd8T
wIfUc2HtdtFt7YrBr3pkJeI/HjcNAgMBAAGjXTBbMB0GA1UdDgQWBBSr39jHWOmo
14F/m0G/Irn6oVwNTzAfBgNVHSMEGDAWgBSr39jHWOmo14F/m0G/Irn6oVwNTzAM
BgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAE+Br
fsui1ac9meqmgTPnwG91GhqITmVBKwLpwJ3vNHqU/6SOlsw31GZ689kxpOYsMh19
PwYQ9OYQmz2LGbiVgf3m/mG9S4dnGQecqEAt0WBgYOOJ+tWwmtaDa1y1KEKJIGx2
R4NYmlihSqobgl3f7/WWtwZM9BZCFAubh757gOiDFDgTukbJxfFVIRy8MVWg5Voz
KZK1toIVI617SignK65L4JbdEPgnD803vYsmn+Mk5PvKLVd1jB/M/Sqxd1W7gqr5
nIT+WRJIs4SONQkxEP3e5aO2OQyify37a9P1IW8bPOtvZeQKnTSMIwVVyQV+Y6Az
4+a74ngLRAgk4ek9wycIHtv9ZzN0o6vwWBQ73DqyLLY2IVX/8LtrNO6LE9TpoMCa
tGVLZ1M5d1/eVYZC60y/lst/MRUyGgvB9tjiaNxo0Ni9quFifPAq/zx9AWo+7nIP
0RAahOvRZE5NM5LmgaVvMTXYflkfBXChDwL0gXa6rBt5y3/htZ8Cw1Tqi1v3Kv1s
hnD+zMD/Okrp76ZA/N2wib0p1Is1t+CFGdcmFOVEzkxXK37RreWay3cmdlTrzF5P
8kGivh2WApouy97rrhJo7R8rpUplD37Z5SiqtlOfBUaGIzpVapz19UTN5OTq10xo
yBSUGoQ/AGchVrHobdLPTgJNWU/L4QEPloEOGxg=
-----END CERTIFICATE-----

30
restagent/etc/certs/rootca.pem
View File

@@ -1,30 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIFKTCCAxGgAwIBAgIUIN48tRvspOjaIxbavyrZ/M7IvacwDQYJKoZIhvcNAQEL
BQAwHjELMAkGA1UEBhMCQ04xDzANBgNVBAMMBlJvb3RDQTAgFw0yMzA4MjIwMzQw
MDVaGA8yMTIzMDcyOTAzNDAwNVowHjELMAkGA1UEBhMCQ04xDzANBgNVBAMMBlJv
b3RDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALzyKbRc0hIDXsnI
Yo0DLjfGexwFmhgE6jFR6EWc4V2jVenkTrEahzpKYkhf2SrnEZuuZN/XU0JDAzUE
k8sNF6AUQOAQ6rwaHLB8ZZVEbl8F49F376RGAicg/AzIPytL1ebT1WR8YxoQgd6i
+B7H+6zcKDS8RREwpuVngNdVJ7/mUsxDFPVGpOsQQUsEdkZb/S7txRktHYBAXmiX
fZFC6aL/L9tXKJDcDiTQTyRuA08+uzFxgCF6/8XL8PD8+i8FzZLl0enadDy4ZiLA
pk+vrFmre+ETHHPf4lI1Ptz3fPNsvCS1HO73SJTgpGK0zpcvB32EqPuhPEKy33C0
dsY+CQcuACvhEk1EQjsSXkuoaPCV/aCmBhS3AMMRuD+73rs9G2DbJQc2KTkyiqM6
FO9MNGKUHDIEE9O8iBqagBZ7XXqwcf0zr+YdjT47RAM31uROKBECipc0BOSEHJ3w
sjMjLvqDHpP5NeoTnAIVt6djGQK8AWRKuICCtJ59llSmAMWjvsT4VD6ooVRln6ye
j6tLzlnmZvtxEmdOXL/Y7A/HnEb+uAtifsOvZUw/CQpdHRsrUdNUSOozTW/uXgp3
5lHx9B6HWuxOGagxaaLhD8W5TsqjdSc2BqX23Up/p84RaLrwHjXaesTq7Y/Ckd8T
wIfUc2HtdtFt7YrBr3pkJeI/HjcNAgMBAAGjXTBbMB0GA1UdDgQWBBSr39jHWOmo
14F/m0G/Irn6oVwNTzAfBgNVHSMEGDAWgBSr39jHWOmo14F/m0G/Irn6oVwNTzAM
BgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAE+Br
fsui1ac9meqmgTPnwG91GhqITmVBKwLpwJ3vNHqU/6SOlsw31GZ689kxpOYsMh19
PwYQ9OYQmz2LGbiVgf3m/mG9S4dnGQecqEAt0WBgYOOJ+tWwmtaDa1y1KEKJIGx2
R4NYmlihSqobgl3f7/WWtwZM9BZCFAubh757gOiDFDgTukbJxfFVIRy8MVWg5Voz
KZK1toIVI617SignK65L4JbdEPgnD803vYsmn+Mk5PvKLVd1jB/M/Sqxd1W7gqr5
nIT+WRJIs4SONQkxEP3e5aO2OQyify37a9P1IW8bPOtvZeQKnTSMIwVVyQV+Y6Az
4+a74ngLRAgk4ek9wycIHtv9ZzN0o6vwWBQ73DqyLLY2IVX/8LtrNO6LE9TpoMCa
tGVLZ1M5d1/eVYZC60y/lst/MRUyGgvB9tjiaNxo0Ni9quFifPAq/zx9AWo+7nIP
0RAahOvRZE5NM5LmgaVvMTXYflkfBXChDwL0gXa6rBt5y3/htZ8Cw1Tqi1v3Kv1s
hnD+zMD/Okrp76ZA/N2wib0p1Is1t+CFGdcmFOVEzkxXK37RreWay3cmdlTrzF5P
8kGivh2WApouy97rrhJo7R8rpUplD37Z5SiqtlOfBUaGIzpVapz19UTN5OTq10xo
yBSUGoQ/AGchVrHobdLPTgJNWU/L4QEPloEOGxg=
-----END CERTIFICATE-----

26
restagent/etc/certs/tsa-omc.crt
View File

@@ -1,26 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIEYDCCAkigAwIBAgIUGZ67LDulO9kcRtwAwQGEC1oV5NUwDQYJKoZIhvcNAQEL
BQAwHjELMAkGA1UEBhMCQ04xDzANBgNVBAMMBlJvb3RDQTAeFw0yMzA4MjIwMzQw
MjVaFw0yMzA4MjMwMzQwMjVaMDwxCzAJBgNVBAYTAkNOMQ0wCwYDVQQKDARUZXN0
MR4wHAYDVQQDDBVUaW1lc3RhbXAgQ2VydGlmaWNhdGUwggEiMA0GCSqGSIb3DQEB
AQUAA4IBDwAwggEKAoIBAQC1vnKPYHUYPQSvGmfgSxZQley/hvJZyY9dun3hYv1P
h5PydHqkwM6t6wS+f9WTm2RyCvfRJrwn356gKm3DoDePs7T2kIEwnljMFRT8HDEC
SujKz2MBBW/b9eU6Bz9sQ4XHmSTVE/mJF4DiMRxmflUPZ+Mis80XbpFO91tdhDHZ
f0RX5D9ihaS/WTnkOV+ISMxxK1PB/zITlxAk15irYsMM8dCq0iUy/B3+bcGH1YzL
aKqbFw+nrm6NTxYLo4q3ERtLl49l9UXXcoNMvB70fk6i4kXrn7+AEdb3SPCFX0hb
qxUbCrLLDWf5x5JM9+49tkyQ7N36TSj92Q+05jp/f1MdAgMBAAGjeDB2MB0GA1Ud
DgQWBBRghFzHbuyke/ayjjVJuSgPKzwfRTAfBgNVHSMEGDAWgBSr39jHWOmo14F/
m0G/Irn6oVwNTzAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIGwDAWBgNVHSUB
Af8EDDAKBggrBgEFBQcDCDANBgkqhkiG9w0BAQsFAAOCAgEAAvKfbV0s2AGHKgEX
X33/N5nV8v109fjmQ0tzN1UvnamxYQLpgCLILN0yeWP4E5LKmzPWnTXG10woEasp
pAtXqYtgZZbvfqlkaryS5IJ73F6uO0hJK7iUswnpGxm9fxS04hhvsx3YRQnaaJ0m
Ek5JpXNsdQVN87iyGtnzp1uHY2csdyw9XDCQxDDXJ3hvLBthHAADeX+h8JX7G3xc
u85ON+w/rVIJIMpPQKg5gvNVzA/krebToSmOS6+f2O1UUj4PxwPPfBHugepzZYpF
grWy1vzz2DAZdNQs39c10a5/C5VrH77V++SoQBfYzCAI7YhA/L6ONIKW4nP3zFX3
zMmevHYR/WzQlN8twJhyAx7Y6AEjZNnfS2CvZj6UWvVUFbcVD5N9qgLuZxdDezQt
RAsVcSN5q5FURl99oi3X9sGoq/rI47MEU96hSG4pfiBTlt6VbYyWvBLeRWLccLPi
KtvV3wd6F8bqp+U2d/XQFTyQ5jfZcrCVvIesv4euTq+kTypjjjLadgzsy56ivoAx
UvjcJFZ2HVoKpv1SusOMsgg5nZf4lhE5zxYQOtEwzhOXv4U81ctIVHOKYZdDefWm
wC7dTtH9NxaWQZu07Y27wihkBARdnW1azgWorwzKYcGFT+pwrAPRUScj/vqsJkUH
KagSCD6B6qh4zSj0UANX3V6QcfQ=
-----END CERTIFICATE-----

26
restagent/etc/certs/tsa-omc.pem
View File

@@ -1,26 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIEYDCCAkigAwIBAgIUGZ67LDulO9kcRtwAwQGEC1oV5NUwDQYJKoZIhvcNAQEL
BQAwHjELMAkGA1UEBhMCQ04xDzANBgNVBAMMBlJvb3RDQTAeFw0yMzA4MjIwMzQw
MjVaFw0yMzA4MjMwMzQwMjVaMDwxCzAJBgNVBAYTAkNOMQ0wCwYDVQQKDARUZXN0
MR4wHAYDVQQDDBVUaW1lc3RhbXAgQ2VydGlmaWNhdGUwggEiMA0GCSqGSIb3DQEB
AQUAA4IBDwAwggEKAoIBAQC1vnKPYHUYPQSvGmfgSxZQley/hvJZyY9dun3hYv1P
h5PydHqkwM6t6wS+f9WTm2RyCvfRJrwn356gKm3DoDePs7T2kIEwnljMFRT8HDEC
SujKz2MBBW/b9eU6Bz9sQ4XHmSTVE/mJF4DiMRxmflUPZ+Mis80XbpFO91tdhDHZ
f0RX5D9ihaS/WTnkOV+ISMxxK1PB/zITlxAk15irYsMM8dCq0iUy/B3+bcGH1YzL
aKqbFw+nrm6NTxYLo4q3ERtLl49l9UXXcoNMvB70fk6i4kXrn7+AEdb3SPCFX0hb
qxUbCrLLDWf5x5JM9+49tkyQ7N36TSj92Q+05jp/f1MdAgMBAAGjeDB2MB0GA1Ud
DgQWBBRghFzHbuyke/ayjjVJuSgPKzwfRTAfBgNVHSMEGDAWgBSr39jHWOmo14F/
m0G/Irn6oVwNTzAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIGwDAWBgNVHSUB
Af8EDDAKBggrBgEFBQcDCDANBgkqhkiG9w0BAQsFAAOCAgEAAvKfbV0s2AGHKgEX
X33/N5nV8v109fjmQ0tzN1UvnamxYQLpgCLILN0yeWP4E5LKmzPWnTXG10woEasp
pAtXqYtgZZbvfqlkaryS5IJ73F6uO0hJK7iUswnpGxm9fxS04hhvsx3YRQnaaJ0m
Ek5JpXNsdQVN87iyGtnzp1uHY2csdyw9XDCQxDDXJ3hvLBthHAADeX+h8JX7G3xc
u85ON+w/rVIJIMpPQKg5gvNVzA/krebToSmOS6+f2O1UUj4PxwPPfBHugepzZYpF
grWy1vzz2DAZdNQs39c10a5/C5VrH77V++SoQBfYzCAI7YhA/L6ONIKW4nP3zFX3
zMmevHYR/WzQlN8twJhyAx7Y6AEjZNnfS2CvZj6UWvVUFbcVD5N9qgLuZxdDezQt
RAsVcSN5q5FURl99oi3X9sGoq/rI47MEU96hSG4pfiBTlt6VbYyWvBLeRWLccLPi
KtvV3wd6F8bqp+U2d/XQFTyQ5jfZcrCVvIesv4euTq+kTypjjjLadgzsy56ivoAx
UvjcJFZ2HVoKpv1SusOMsgg5nZf4lhE5zxYQOtEwzhOXv4U81ctIVHOKYZdDefWm
wC7dTtH9NxaWQZu07Y27wihkBARdnW1azgWorwzKYcGFT+pwrAPRUScj/vqsJkUH
KagSCD6B6qh4zSj0UANX3V6QcfQ=
-----END CERTIFICATE-----

27
restagent/etc/certs/tsa-omc_pri.key
View File

@@ -1,27 +0,0 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEAtb5yj2B1GD0Erxpn4EsWUJXsv4byWcmPXbp94WL9T4eT8nR6
pMDOresEvn/Vk5tkcgr30Sa8J9+eoCptw6A3j7O09pCBMJ5YzBUU/BwxAkroys9j
AQVv2/XlOgc/bEOFx5kk1RP5iReA4jEcZn5VD2fjIrPNF26RTvdbXYQx2X9EV+Q/
YoWkv1k55DlfiEjMcStTwf8yE5cQJNeYq2LDDPHQqtIlMvwd/m3Bh9WMy2iqmxcP
p65ujU8WC6OKtxEbS5ePZfVF13KDTLwe9H5OouJF65+/gBHW90jwhV9IW6sVGwqy
yw1n+ceSTPfuPbZMkOzd+k0o/dkPtOY6f39THQIDAQABAoIBADgq2YDSEJ4jDXWI
NZ4t1oGlM/ulGvUAw9v1rL2hOCQCBIkj0ltkcvtw7JBrNXhex9Yu6ZOr4u53v7BE
LJQOyd0RbtXcpvB9n3fC9C9ODx9kQzmaikBgi8dw4Rzj7Ifq/kdHXwizGaVyrBQ7
lUlfta4DL0EkTDf3pdS/wW7PUhCjLPEPH6GqkDilsIGGudDT5pqUVB/fkLq4rPl4
QhQixDCwTtesPMeMMCy+bjB5hojRzENZ9ste4eSpF0BJQyUjKLWkyCPjFZKtM1l8
C+fZT/tVeyMkGpOXywhtuYSaAeoeaqrPjvMzN1H3slx0i9J6lIS/T+94jXuA5Zbw
iXR6GAkCgYEA4D6K02Nnu1vk/NnhqK8AiP9gWUxArGaQ8BKkhAXEi7/oLhRfnJE0
eNgmZLKk4pMZmC9tf5WiBXdcHDZwjxequi02AtdU4p0emStJ7L/if3YLdWKCOdjw
3jkMdtHmQRT3bUFppKkH4n+EAg08QOT1HLoFVmcfKkjZQ9igbfFoAx8CgYEAz3sn
G6ZpF7wbxdWyPxuko9O8r9V6xFa6pWpuy5X1rVXUEy4u7pwn3D7xgOT3v83HdkIG
aRlIR8YbEcekpO+hqRPljvm3zYDsEXs4I1fBmnxSrO9aX0IImEabTCTuRAUZRGMe
Vzrk2rqCmuO0zDmBN+/uxqlK5us3wAguO+vbPkMCgYAgSIC9/BKkA4/M4yU8nq0q
C/H4CSVKbJ2zIkvzAc2Q/PjVIXO+W509RIkKeDmKsPi/UxylgIpJ1Sw6l4/O2e5n
TTj4Yb3DvjD4hiXnYpyeEwWFScBLybKrm3Ty6jcG6ZjRbthhr0AGWKtNjFA/W3b6
QsGf9cqj0McOoHJAQb/iqwKBgH9c0+bvQjflqw7IXUDMEUbX5U3yuAfqTWzZZuXm
Sgd7VlHn2btzdCyJHurGoybEhRqc8R52/J3CiD9j1DfDOfN2WUZpGGE4MLGSeCWJ
6ziP9Jhf3ZP4DxqazR3y1ag/kQEf7zIQ3wc90oqOGR/8dMwHpwWgSnByF6jz3J2/
7LfNAoGBAMJsi2nJF3jzWwZLY9pQQ2/Icdojk0yUE0a9skdh5R6MjpzwQ3FydbB0
PxUxfJlAjS06kV/URo11AdQZXm/QKyb8uJPyRppJ7DZ0vsiDWysElqUHX/E/H6kI
QaQvePQ59HcgkJVh9wFI5blHtTyMrGR76kmZN5ClL05ITkqdnWJp
-----END RSA PRIVATE KEY-----

27
restagent/etc/certs/tsa-omc_pri.pem
View File

@@ -1,27 +0,0 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEAtb5yj2B1GD0Erxpn4EsWUJXsv4byWcmPXbp94WL9T4eT8nR6
pMDOresEvn/Vk5tkcgr30Sa8J9+eoCptw6A3j7O09pCBMJ5YzBUU/BwxAkroys9j
AQVv2/XlOgc/bEOFx5kk1RP5iReA4jEcZn5VD2fjIrPNF26RTvdbXYQx2X9EV+Q/
YoWkv1k55DlfiEjMcStTwf8yE5cQJNeYq2LDDPHQqtIlMvwd/m3Bh9WMy2iqmxcP
p65ujU8WC6OKtxEbS5ePZfVF13KDTLwe9H5OouJF65+/gBHW90jwhV9IW6sVGwqy
yw1n+ceSTPfuPbZMkOzd+k0o/dkPtOY6f39THQIDAQABAoIBADgq2YDSEJ4jDXWI
NZ4t1oGlM/ulGvUAw9v1rL2hOCQCBIkj0ltkcvtw7JBrNXhex9Yu6ZOr4u53v7BE
LJQOyd0RbtXcpvB9n3fC9C9ODx9kQzmaikBgi8dw4Rzj7Ifq/kdHXwizGaVyrBQ7
lUlfta4DL0EkTDf3pdS/wW7PUhCjLPEPH6GqkDilsIGGudDT5pqUVB/fkLq4rPl4
QhQixDCwTtesPMeMMCy+bjB5hojRzENZ9ste4eSpF0BJQyUjKLWkyCPjFZKtM1l8
C+fZT/tVeyMkGpOXywhtuYSaAeoeaqrPjvMzN1H3slx0i9J6lIS/T+94jXuA5Zbw
iXR6GAkCgYEA4D6K02Nnu1vk/NnhqK8AiP9gWUxArGaQ8BKkhAXEi7/oLhRfnJE0
eNgmZLKk4pMZmC9tf5WiBXdcHDZwjxequi02AtdU4p0emStJ7L/if3YLdWKCOdjw
3jkMdtHmQRT3bUFppKkH4n+EAg08QOT1HLoFVmcfKkjZQ9igbfFoAx8CgYEAz3sn
G6ZpF7wbxdWyPxuko9O8r9V6xFa6pWpuy5X1rVXUEy4u7pwn3D7xgOT3v83HdkIG
aRlIR8YbEcekpO+hqRPljvm3zYDsEXs4I1fBmnxSrO9aX0IImEabTCTuRAUZRGMe
Vzrk2rqCmuO0zDmBN+/uxqlK5us3wAguO+vbPkMCgYAgSIC9/BKkA4/M4yU8nq0q
C/H4CSVKbJ2zIkvzAc2Q/PjVIXO+W509RIkKeDmKsPi/UxylgIpJ1Sw6l4/O2e5n
TTj4Yb3DvjD4hiXnYpyeEwWFScBLybKrm3Ty6jcG6ZjRbthhr0AGWKtNjFA/W3b6
QsGf9cqj0McOoHJAQb/iqwKBgH9c0+bvQjflqw7IXUDMEUbX5U3yuAfqTWzZZuXm
Sgd7VlHn2btzdCyJHurGoybEhRqc8R52/J3CiD9j1DfDOfN2WUZpGGE4MLGSeCWJ
6ziP9Jhf3ZP4DxqazR3y1ag/kQEf7zIQ3wc90oqOGR/8dMwHpwWgSnByF6jz3J2/
7LfNAoGBAMJsi2nJF3jzWwZLY9pQQ2/Icdojk0yUE0a9skdh5R6MjpzwQ3FydbB0
PxUxfJlAjS06kV/URo11AdQZXm/QKyb8uJPyRppJ7DZ0vsiDWysElqUHX/E/H6kI
QaQvePQ59HcgkJVh9wFI5blHtTyMrGR76kmZN5ClL05ITkqdnWJp
-----END RSA PRIVATE KEY-----

8
restagent/etc/restconf-t.yaml
View File

@@ -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/ems.agt/restagent/log/restagent-t.log
file: d:/local.git/be.ems/restagent/log/restagent-t.log
level: trace
duration: 24
count: 2
@@ -13,10 +13,10 @@ logger:
rest:
- ipv4: 0.0.0.0
ipv6:
port: 3030
port: 33030
- ipv4: 0.0.0.0
ipv6:
port: 6060
port: 36060
database:
type: mysql
@@ -25,7 +25,7 @@ database:
host: 127.0.0.1
port: 33066
name: omc_db
backup: d:/local.git/ems.agt/restagent/database
backup: d:/local.git/be.ems/restagent/database
# Redis 缓存数据，数据源声明全小写
redis:

15
restagent/etc/restconf.yaml
View File

@@ -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/ems.agt/restagent/log/restagent.log
file: d:/local.git/be.ems/restagent/log/restagent.log
level: trace
duration: 24
count: 2
@@ -15,10 +15,10 @@ logger:
rest:
- ipv4: 0.0.0.0
ipv6:
port: 3040
port: 33040
- ipv4: 0.0.0.0
ipv6:
port: 3443
port: 33443
scheme: https
clientAuthType: 0
caFile: ./etc/certs/omc-ca.crt
@@ -45,7 +45,7 @@ database:
# host: "192.168.8.103"
# port: 33066
name: omc_db
backup: d:/local.git/ems.agt/restagent/database
backup: d:/local.git/be.ems/restagent/database
password: "root@1234"
host: "192.168.5.59"
port: 3306
@@ -72,6 +72,7 @@ redis:
# deadLine: timeout for io read and write (second)
mml:
port: 4100
port2: 5002
sleep: 200
deadLine: 10
user: admin
@@ -127,7 +128,7 @@ omc:
# Forward interface:
# email/sms
alarm:
forwardAlarm: false
forwardAlarm: true
email:
smtp: mail.agrandtech.com
port: 25
@@ -141,6 +142,10 @@ alarm:
accessKeySecret: xxxx
signName: xxx SMSC
templateCode: 1000
smsc:
addr: "192.168.14.211:2775"
userName: OMC
password: "123456"
#User authorized information
# crypt: mysql/md5/bcrypt

BIN
restagent/license/upf/upf_1350015_system.ini
View File

Binary file not shown.

4
restagent/makefile
View File

@@ -1,7 +1,7 @@
# Makefile for rest agent project
PROJECT = OMC
VERSION = 2.2402.5
VERSION = 2.2403.1
PLATFORM = amd64
ARMPLATFORM = aarch64
BUILDDIR = ../../build
@@ -9,7 +9,7 @@ DEBBUILDDIR = ../../debbuild
RPMBUILDDIR = $(HOME)/goprojects/rpmbuild
INSTALLDIR = /usr/local/omc
RELEASEDIR = ../../release
LIBDIR = ems.agt/lib
LIBDIR = be.ems/lib
BINNAME = restagent
.PHONY: build $(BINNAME)

26
restagent/restagent.go
View File

@@ -9,19 +9,19 @@ import (
"strconv"
"strings"
"ems.agt/features/dbrest"
"ems.agt/features/event"
"ems.agt/features/fm"
"ems.agt/features/lm"
"ems.agt/features/pm"
"ems.agt/lib/dborm"
"ems.agt/lib/global"
"ems.agt/lib/log"
"ems.agt/lib/routes"
"ems.agt/restagent/config"
"ems.agt/src"
"ems.agt/src/framework/middleware"
libSession "ems.agt/src/lib_features/session"
"be.ems/features/dbrest"
"be.ems/features/event"
"be.ems/features/fm"
"be.ems/features/lm"
"be.ems/features/pm"
"be.ems/lib/dborm"
"be.ems/lib/global"
"be.ems/lib/log"
"be.ems/lib/routes"
"be.ems/restagent/config"
"be.ems/src"
"be.ems/src/framework/middleware"
libSession "be.ems/src/lib_features/session"
"github.com/gin-gonic/gin"
"golang.org/x/net/http2"
"golang.org/x/net/http2/h2c"