Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-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,6 @@
             <properties>
                 <profiles.active>develop</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>test</package.environment>
                 <skipUi>false</skipUi>
             </properties>
@@ -46,8 +46,6 @@
                 <profiles.server.debug>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5513</profiles.server.debug>
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <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>
                 <package.environment>test</package.environment>
                 <skipUi>true</skipUi>
             </properties>
@@ -58,8 +56,6 @@
             <properties>
                 <profiles.active>product</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>true</skipUi>
             </properties>
@@ -70,8 +66,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>
                 <package.environment>yibin</package.environment>
                 <skipUi>true</skipUi>
             </properties>
@@ -82,20 +76,25 @@
             <properties>
                 <profiles.active>regtest</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>true</skipUi>
             </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>
+                <skipUi>true</skipUi>
+            </properties>
+        </profile>
+
         <profile>
             <id>reg</id>
             <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>
                 <package.environment>build</package.environment>
                 <skipUi>true</skipUi>
             </properties>
@@ -106,8 +105,6 @@
             <properties>
                 <profiles.active>yanyuan</profiles.active>
                 <profiles.nacos.server-addr>172.16.30.245: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>true</skipUi>
             </properties>
@@ -118,8 +115,6 @@
             <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>
                 <package.environment>build</package.environment>
                 <skipUi>true</skipUi>
             </properties>
@@ -130,8 +125,6 @@
             <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>true</skipUi>
             </properties>

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

@@ -61,6 +61,7 @@ exec "$JAVACMD" $JAVA_OPTS \
 				-Dapp.name="$PROJECT_NAME" \
 				-Dapp.port="$PORT" \
 				-Dbasedir="$BASEDIR" \
+				-Dfile.encoding=utf-8 \
 				-Djava.io.tmpdir=$TEMP_PATH \
 				-jar $MAIN_CLASS \
 				> /dev/null &

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterExtServiceImpl.java

@@ -234,8 +234,8 @@ public class MatterExtServiceImpl extends AbstractCRUDServiceImpl<MatterExtDao,
     @Override
     public Rest<String> syncDelMatterBySiteId(SiteEntity siteEntity, Context context) {
         List<MatterEntity> govMatterList = getMatterEntities(siteEntity, context);
-        if (ObjectUtils.isEmpty(govMatterList)) return Rest.ok("爬取事项列表为空！");
         if (!deleted) return Rest.ok("配置不允许删除！");
+        if (ObjectUtils.isEmpty(govMatterList)) return Rest.ok("爬取事项列表为空！");
 
         log.info("计算差集");
         MatterQuery matterQuery = new MatterQuery();

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": "511902000000"
+  "areaCode": "513224000000"
 }
 
 

portal-manager/pom.xml

@@ -14,13 +14,22 @@
 	<packaging>jar</packaging>
 	<description>一体化政务门户管理平台</description>
 
+	<properties>
+		<!-- 默认值 -->
+		<profiles.server.debug></profiles.server.debug>
+		<profiles.server.port>17212</profiles.server.port>
+		<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
+		<profiles.log.level>info</profiles.log.level>
+		<profiles.publish.path>/home/publish</profiles.publish.path>
+		<profiles.filepath>/mortals/app/data</profiles.filepath>
+	</properties>
+
+
 	<profiles>
 		<profile>
 			<id>develop</id>
 			<properties>
 				<profiles.active>develop</profiles.active>
-				<profiles.server.port>17212</profiles.server.port>
-				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<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>
@@ -35,8 +44,6 @@
 			</activation>
 			<properties>
 				<profiles.active>test</profiles.active>
-				<profiles.server.port>17212</profiles.server.port>
-				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<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>
@@ -49,8 +56,6 @@
 			<id>product</id>
 			<properties>
 				<profiles.active>product</profiles.active>
-				<profiles.server.port>17212</profiles.server.port>
-				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<profiles.nacos.server-addr>192.168.0.250:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
@@ -62,8 +67,6 @@
 			<id>yibin</id>
 			<properties>
 				<profiles.active>yibin</profiles.active>
-				<profiles.server.port>17212</profiles.server.port>
-				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<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>
@@ -76,8 +79,6 @@
 			<id>sngx</id>
 			<properties>
 				<profiles.active>sngx</profiles.active>
-				<profiles.server.port>17212</profiles.server.port>
-				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<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>
@@ -90,8 +91,6 @@
 			<id>regtest</id>
 			<properties>
 				<profiles.active>regtest</profiles.active>
-				<profiles.server.port>17212</profiles.server.port>
-				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<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>
@@ -104,8 +103,18 @@
 			<id>reg</id>
 			<properties>
 				<profiles.active>reg</profiles.active>
-				<profiles.server.port>17212</profiles.server.port>
-				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
+				<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>true</skipUi>
+			</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>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
@@ -118,8 +127,6 @@
 			<id>yanyuan</id>
 			<properties>
 				<profiles.active>yanyuan</profiles.active>
-				<profiles.server.port>17212</profiles.server.port>
-				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<profiles.nacos.server-addr>172.16.30.245:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
@@ -132,8 +139,6 @@
 			<id>pengxi</id>
 			<properties>
 				<profiles.active>pengxi</profiles.active>
-				<profiles.server.port>17212</profiles.server.port>
-				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<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>
@@ -146,8 +151,6 @@
 			<id>bzjkq</id>
 			<properties>
 				<profiles.active>bzjkq</profiles.active>
-				<profiles.server.port>17212</profiles.server.port>
-				<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
 				<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>
@@ -157,8 +160,7 @@
 		</profile>
 
 	</profiles>
-	<properties>
-	</properties>
+
 
 	<dependencies>
 		<dependency>

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

@@ -59,6 +59,7 @@ exec "$JAVACMD" $JAVA_OPTS \
 				-Dapp.name="$PROJECT_NAME" \
 				-Dapp.port="$PORT" \
 				-Dbasedir="$BASEDIR" \
+				-Dfile.encoding=utf-8 \
 				-Djava.io.tmpdir=$TEMP_PATH \
 				-Dloader.path="file://$BASEDIR/conf,file://$BASEDIR/lib" \
 				-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=21072 \

smart-gateway/pom.xml

@@ -14,6 +14,23 @@
     <packaging>jar</packaging>
     <description>一体化政务网关</description>
 
+    <properties>
+        <!-- 流控 -->
+        <sentinel.version>1.8.4</sentinel.version>
+        <!-- 分布式事务 -->
+        <seata.version>1.5.1</seata.version>
+        <!-- 默认值 -->
+        <profiles.server.debug></profiles.server.debug>
+        <profiles.server.port>17214</profiles.server.port>
+        <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
+        <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>
         <profile>
             <id>develop</id>
@@ -22,13 +39,7 @@
             </activation>
             <properties>
                 <profiles.active>develop</profiles.active>
-                <profiles.server.port>17214</profiles.server.port>
-                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
                 <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>
-                <profiles.log.path>/mortals/app/logs</profiles.log.path>
-                <profiles.publish.path>/home/publish</profiles.publish.path>
 
             </properties>
         </profile>
@@ -36,23 +47,15 @@
             <id>test</id>
             <properties>
                 <profiles.active>test</profiles.active>
-                <profiles.server.port>17214</profiles.server.port>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <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>
             <id>product</id>
             <properties>
-                <profiles.active>yibin</profiles.active>
-                <profiles.server.port>17214</profiles.server.port>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
+                <profiles.active>product</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>
 
@@ -60,11 +63,7 @@
             <id>yibin</id>
             <properties>
                 <profiles.active>yibin</profiles.active>
-                <profiles.server.port>17214</profiles.server.port>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <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>
 
@@ -72,11 +71,7 @@
             <id>sngx</id>
             <properties>
                 <profiles.active>sngx</profiles.active>
-                <profiles.server.port>17214</profiles.server.port>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <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>
 
@@ -84,18 +79,7 @@
             <id>regtest</id>
             <properties>
                 <profiles.active>regtest</profiles.active>
-                <profiles.server.port>17214</profiles.server.port>
-                <profiles.publish.path>/home/publish</profiles.publish.path>
-                <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
-                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
-                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
                 <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>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
-                <profiles.log.level>info</profiles.log.level>
             </properties>
         </profile>
 
@@ -103,11 +87,7 @@
             <id>reg</id>
             <properties>
                 <profiles.active>reg</profiles.active>
-                <profiles.server.port>17214</profiles.server.port>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <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>
 
@@ -115,11 +95,7 @@
             <id>yanyuan</id>
             <properties>
                 <profiles.active>yanyuan</profiles.active>
-                <profiles.server.port>17214</profiles.server.port>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <profiles.nacos.server-addr>172.16.30.245:8848</profiles.nacos.server-addr>
-                <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
-                <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
             </properties>
         </profile>
 
@@ -127,23 +103,13 @@
             <id>pengxi</id>
             <properties>
                 <profiles.active>pengxi</profiles.active>
-                <profiles.server.port>17214</profiles.server.port>
-                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <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>
 
 
     </profiles>
 
-    <properties>
-        <!-- 流控 -->
-        <sentinel.version>1.8.4</sentinel.version>
-        <!-- 分布式事务 -->
-        <seata.version>1.5.1</seata.version>
-    </properties>
 
     <dependencies>
 

smart-gateway/src/main/bin/start.sh

@@ -59,6 +59,7 @@ exec "$JAVACMD" $JAVA_OPTS \
 				-Dapp.name="$PROJECT_NAME" \
 				-Dapp.port="$PORT" \
 				-Dbasedir="$BASEDIR" \
+				-Dfile.encoding=utf-8 \
 				-Djava.io.tmpdir=$TEMP_PATH \
 				-Dloader.path="file://$BASEDIR/conf,file://$BASEDIR/lib" \
 				-jar $MAIN_CLASS \