1 год назад · 0dffb3196e
--- a/output/prod/PDUInfo.txt
+++ b/output/prod/PDUInfo.txt
@@ -1,12 +0,0 @@
 
				-"product_name": "SmartPDU"
			
 
				-"product_sn": "GCGDX4028DD16CH"
			
 
				-"device_name": "SmartPDU"
			
 
				-"device_no": "L9QN6M3222CG4"
			
 
				-"device_date": "2024/01/01 12:00:00"
			
 
				-"device_batch": "1"
			
 
				-"server_name": "购旺工业（赣州）有限公司"
			
 
				-"server_site": "https://www.gowone.com"
			
 
				-"server_mail": "steven@gowone.com"
			
 
				-"server_address": "江西省赣州市赣州经济技术开发区香江科技园11栋"
			
 
				-"server_telephone": "400-013-7168"
			
 
				-
			
--- a/output/t113i/merge
+++ b/output/t113i/merge
--- a/output/pack.sh
+++ b/output/pack.sh
@@ -12,8 +12,8 @@ FULLDIR=$(realpath $0)
 
				 CURDIR=$(dirname $FULLDIR)
			
 
				 MERG=$CURDIR/merge
			
 
				 
			
 
				-SRCDIR=$CURDIR/t113i
			
 
				-OUTDIR=$CURDIR/push
			
 
				+SRCDIR=$CURDIR/pack_dir
			
 
				+OUTDIR=$CURDIR
			
 
				 
			
 
				 echo remove tmp file
			
 
				 #rm -r $OUTDIR/$TMP $OUTDIR/$TARGET
			
@@ -24,6 +24,7 @@ dos2unix -q $SCRIPTS
 
				 cp -f $SRCDIR/root/run/app/pdu_dat.db $SRCDIR/root/run/app/pdu_dat_bak.db
			
 
				 chmod 777 -R $SRCDIR
			
 
				 tar -czpf $OUTDIR/$TMP -C $SRCDIR .
			
 
				+cp -f $OUTDIR/$TMP $OUTDIR/push/
			
 
				 
			
 
				 #echo merge pdupkg
			
 
				 $MERG $NUM $STRA $OBJ1 $OBJ2 $OUTDIR/$TMP
			
--- a/output/t113i/pack_dir/etc/dnsmasq.conf
+++ b/output/t113i/pack_dir/etc/dnsmasq.conf
--- a/output/t113i/pack_dir/etc/init.d/S90PDUApp
+++ b/output/t113i/pack_dir/etc/init.d/S90PDUApp
--- a/output/t113i/pack_dir/etc/init.d/rcS
+++ b/output/t113i/pack_dir/etc/init.d/rcS
--- a/output/t113i/pack_dir/etc/network/if.sh
+++ b/output/t113i/pack_dir/etc/network/if.sh
--- a/output/t113i/pack_dir/etc/profile
+++ b/output/t113i/pack_dir/etc/profile
--- a/output/t113i/root/run/app/Qt_Test
+++ b/output/t113i/root/run/app/Qt_Test
--- a/output/t113i/pack_dir/root/run/app/cert/server.crt
+++ b/output/t113i/pack_dir/root/run/app/cert/server.crt
@@ -0,0 +1,13 @@
 
				+-----BEGIN CERTIFICATE-----
			
 
				+MIIB3TCCAYSgAwIBAgITCaRLi0+MGlvZT1fmT5PvUM7j5jAKBggqhkjOPQQDAjBF
			
 
				+MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50
			
 
				+ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMB4XDTI0MTAxNjA4MjgwMloXDTI0MTExNTA4
			
 
				+MjgwMlowRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNV
			
 
				+BAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDBZMBMGByqGSM49AgEGCCqGSM49
			
 
				+AwEHA0IABIj6h92EtlO1oIQxxk4tV7PnoI5PBV12kD9nP3T7uflMAIFDsm3vU+GH
			
 
				+sz4ZCzO0nc5tAT+oLFLlxe3yl0He7ymjUzBRMB0GA1UdDgQWBBQnETpe6UTcjbE2
			
 
				+ZTh3vQDKYmwEYjAfBgNVHSMEGDAWgBQnETpe6UTcjbE2ZTh3vQDKYmwEYjAPBgNV
			
 
				+HRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0cAMEQCIC4AWo6oOAgStOj5HdRP3X/A
			
 
				+EuMLiC73WNWInJn9/aluAiByAVJk9vFHfc7N5ZvE03QEM9cgmFcDlRC44btigSlz
			
 
				+9g==
			
 
				+-----END CERTIFICATE-----
			
--- a/output/t113i/pack_dir/root/run/app/cert/server.csr
+++ b/output/t113i/pack_dir/root/run/app/cert/server.csr
@@ -0,0 +1,11 @@
 
				+-----BEGIN CERTIFICATE REQUEST-----
			
 
				+MIIBkTCB+wIBADBSMQswCQYDVQQGEwJjbjELMAkGA1UECAwCc2MxCzAJBgNVBAcM
			
 
				+AmNkMQswCQYDVQQKDAJndzELMAkGA1UECwwCZ3cxDzANBgNVBAMMBmdvd29uZTCB
			
 
				+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4wBM6vK3sWes4DAHqZ7qrVVr/I0m
			
 
				+XxaEtVT83zXIKwNoPZBGdy5b9QlcN5nTaP+g91+UkoDCBj9QyQwpDk0vKthY/wfW
			
 
				+ujJN20Hu0/X2mG++zvElB4T0dEiqMxGxM8DQwjoi/vDwMUFR3SNAxzIZBiUzaTJU
			
 
				+3zCnUhArosIszHsCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4GBAEbvLin+ID58xNEf
			
 
				+chPMWiVjfA1JETCWn1FW+MWjOQ6CgEi04YAUTB1yKGH6IA5SYINFwG4q/kTOWUF8
			
 
				+zSMHSh5mIkCMNjqSnfBrQ/2xUMYXlAgZaHS91tnvQAKiX3xsaq0xd1uJ16O5vNak
			
 
				+DXXdA3D5ogRr76nXRyHMyHUaNM2j
			
 
				+-----END CERTIFICATE REQUEST-----
			
--- a/output/t113i/pack_dir/root/run/app/cert/server.key
+++ b/output/t113i/pack_dir/root/run/app/cert/server.key
@@ -0,0 +1,5 @@
 
				+-----BEGIN EC PRIVATE KEY-----
			
 
				+MHcCAQEEIPZpADU5UVGfqwAaSDgCyiLDLMxx7byxTe7QFh3N7EmLoAoGCCqGSM49
			
 
				+AwEHoUQDQgAEiPqH3YS2U7WghDHGTi1Xs+egjk8FXXaQP2c/dPu5+UwAgUOybe9T
			
 
				+4YezPhkLM7Sdzm0BP6gsUuXF7fKXQd7vKQ==
			
 
				+-----END EC PRIVATE KEY-----
			
--- a/output/t113i/pack_dir/root/run/app/changes.txt
+++ b/output/t113i/pack_dir/root/run/app/changes.txt
--- a/output/t113i/pack_dir/root/run/app/core
+++ b/output/t113i/pack_dir/root/run/app/core
--- a/output/t113i/pack_dir/root/run/app/lib/libmodbus.so
+++ b/output/t113i/pack_dir/root/run/app/lib/libmodbus.so
--- a/output/t113i/pack_dir/root/run/app/lib/libmodbus.so.5
+++ b/output/t113i/pack_dir/root/run/app/lib/libmodbus.so.5
--- a/output/t113i/pack_dir/root/run/app/lib/libnetsnmp.so
+++ b/output/t113i/pack_dir/root/run/app/lib/libnetsnmp.so
--- a/output/t113i/pack_dir/root/run/app/lib/libnetsnmp.so.40
+++ b/output/t113i/pack_dir/root/run/app/lib/libnetsnmp.so.40
--- a/output/t113i/pack_dir/root/run/app/lib/libnetsnmp.so.40.2.1
+++ b/output/t113i/pack_dir/root/run/app/lib/libnetsnmp.so.40.2.1
--- a/output/t113i/pack_dir/root/run/app/lib/libnetsnmpagent.so
+++ b/output/t113i/pack_dir/root/run/app/lib/libnetsnmpagent.so
--- a/output/t113i/pack_dir/root/run/app/lib/libnetsnmpagent.so.40
+++ b/output/t113i/pack_dir/root/run/app/lib/libnetsnmpagent.so.40
--- a/output/t113i/pack_dir/root/run/app/lib/libnetsnmpagent.so.40.2.1
+++ b/output/t113i/pack_dir/root/run/app/lib/libnetsnmpagent.so.40.2.1
--- a/output/t113i/pack_dir/root/run/app/lib/libnetsnmphelpers.so
+++ b/output/t113i/pack_dir/root/run/app/lib/libnetsnmphelpers.so
--- a/output/t113i/pack_dir/root/run/app/lib/libnetsnmphelpers.so.40
+++ b/output/t113i/pack_dir/root/run/app/lib/libnetsnmphelpers.so.40
--- a/output/t113i/pack_dir/root/run/app/lib/libnetsnmphelpers.so.40.2.1
+++ b/output/t113i/pack_dir/root/run/app/lib/libnetsnmphelpers.so.40.2.1
--- a/output/t113i/pack_dir/root/run/app/lib/libnetsnmpmibs.so
+++ b/output/t113i/pack_dir/root/run/app/lib/libnetsnmpmibs.so
--- a/output/t113i/pack_dir/root/run/app/lib/libnetsnmpmibs.so.40
+++ b/output/t113i/pack_dir/root/run/app/lib/libnetsnmpmibs.so.40
--- a/output/t113i/pack_dir/root/run/app/lib/libnetsnmpmibs.so.40.2.1
+++ b/output/t113i/pack_dir/root/run/app/lib/libnetsnmpmibs.so.40.2.1
--- a/output/t113i/pack_dir/root/run/app/lib/libnetsnmptrapd.so
+++ b/output/t113i/pack_dir/root/run/app/lib/libnetsnmptrapd.so
--- a/output/t113i/pack_dir/root/run/app/lib/libnetsnmptrapd.so.40
+++ b/output/t113i/pack_dir/root/run/app/lib/libnetsnmptrapd.so.40
--- a/output/t113i/pack_dir/root/run/app/lib/libnetsnmptrapd.so.40.2.1
+++ b/output/t113i/pack_dir/root/run/app/lib/libnetsnmptrapd.so.40.2.1
--- a/output/t113i/pack_dir/root/run/app/lib/libpcre.so
+++ b/output/t113i/pack_dir/root/run/app/lib/libpcre.so
--- a/output/t113i/pack_dir/root/run/app/pduMIB
+++ b/output/t113i/pack_dir/root/run/app/pduMIB
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/agentxtrap
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/agentxtrap
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/checkbandwidth
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/checkbandwidth
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/encode_keychange
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/encode_keychange
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/fixproc
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/fixproc
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/ipf-mod.pl
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/ipf-mod.pl
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/mib2c
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/mib2c
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/mib2c-update
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/mib2c-update
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/net-snmp-cert
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/net-snmp-cert
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/net-snmp-config
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/net-snmp-config
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/net-snmp-create-v3-user
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/net-snmp-create-v3-user
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmp-bridge-mib
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmp-bridge-mib
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpbulkget
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpbulkget
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpbulkwalk
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpbulkwalk
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpcheck
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpcheck
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpconf
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpconf
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpd
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpd
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpdelta
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpdelta
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpdf
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpdf
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpget
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpget
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpgetnext
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpgetnext
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpinform
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpinform
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpnetstat
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpnetstat
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmppcap
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmppcap
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpping
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpping
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpps
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpps
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpset
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpset
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpstatus
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpstatus
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmptable
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmptable
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmptest
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmptest
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmptop
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmptop
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmptranslate
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmptranslate
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmptrap
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmptrap
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmptrapd
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmptrapd
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpusm
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpusm
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpvacm
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpvacm
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/snmpwalk
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/snmpwalk
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/tkmib
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/tkmib
--- a/output/t113i/pack_dir/root/run/app/snmp/bin/traptoemail
+++ b/output/t113i/pack_dir/root/run/app/snmp/bin/traptoemail
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/default-mfd-top.m2c
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/default-mfd-top.m2c
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/details-enums.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/details-enums.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/details-node.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/details-node.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/details-table.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/details-table.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-ctx-copy.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-ctx-copy.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-ctx-get.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-ctx-get.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-ctx-set.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-ctx-set.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-data-allocate.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-data-allocate.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-data-context.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-data-context.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-get-U64.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-get-U64.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-get-char.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-get-char.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-get-decl-bot.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-get-decl-bot.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-get-decl.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-get-decl.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-get-long.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-get-long.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-get-oid.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-get-oid.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-header-bottom.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-header-bottom.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-header-top.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-header-top.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-source-includes.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-source-includes.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-table-constants.m2c
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-table-constants.m2c
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-table-enums.m2c
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-table-enums.m2c
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-table-indexes-from-oid.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-table-indexes-from-oid.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-table-indexes-set.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-table-indexes-set.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-table-indexes-to-oid.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-table-indexes-to-oid.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-table-indexes-varbind-setup.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-table-indexes-varbind-setup.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-table-indexes.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-table-indexes.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-table-oids.m2c
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-table-oids.m2c
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-value-map-func.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-value-map-func.m2i
--- a/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-value-map-reverse.m2i
+++ b/output/t113i/pack_dir/root/run/app/snmp/conf/mib2c-data/generic-value-map-reverse.m2i
--- a/output/t113i/root/run/app/snmp/conf/mib2c-data/generic-value-map.m2i
+++ b/output/t113i/root/run/app/snmp/conf/mib2c-data/generic-value-map.m2i