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

base-manager/pom.xml

@@ -62,48 +62,6 @@
             </properties>
         </profile>
 
-        <profile>
-            <id>yibin-test</id>
-            <properties>
-                <profiles.active>yibin-test</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>test</package.environment>
-                <skipUi>false</skipUi>
-            </properties>
-        </profile>
-        <profile>
-            <id>product</id>
-            <properties>
-                <profiles.active>product</profiles.active>
-                <profiles.server.path>/base</profiles.server.path>
-                <profiles.server.port>17211</profiles.server.port>
-                <profiles.publish.path>/home/publish</profiles.publish.path>
-                <profiles.rabbitmq.host>192.168.0.251</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.path>/home/mortals/app/logs</profiles.log.path>
-                <profiles.log.level>INFO</profiles.log.level>
-                <package.environment>build</package.environment>
-                <skipUi>true</skipUi>
-            </properties>
-        </profile>
-
         <profile>
             <id>yibin</id>
             <properties>

portal-manager/pom.xml

@@ -282,7 +282,7 @@
 							<arguments>
 								<argument></argument>
 							</arguments>
-							<workingDirectory>${project.parent.basedir}/portal-manager-ui/admin</workingDirectory>
+							<workingDirectory>${project.parent.basedir}/${project.artifactId}-ui/admin</workingDirectory>
 						</configuration>
 					</execution>
 
@@ -298,7 +298,7 @@
 								<argument>run</argument>
 								<arguments>${package.environment}</arguments>
 							</arguments>
-							<workingDirectory>${project.parent.basedir}/portal-manager-ui/admin</workingDirectory>
+							<workingDirectory>${project.parent.basedir}/${project.artifactId}-ui/admin</workingDirectory>
 						</configuration>
 					</execution>
 				</executions>