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

base-manager/pom.xml

@@ -63,6 +63,27 @@
             </properties>
         </profile>
 
+        <profile>
+            <id>product</id>
+            <properties>
+                <profiles.active>product</profiles.active>
+                <profiles.server.path>/base</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>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>
+                <package.environment>build</package.environment>
+                <skipUi>false</skipUi>
+            </properties>
+        </profile>
+
         <profile>
             <id>yibin</id>
             <properties>

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

 # 开发环境配置
 NODE_ENV = development
-VUE_APP_API_BASE_URL=http://8.136.255.30:11078
+#VUE_APP_API_BASE_URL=http://8.136.255.30:11078
+VUE_APP_API_BASE_URL=http://192.168.0.98:11078
 #图片显示拼接
 VUE_APP_API_IMG_URL=http://8.136.255.30:11078/
 #余林
-VUE_APP_API_PHP_URL=http://8.136.255.30:8090
+#VUE_APP_API_PHP_URL=http://8.136.255.30:8090
+VUE_APP_API_PHP_URL=http://192.168.0.98:8090
 #宜宾
 #VUE_APP_API_BASE_URL=http://10.12.185.213:11072
 

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/components/HandlingDetails.vue

@@ -49,7 +49,7 @@
                 <span><i class="lable">取号时间:</i>{{queEvaData.taketime?queEvaData.taketime:'--'}}</span>
                 <span><i class="lable">排队编码：</i>{{queEvaData.flownum?queEvaData.flownum:'--'}}</span>
                 <span><i class="lable">取号方式：</i>{{queEvaData.wy_signin>0?'在线取号':'现场取号'}}</span>
-                <span><i class="lable">注册方式：</i>{{queEvaData.register_type?queEvaData.register_type=="Applets"?'小程序':queEvaData.register_type=="wechat"?'公众号':queEvaData.register_type=="app"?'自助终端':'现场注册':'现场注册'}}</span>
+                <span><i class="lable">注册方式：</i>{{queEvaData.register_type?queEvaData.register_type=="Applets"?'小程序':queEvaData.register_type=="wechat"?'公众号':queEvaData.register_type=="app"?'自助终端':queEvaData.register_type:'现场注册'}}</span>
                 <span><i class="lable">取号设备：</i>{{queEvaData.take_name?queEvaData.take_name:'--'}}</span>
               </div>
             </div>

smart-gateway/pom.xml

@@ -84,14 +84,14 @@
         <profile>
             <id>product</id>
             <properties>
-                <profiles.active>product</profiles.active>
-                <profiles.server.ip>192.168.0.251</profiles.server.ip>
+                <profiles.active>yibin</profiles.active>
+                <profiles.server.ip>192.168.0.250</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_mq</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>xhx@2022</profiles.rabbitmq.password>
+                <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>
@@ -99,7 +99,6 @@
                 <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>