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

base-manager-ui/admin/.env.yibin

+#测试环境
+NODE_ENV = "yibin"
+VUE_APP_API_BASE_URL=http://192.168.2.144:11078
\ No newline at end of file

base-manager-ui/admin/package.json

@@ -8,7 +8,7 @@
     "build": "vue-cli-service build --mode production",
     "beta": "vue-cli-service build --mode beta",
     "test": "vue-cli-service build --mode test",
-    "yb": "vue-cli-service build --mode yb",
+    "yibin": "vue-cli-service build --mode yibin",
     "build:prod": "vue-cli-service build --model prod",
     "lint": "vue-cli-service lint",
     "predeploy": "yarn build",

base-manager/pom.xml

@@ -93,6 +93,31 @@
                 <skipDeploy>false</skipDeploy>
             </properties>
         </profile>
+
+        <profile>
+            <id>yibin</id>
+            <properties>
+                <profiles.active>yibin</profiles.active>
+                <profiles.server.ip>192.168.2.144</profiles.server.ip>
+                <profiles.server.port>17211</profiles.server.port>
+                <profiles.nginx.port>11071</profiles.nginx.port>
+                <profiles.server.gatewayport>11078</profiles.server.gatewayport>
+                <profiles.server.path>/base</profiles.server.path>
+                <profiles.publish.path>/home/publish</profiles.publish.path>
+                <profiles.rabbitmq.host>192.168.2.144</profiles.rabbitmq.host>
+                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
+                <profiles.rabbitmq.username>root</profiles.rabbitmq.username>
+                <profiles.rabbitmq.password>xhx@2022</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>
+                <package.environment>build</package.environment>
+                <skipDeploy>false</skipDeploy>
+            </properties>
+        </profile>
     </profiles>
 
     <dependencies>

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -328,7 +328,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
            throw new AppException("区域名称查询参数不能为空！");
         }
         //SiteEntity siteCache = this.getCache(query.getId().toString());
-        AreaEntity areaEntity = areaService.getCache(query.getAreaName());
+        AreaEntity areaEntity = areaService.selectOne(new AreaQuery().name(query.getAreaName()),context);
         if(ObjectUtils.isEmpty(areaEntity)){
             throw new AppException("区域名称不存在！");
         }

base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http

@@ -89,7 +89,7 @@ POST {{baseUrl}}/site/getAreaSitesBySite
 Content-Type: application/json
 
 {
-  "id":7
+  "areaName":"宜宾市"
 }
 
 

portal-manager-ui/admin/.env.yibin

+#宜宾环境
+NODE_ENV = "yibin"
+VUE_APP_API_BASE_URL=http://192.168.2.144:11078
\ No newline at end of file

portal-manager-ui/admin/package.json

@@ -6,6 +6,7 @@
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "test": "vue-cli-service build --model test",
+    "yibin": "vue-cli-service build --model yibin",
     "build:prod": "vue-cli-service build --model prod"
   },
   "dependencies": {

portal-manager/pom.xml

@@ -77,7 +77,32 @@
 				<profiles.rabbitmq.username>root_mq</profiles.rabbitmq.username>
 				<profiles.rabbitmq.password>xhx@2022</profiles.rabbitmq.password>
 				<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
-				<profiles.nacos.server-addr>192.168.0.218:8848</profiles.nacos.server-addr>
+				<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.level>INFO</profiles.log.level>
+				<profiles.log.path>/mortals/app/logs</profiles.log.path>
+				<package.environment>build</package.environment>
+				<skipDeploy>false</skipDeploy>
+			</properties>
+		</profile>
+
+		<profile>
+			<id>yibin</id>
+			<properties>
+				<profiles.active>yibin</profiles.active>
+				<profiles.server.ip>192.168.2.144</profiles.server.ip>
+				<profiles.server.port>17212</profiles.server.port>
+				<profiles.nginx.port>11072</profiles.nginx.port>
+				<profiles.server.gatewayport>11078</profiles.server.gatewayport>
+				<profiles.server.path>/zwfw</profiles.server.path>
+				<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>root_mq</profiles.rabbitmq.username>
+				<profiles.rabbitmq.password>xhx@2022</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.level>INFO</profiles.log.level>

smart-gateway/pom.xml

@@ -62,7 +62,7 @@
         <profile>
             <id>product</id>
             <properties>
-                <profiles.active>test</profiles.active>
+                <profiles.active>product</profiles.active>
                 <profiles.server.ip>192.168.0.251</profiles.server.ip>
                 <profiles.server.port>17214</profiles.server.port>
                 <profiles.nginx.port>11078</profiles.nginx.port>
@@ -80,6 +80,28 @@
 
             </properties>
         </profile>
+
+        <profile>
+            <id>yibin</id>
+            <properties>
+                <profiles.active>yibin</profiles.active>
+                <profiles.server.ip>192.168.2.144</profiles.server.ip>
+                <profiles.server.port>17214</profiles.server.port>
+                <profiles.nginx.port>11078</profiles.nginx.port>
+                <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
+                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
+                <profiles.rabbitmq.username>root</profiles.rabbitmq.username>
+                <profiles.rabbitmq.password>xhx@2022</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.level>INFO</profiles.log.level>
+                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
+                <profiles.publish.path>/home/publish</profiles.publish.path>
+
+            </properties>
+        </profile>
     </profiles>
 
     <properties>