From b34a9eae1919840a5ed0b5e964cae8b7013c366d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Sat, 20 Jul 2024 10:28:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E5=85=B3window=20sh?=
=?UTF-8?q?ell?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
base-manager/db/add.sql | 5 ++++-
base-manager/src/main/bin/start.cmd | 1 +
.../mortals/httpclient/base/BaseAreaController.http | 2 +-
.../java/com/mortals/httpclient/system/system.http | 8 +++++++-
smart-gateway/assembly/assembly.xml | 11 +++++++++++
smart-gateway/src/main/bin/start.cmd | 9 ++++-----
6 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/base-manager/db/add.sql b/base-manager/db/add.sql
index ddbc05c0..ac686096 100644
--- a/base-manager/db/add.sql
+++ b/base-manager/db/add.sql
@@ -249,4 +249,7 @@ ALTER TABLE mortals_sys_dept ADD COLUMN `inNum` int(9) DEFAULT '0' COMMENT '
INSERT INTO mortals_xhx_task VALUES (null, '鍚屾鍏ㄩ儴绔欑偣浜嬮」鏉愭枡闄勪欢', 'SyncMatterDaumFileTask', 0, 'SyncMatterDaumFileTask', '', '', 1, 3600, '16:05', '', '192.168.1.107', '2024-05-18 16:05:00', 0, '2024-03-01 10:59:53', 1, '绯荤粺绠＄悊鍛�');
-
+-- ----------------------------
+2024-07-20
+-- ----------------------------
+INSERT INTO `mortals_sys_base_area`(`id`, `ancestors`, `name`, `iid`, `pid`, `haveSonArea`, `haveSonDept`, `haveGetDept`, `haveGetMatterList`, `areaCode`, `areaLevel`, `shortName`, `domain`, `status`, `createTime`, `createUserId`, `updateTime`) VALUES (null, '', '宸翠腑缁忔祹寮€鍙戝尯', 'f190133f82dd46f0ae2e2116a8b9b13b', '60a505e9dfa643e9826902e0810de55f', 'false', 'True', 'false', 'false', '511971000000', 3, '宸翠腑缁忔祹寮€鍙戝尯', 'bzsbzq.sczwfw.gov.cn', 1, '2021-07-19 11:59:30', NULL, NULL);
diff --git a/base-manager/src/main/bin/start.cmd b/base-manager/src/main/bin/start.cmd
index 8e183a7a..9f9c6e44 100644
--- a/base-manager/src/main/bin/start.cmd
+++ b/base-manager/src/main/bin/start.cmd
@@ -1,3 +1,4 @@
+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
diff --git a/base-manager/src/test/java/com/mortals/httpclient/base/BaseAreaController.http b/base-manager/src/test/java/com/mortals/httpclient/base/BaseAreaController.http
index f55db00e..b1bcfc9c 100644
--- a/base-manager/src/test/java/com/mortals/httpclient/base/BaseAreaController.http
+++ b/base-manager/src/test/java/com/mortals/httpclient/base/BaseAreaController.http
@@ -54,7 +54,7 @@ POST {{baseUrl}}/base/area/genSubAreaByAreaName
Content-Type: application/json
{
- "areaCode": "513232000000"
+ "areaCode": "511971000000"
}
diff --git a/base-manager/src/test/java/com/mortals/httpclient/system/system.http b/base-manager/src/test/java/com/mortals/httpclient/system/system.http
index 9d9cbbf0..498b6695 100644
--- a/base-manager/src/test/java/com/mortals/httpclient/system/system.http
+++ b/base-manager/src/test/java/com/mortals/httpclient/system/system.http
@@ -252,4 +252,10 @@ Content-Type: application/json
POST {{baseUrl}}/test/limit
Content-Type: application/json
-{}
\ No newline at end of file
+{}
+###鏇存柊鐨偆璧勬簮鏂囦欢
+GET {{baseUrl}}/skin/base/updateSkinPath
+Content-Type: application/json
+
+{}
+
diff --git a/smart-gateway/assembly/assembly.xml b/smart-gateway/assembly/assembly.xml
index 083f4948..644c4c68 100644
--- a/smart-gateway/assembly/assembly.xml
+++ b/smart-gateway/assembly/assembly.xml
@@ -18,6 +18,17 @@
<outputDirectory>boot</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
+
+ <fileSet>
+ <directory>./db</directory>
+ <includes>
+ <include>*.sql</include>
+ <include>service.exe</include>
+ <include>service.xml</include>
+ </includes>
+ <outputDirectory>db</outputDirectory>
+ <fileMode>0755</fileMode>
+ </fileSet>
</fileSets>
<files>
diff --git a/smart-gateway/src/main/bin/start.cmd b/smart-gateway/src/main/bin/start.cmd
index e891fcc1..66684b57 100644
--- a/smart-gateway/src/main/bin/start.cmd
+++ b/smart-gateway/src/main/bin/start.cmd
@@ -1,4 +1,5 @@
-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,13 +18,11 @@ 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=%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%
-rem jvm config
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%
@@ -53,11 +52,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
--
2.24.3