Merge branch 'master' of http://gitlab.scsmile.cn/zxf/sample-form-platform

assembly/assembly.xml

@@ -25,6 +25,8 @@
             <directory>./db</directory>
             <includes>
                 <include>*.sql</include>
+                <include>service.exe</include>
+                <include>service.xml</include>
             </includes>
             <outputDirectory>db</outputDirectory>
             <fileMode>0755</fileMode>

sample-form-manager-ui/admin/src/api/device.js

@@ -19,7 +19,7 @@ export const getDeviceMatterList = (data) => {
   });
 };
 
-// 保存设备事项
+// 批量保存设备事项
 export const batchSaveDeviceMatter = (data) => {
   return request({
     url: `/sampleform/device/matter/datum/batchSave`,
@@ -28,7 +28,7 @@ export const batchSaveDeviceMatter = (data) => {
   });
 };
 
-// 批量保存设备事项
+// 保存设备事项
 export const saveDeviceMatter = (data) => {
   return request({
     url: `/sampleform/device/matter/datum/save`,

sample-form-manager/db/service.xml

+<!-- service.xml -->
+<service>
+    <id>sample-form-manager</id>
+    <name>sample-form-manager</name>
+    <description></description>
+    <logpath>D:\home\publish\sample-form-manager\bin\</logpath>
+    <logmode>roll</logmode>
+    <depend></depend>
+    <executable>D:\home\publish\sample-form-manager\bin\start.cmd</executable>
+    <stopexecutable>D:\home\publish\sample-form-manager\bin\shutdown.cmd</stopexecutable>
+</service>
\ No newline at end of file

sample-form-manager/pom.xml

@@ -114,6 +114,18 @@
             </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>
+                <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
+                <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+                <package.environment>build</package.environment>
+                <skipUi>false</skipUi>
+            </properties>
+        </profile>
+
     </profiles>
 
     <dependencies>

sample-form-manager/src/main/bin/start.cmd

-echo off
-
-timeout /t 10 /nobreak >nul
+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"
@@ -8,19 +7,19 @@ set "JAVA=%JAVA_HOME%\bin\java.exe"
 set BASEDIR=%~dp0
 set BASEDIR="%BASEDIR:~0,-5%"
 
-set PROJECT_NAME=base-manager
+set PROJECT_NAME=@project.artifactId@
 
-set APP_NAME=%PROJECT_NAME%-1.0.0-SNAPSHOT.jar
+set APP_NAME=%PROJECT_NAME%-@project.version@.jar
 
-set LOG_PATH="%BASEDIR%/home/mortals/app/logs/%PROJECT_NAME%"
+set LOG_PATH="%BASEDIR%@profiles.log.path@/%PROJECT_NAME%"
 if not exist "%LOG_PATH%"  md "%LOG_PATH%"
 set GC_PATH=%LOG_PATH%/gc.log
 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%
@@ -30,7 +29,8 @@ set JVM_CONFIG=%JVM_CONFIG% -Dapp.name=%PROJECT_NAME%
 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"" (
@@ -54,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