Merge branch 'main' of http://192.168.0.229:3180/OMC/ems_backend

2023-08-29 19:23:08 +08:00
parent 6701d66951 abe89d7832
commit c560b8ac42
9 changed files with 4 additions and 117 deletions
--- a/7
+++ b/7
@@ -1,7 +1,8 @@
 # Makefile for AGrandTech EMS project

 PROJECT = OMC
-VERSION = 5GC16.1.1
+VERSION = 5GC1.0.0
+RelDate = `date +%Y%m%d`
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 GitLocalRoot = $(HOME)/local.git
@@ -68,9 +69,7 @@ deb: $(BINNAME)
 	cp -rf ./restagent/$(RESTAGENT) $(BinDir)
 	cp -rf ./crontask/$(CRONTASK) $(BinDir)
 	cp -rf $(SshSvcDir)/$(SshSvcBin) $(BinDir)
-	cp -rf $(MiscDir)/ne-hosts $(BinDir)
 	cp -rf $(MiscDir)/* $(BinDir)
-	rm -rf $(BinDir2)/ne-hosts
 	cp -rf $(ConfigEtcDir)/* $(BuildDir)/omc/etc/
 	cp -rf $(DBSQLSrcDir)/* $(BuildDir)/omc/etc/db/
 	rm -rf $(FrontBuildDir)/*
@@ -83,7 +82,7 @@ deb: $(BINNAME)
 	chmod +x $(DebBuildDir)/usr/local/omc/bin/*
 #	cp -rf $(BuildDir)/nginx/*  $(DebBuildDir)/etc/nginx/conf.d
 	cp -rf $(BuildDir)/systemd/*.service  $(DebBuildDir)/lib/systemd/system/
-	dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION).$(PLATFORM).deb
+	dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION).$(RelDate).$(PLATFORM).deb

 rpm: $(BINNAME)
 	cp -rf ./restagent/$(RESTAGENT) $(BinDir)
--- a/misc/ende
+++ b/misc/ende
--- a/misc/ende-readme.txt
+++ b/misc/ende-readme.txt
@@ -1,46 +0,0 @@
-ende 加解密工具链说明
-ENDE(ENcrypt & DEcripyt)) toolkits
-
-#使用帮助
-[root@5gc iv]# ./ende
-Usage:
-
-#加密文件
-#原文件       	plaintext_file
-#加密后文件    	encrypted_file
-./ende en plaintext_file encrypted_file
-
-#解密文件
-#加密后文件    	encrypted_file
-#原文件       	plaintext_file
-./ende de encrypted_file plaintext_file
-
-
-#查看原始文件 md5
-[root@5gc iv]# sha256sum aa.txt
-5b48bfb3520011d6152f04c0b4facf83481c34b6abf7469e2e41ef2bfe3bd568  aa.txt
-
-#加密文件
-[root@5gc iv]# ./ende en aa.txt aa.en
-注意：执行完，则将 aa.txt 加密成  aa.en
-
-
-#解密文件
-[root@5gc iv]# ./ende de aa.en aa.de
-注意：执行完，则将 aa.en 解密成  aa.de
-
-#查看加密后文件 md5
-[root@5gc iv]# sha256sum aa.en
-f88cd2d6d429cfcef1a43e89e1d88e673cb66b9660131508aa8165ede3ca0cb7  aa.en
-
-#解密后文件和原文件不同，如果使用vi打开查看，则会发现是乱码
-
-
-#查看解密后文件 md5
-[root@5gc iv]# sha256sum aa.de
-5b48bfb3520011d6152f04c0b4facf83481c34b6abf7469e2e41ef2bfe3bd568  aa.de
-
-
-#解密后文件和原文件一致
-
-
--- a/misc/iv
+++ b/misc/iv
--- a/misc/ivreadme.txt
+++ b/misc/ivreadme.txt
@@ -1,55 +0,0 @@
-iv(integrity verification) toolkits完整性验证工具链说明
-
-
-#使用帮助
-[root@5gc iv]# ./iv
-Usage:
-./iv generate_private_key  private_key_name
-./iv generate_public_key   private_key_name   public_key_name
-./iv signature             private_key_name   source_cms_file   source_file
-./iv verify_signature      public_key_name    source_cms_file   source_file
-
-
-#生成私钥
-[root@5gc iv]# ./iv generate_private_key pri.key
-Generating RSA private key, 2048 bit long modulus (2 primes)
-..............+++++
-...................+++++
-e is 65537 (0x010001)
-en  pri.key_pri.key ==> pri.key_pri.key.aes_en
-注意：这时候私钥已经被自动加密存储了
-
-
-#通过私钥生成公钥
-[root@5gc iv]# ./iv generate_public_key pri.key pub.key
-writing RSA key
-
-
-#签名
-#source.bin     是某个二进制的文件，安装包、升级包或者任何其他文件
-#source.cms     是生成的签名文件
-[root@5gc iv]# ./iv signature pri.key source.cms source.bin
-
-
-#验证通过
-[root@5gc iv]# ./iv verify_signature pub.key source.cms source.bin
-Verified OK
-
-
-#修改原始文件后，验证不通过
-[root@5gc iv]# vi source.bin
-[root@5gc iv]# ./iv verify_signature pub.key source.cms source.bin
-Verification Failure
-
-
-#针对修改后的source.bin再次签名，验证通过
-[root@5gc iv]# ./iv signature pri.key source.cms source.bin
-[root@5gc iv]# ./iv verify_signature pub.key source.cms source.bin
-Verified OK
-
-
-#修改签名文件后，验证不通过
-[root@5gc iv]# vi source.cms
-[root@5gc iv]# ./iv verify_signature pub.key source.cms source.bin
-Verification Failure
-
--- a/misc/ne-hosts
+++ b/misc/ne-hosts
@@ -1,2 +0,0 @@
-#Exp: 192.168.4.133 root password
-192.168.4.133 root ******
--- a/misc/omc_pri.key.aes_en
+++ b/misc/omc_pri.key.aes_en
--- a/misc/omc_pub.key
+++ b/misc/omc_pub.key
@@ -1,9 +0,0 @@
-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA10O52xwLqvwrrof3Ckso
-QAXgQOMfIHB5HfrJYrd31tJlJbFw+bR1JHXIAdqh9Cz+H0ir8KfBXS/U2XgI5fbI
-upkzg3cRv86nuksGtrKHzi9Q7lYYzGWVW9Tc/hcvdibG6XwLSNYemFN6JrOa5mZ7
-IabtZLuPRwFCBx2XC/dg45wxrGWIe7fbw2SpGId76erwSn/oKJtoy5Ash7LrOkp6
-lu8L0QQNfs9cRntjf4aQo99ppWvUF0H6OFBsGymwRfPRtWqLiwK824zrpXKMLFX3
-e4FjFO7WQNR1spOuL0bH+Ym1cEPYUn8LJN9OaiodjEXc1pM1E5MHWXGMhnhiE9q3
-jwIDAQAB
-----END PUBLIC KEY-----
--- a/misc/omcsvc.sh
+++ b/misc/omcsvc.sh
@@ -1,6 +1,6 @@
 #!/bin/bash

-ProcList="restagent crontask sshsvc nbi_alarm nbi_agent 4a_agent"
+ProcList="restagent crontask sshsvc"

 BinDir=/usr/local/omc/bin