Merge remote-tracking branch 'origin/master'

sst-manager/pom.xml

@@ -22,6 +22,8 @@
 		<profiles.log.level>info</profiles.log.level>
 		<profiles.publish.path>/home/publish</profiles.publish.path>
 		<profiles.filepath>/mortals/app/data</profiles.filepath>
+		<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
+		<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 	</properties>
 
 	<profiles>
@@ -33,8 +35,7 @@
 			<properties>
 				<profiles.active>develop</profiles.active>
 				<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
-				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+
 			</properties>
 		</profile>
 		<profile>
@@ -42,8 +43,6 @@
 			<properties>
 				<profiles.active>test</profiles.active>
 				<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
-				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 			</properties>
 		</profile>
 		<profile>
@@ -60,8 +59,6 @@
 			<properties>
 				<profiles.active>yibin</profiles.active>
 				<profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr>
-				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 			</properties>
 		</profile>
 		<profile>
@@ -69,8 +66,6 @@
 			<properties>
 				<profiles.active>sngx</profiles.active>
 				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
-				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 			</properties>
 		</profile>
 
@@ -79,19 +74,14 @@
 			<properties>
 				<profiles.active>reg</profiles.active>
 				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
-				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 			</properties>
 		</profile>
 
-
 		<profile>
 			<id>pengxi</id>
 			<properties>
 				<profiles.active>pengxi</profiles.active>
 				<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>
 			</properties>
 		</profile>
 
@@ -100,10 +90,26 @@
 			<properties>
 				<profiles.active>yanyuan</profiles.active>
 				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
-				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 			</properties>
 		</profile>
+
+		<profile>
+			<id>bzjkq</id>
+			<properties>
+				<profiles.active>bzjkq</profiles.active>
+				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+			</properties>
+		</profile>
+
+
+		<profile>
+			<id>qiling</id>
+			<properties>
+				<profiles.active>qiling</profiles.active>
+				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+			</properties>
+		</profile>
+
 	</profiles>
 
 	<dependencies>

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

-echo off
+chcp 65001
+@echo off
 
 if not exist "%JAVA_HOME%\bin\java.exe" echo Please set the JAVA_HOME variable in your environment, We need java(x64)! jdk8 or later is better! & EXIT /B 1
 set "JAVA=%JAVA_HOME%\bin\java.exe"
@@ -17,8 +18,8 @@ set HS_ERR_PATH=%LOG_PATH%PORT%-hs_err.log
 set HEAP_DUMP_PATH=%LOG_PATH%/heap_dump.hprof
 set TEMP_PATH=%LOG_PATH%/temp/
 if not exist "%TEMP_PATH%"  md "%TEMP_PATH%"
-rem jvm启动参数
-set JAVA_OPTS=-Xms512M -Xmx512M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps  -XX:+HeapDumpOnOutOfMemoryError
+
+set JAVA_OPTS=-Xms512M -Xmx1024M -Xss256K -XX:+UseAdaptiveSizePolicy -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:GCTimeRatio=39 -XX:+PrintGCDetails -XX:+PrintGCDateStamps  -XX:+HeapDumpOnOutOfMemoryError
 set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintGCDateStamps -Xloggc:%GC_PATH%
 set JAVA_OPTS=%JAVA_OPTS% -XX:ErrorFile=%HS_ERR_PATH%
 set JAVA_OPTS=%JAVA_OPTS% -XX:HeapDumpPath=%HEAP_DUMP_PATH%
@@ -29,7 +30,7 @@ set JVM_CONFIG=%JVM_CONFIG% -Dapp.port=%PORT%
 set JVM_CONFIG=%JVM_CONFIG% -Djava.io.tmpdir=%TEMP_PATH%
 set JVM_CONFIG=%JVM_CONFIG% -Dbasedir=%BASEDIR%
 set JVM_CONFIG=%JVM_CONFIG% -Dloader.path=file://%BASEDIR%/conf,file://%BASEDIR%/lib
-
+set JVM_CONFIG=%JVM_CONFIG% -Dfile.encoding=utf-8
 
 set DEBUG_OPTS=
 if ""%1"" == ""debug"" (
@@ -53,11 +54,11 @@ goto end
 
 :debug
 echo "debug"
-"%JAVA%" -Xms512m -Xmx512m -server %DEBUG_OPTS% %JVM_CONFIG% -jar ../boot/%APP_NAME%
+"%JAVA%" -Xms512m -Xmx1024m -server %DEBUG_OPTS% %JVM_CONFIG% -jar ../boot/%APP_NAME%
 goto end
 
 :jmx
-"%JAVA%" -Xms512m -Xmx512m -server %JMX_OPTS% %JVM_CONFIG% -jar ../boot/%APP_NAME%
+"%JAVA%" -Xms512m -Xmx1024m -server %JMX_OPTS% %JVM_CONFIG% -jar ../boot/%APP_NAME%
 goto end
 
 :end

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

@@ -13,6 +13,9 @@ spring:
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
+  dao:
+    exceptiontranslation:
+      enabled: false
   cloud:
     nacos:
       # Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类