Merge remote-tracking branch 'origin/develop' into develop

自动化部署脚本/x86架构/预定系统/new_auto.sh

@@ -424,6 +424,7 @@ function firewalldjava()
 #微信公众号前端8087
 #微信公众号后端80
 #桌牌系统9990
+#安卓远程控制8892
 
 log "INFO" "***************************************"
 log "INFO" "检查firewalld状态......"
@@ -433,7 +434,7 @@ $sudoset firewall-cmd --state
 if [ $? -eq  0 ]; then
   log  "INFO" "firewalld已开启，开始检查tcp端口"
 #	for j in 22 1883 8883 18083 18082 443 8888 8997 22122 23000 8306 62121 554 1935 10000  8998 8079 8085 8088 8086 8087 6060 9990
-	for j in 22 1883 8883 443 8997  62121 554 1935 10000
+	for j in 22 1883 8883 443 8997  62121 554 1935 10000 8892
       	do
              #firewall-cmd --list-port |grep $j
              a=`firewall-cmd --list-port |grep $j|wc -l`
@@ -808,10 +809,13 @@ function monitor_x86()
         $sudoset chmod 755 /var/www/java/external-meeting-api/run.sh
         $sudoset echo 'su - root -c "cd /var/www/java/external-meeting-api && ./run.sh"' | sudo tee -a /etc/rc.local > /dev/null
         $sudoset echo 'su - root -c "cd /var/www/malan && ./run.sh"' | sudo tee -a /etc/rc.local > /dev/null
-	      $sudoset chmod 777 /etc/rc.local
+        $sudoset echo 'su - root -c "cd /var/www/java/ws-scrcpy-deploy && ./rebuild-native.sh && start.sh &"' | sudo tee -a /etc/rc.local > /dev/null
+	    $sudoset chmod 777 /etc/rc.local
         $sudoset chmod 777 /etc/rc.d/rc.local
         $sudoset sh /var/www/malan/run.sh
         $sudoset sh /var/www/java/external-meeting-api/run.sh
+        $sudoset sh /var/www/java/ws-scrcpy-deploy/rebuild-native.sh
+        $sudoset sh /var/www/java/ws-scrcpy-deploy/start.sh &
         sleep 2
     fi
 }