Merge remote-tracking branch 'origin/master'

gassafetyprogress-admin/src/main/bin/startup.sh

@@ -38,10 +38,10 @@ fi
 JAVA_MEM_OPTS="-server -Xms2048M -Xmx2048M -Xmn1024M"
 #JAVA_MEM_OPTS="-server -Xms5120M -Xmx5120M -Xmn1024M -Xnoclassgc -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:+CMSParallelRemarkEnabled -XX:CMSInitiatingOccupancyFraction=80 -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+PrintClassHistogram -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintHeapAtGC -Xloggc:$CLOG_FILE"
 
-echo -e "Starting the CommunicationApplication ...\c"
+echo -e "Starting the GassafetyProgressApplication ...\c"
 
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DEPLOY_DIR/libs/linux_64
-nohup java -Dlog.path=$LOGS_DIR -Dapp.home=$DEPLOY_DIR $JAVA_OPTS $JAVA_MEM_OPTS $JAVA_DEBUG_OPTS $JAVA_JMX_OPTS -classpath $CONF_DIR:$LIB_JARS $APP_MAINCLASS &
+nohup java -Dlog.path=$LOGS_DIR -Dapp.home=$DEPLOY_DIR $JAVA_OPTS $JAVA_MEM_OPTS $JAVA_DEBUG_OPTS $JAVA_JMX_OPTS -classpath $CONF_DIR:$LIB_JARS $APP_MAINCLASS >/dev/null 2>&1
 sleep 1
 echo "started"
 PIDS=`ps -ef | grep java | grep "$DEPLOY_DIR" | awk '{print $2}'`

gassafetyprogress-admin/src/main/resources/application.yml

 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 8903
   servlet:
     # 应用的访问路径
-    context-path: /
+    context-path: /gassafety
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8

gassafetyprogress-web/src/router/index.js

@@ -53,6 +53,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/error/401'], resolve),
     hidden: true
   },
+  //大屏展示
   {
     path: '/bigWindow',
     component: (resolve) => require(['@/views/bigWindow'], resolve),

gassafetyprogress-web/vue.config.js

@@ -34,7 +34,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        target: `http://222.223.203.154:8092/gassafety`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''