配置修改

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

@@ -5,7 +5,7 @@ DEPLOY_DIR=`pwd`
 CONF_DIR=$DEPLOY_DIR/conf
 LOGS_DIR=$DEPLOY_DIR/logs
 #部署需修改
-APP_MAINCLASS=com.zehong.ProjectNameApplication
+APP_MAINCLASS=com.zehong.HuaXinApplication
 
 PIDS=`ps -ef | grep -v grep | grep "$CONF_DIR" |awk '{print $2}'`
 if [ -n "$PIDS" ]; then
@@ -38,7 +38,7 @@ 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 HuaXinApplication ...\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 &

huaxin-admin/src/main/bin/stop.sh

@@ -16,7 +16,7 @@ if [ -z "$PID" ]; then
     exit 1
 fi
 
-echo -e "Stopping the Application ...\c"
+echo -e "Stopping the HuaXinApplication ...\c"
 kill $PID > $STDOUT_FILE 2>&1
 
 COUNT=0

huaxin-admin/src/main/resources/application-test.yml

@@ -7,8 +7,8 @@ spring:
             # 主库数据源
             master:
                 url: jdbc:mysql://36.138.180.82:3309/huaxin_ranqi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: HuaXin_ranqi
-                password: 7ifSJNRLPDxDNSiD
+                username: huaxin_ranqi
+                password: LwT2HKfP4JmM23LL
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

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

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

huaxin-web/src/views/indexcomponents/3dmap/index.vue

@@ -324,7 +324,7 @@ export default {
         //加气站
         [
           {
-            url: "../3dtiles/HuaXinRanQi002/tileset.json", //路径
+            url: "../3dtiles/TianHuaRanQi002/tileset.json", //路径
             startMapType: "gps", //初始坐标系
             toMapType: "", //要转换坐标系
 
@@ -338,7 +338,7 @@ export default {
                },*/
           },
           {
-            url: "../3dtiles/HuaXinRanQi001/tileset.json", //路径
+            url: "../3dtiles/TianHuaRanQi001/tileset.json", //路径
             startMapType: "gps", //初始坐标系
             toMapType: "", //要转换坐标系
 

huaxin-web/vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.2.17:8080`,
-        target: `https://yhq.zhkjgf.com:8898`,
+        target: `http://localhost:8909/huaxin`,
+        //target: `https://yhq.zhkjgf.com:8898`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''