Merge remote-tracking branch 'origin/master'

sst-manager/pom.xml

@@ -142,6 +142,22 @@
 				<profiles.filepath>/mortals/app/data</profiles.filepath>
 			</properties>
 		</profile>
+
+
+		<profile>
+			<id>pengxi</id>
+			<properties>
+				<profiles.active>pengxi</profiles.active>
+				<profiles.server.port>17217</profiles.server.port>
+				<profiles.nacos.server-addr>192.168.106.6:8848</profiles.nacos.server-addr>
+				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
+				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+				<profiles.log.level>INFO</profiles.log.level>
+				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
+				<profiles.publish.path>/home/publish</profiles.publish.path>
+				<profiles.filepath>/mortals/app/data</profiles.filepath>
+			</properties>
+		</profile>
 	</profiles>
 
 	<dependencies>

sst-manager/src/main/bin/start.sh

@@ -5,9 +5,9 @@ BASEDIR=`(cd "$BASEDIR"; pwd)`
 PROJECT_NAME="@project.artifactId@";
 MAIN_CLASS="$PROJECT_NAME-@project.version@.jar";
 LOG_PATH="@profiles.log.path@/$PROJECT_NAME"
-GC_PATH=$LOG_PATH/PROJECT_NAME"-gc.log"
-HS_ERR_PATH=$LOG_PATH/PROJECT_NAME"-hs_err.log"
-HEAP_DUMP_PATH=$LOG_PATH/PROJECT_NAME"-heap_dump.hprof"
+GC_PATH=$LOG_PATH/$PROJECT_NAME"-gc.log"
+HS_ERR_PATH=$LOG_PATH/$PROJECT_NAME"-hs_err.log"
+HEAP_DUMP_PATH=$LOG_PATH/$PROJECT_NAME"-heap_dump.hprof"
 TEMP_PATH=$LOG_PATH/temp/
 SUCCESS=0
 FAIL=9

sst-manager/src/main/resources/bootstrap.yml

@@ -13,13 +13,6 @@ spring:
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
-  rabbitmq:
-    host: @profiles.rabbitmq.host@
-    port: @profiles.rabbitmq.port@
-    username: @profiles.rabbitmq.username@
-    password: @profiles.rabbitmq.password@
-    virtualHost: @profiles.rabbitmq.virtualhost@
-
   cloud:
     nacos:
       # Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类