update

Former-commit-id: 67d444679c5456ab45cc10e9d8c98542e8707456

publish/build.cmd

@@ -3,8 +3,7 @@ set startime=%time%
 
 rd /q/s "./dist/"
 
-echo d|xcopy "./src/linux-x64/publish" "./dist/linux-x64/publish" /s /e /y /f
+echo d|xcopy "./src" "./dist/" /s /e /y /f
-echo d|xcopy "./src/linux-arm64/publish" "./dist/linux-arm64/publish" /s /e /y /f
 
 dotnet publish ../projects/UserCenter/UserCenter.csproj -c Release -o ../../publish/dist/linux-x64/publish/apps/UserCenter
 dotnet publish ../projects/IoTCenter/IoTCenter.csproj -c Release -o ../../publish/dist/linux-x64/publish/apps/IoTCenter

publish/src/linux-arm64/publish/install.sh

@@ -15,11 +15,7 @@ sudo dpkg -i ~/publish/files/n2n_2.5.0-170_armhf.deb
 #http://packages.ntop.org/
 sudo dpkg -i ~/publish/files/n2n_2.5.0-170_armhf.deb
 mkdir -p ~/dotnet
-if [ `uname -m` == "aarch64" ];then
+tar zxf ~/publish/files/dotnet-sdk-2.2.300-linux-arm.tar.gz -C ~/dotnet
-    tar zxf ~/publish/files/dotnet-sdk-2.2.300-linux-arm64.tar.gz -C ~/dotnet
-else
-    tar zxf ~/publish/files/dotnet-sdk-2.2.300-linux-arm.tar.gz -C ~/dotnet
-fi
 if [  "`which dotnet`" == "" ]; then
     echo 'export PATH=$PATH:/home/pi/dotnet'>>~/.bashrc
     echo 'export DOTNET_ROOT=/home/pi/dotnet'>>~/.bashrc
@@ -31,7 +27,7 @@ fi
 
 #config system
 sudo systemctl enable ssh
-sudo systemctl enable vncserver-x11-serviced.service
+#sudo systemctl enable vncserver-x11-serviced.service
 sudo timedatectl set-timezone 'Asia/Shanghai'
 sudo timedatectl set-ntp true
 

publish/src/linux-arm64/publish/supervisor/n2n.conf

@@ -1,5 +0,0 @@
-[program:n2n]
-command=edge -a 172.16.0.1 -c myvpn -l dsideal.nbaxp.com:1234
-autostart=true
-autorestart=true
-user=pi

publish/src/linux-arm64/publish/supervisor/srs.conf

@@ -1,6 +1,6 @@
 [program:srs]
 directory=/home/pi/publish/apps/srs
-command=/home/pi/publish/apps/srs/objs/srs -c /home/pi/publish/apps/srs/conf/srs.conf
+command=bash -c "./objs/srs -c conf/srs.conf
 autostart=true
 autorestart=true
 user=pi