Merge remote-tracking branch 'origin/master'

agent-manager/pom.xml

@@ -25,7 +25,7 @@
 		<profiles.publish.path>/home/publish</profiles.publish.path>
 		<profiles.filepath>/mortals/app/data</profiles.filepath>
 		<skipDeploy>true</skipDeploy>
-		<phpUrl>http://127.0.0.1:8076/zwfw/inter/user/list</phpUrl>
+		<profiles.phpUrl>http://127.0.0.1:8076/zwfw/inter/user/list</profiles.phpUrl>
 	</properties>
 
 
@@ -55,7 +55,7 @@
 				<profiles.active>product</profiles.active>
 				<profiles.server.debug>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=16517</profiles.server.debug>
 				<profiles.nacos.server-addr>192.168.0.250:8848</profiles.nacos.server-addr>
-				<phpUrl>http://192.168.0.231:8076/zwfw_yx/inter/user/userlist</phpUrl>
+				<profiles.phpUrl>http://192.168.0.231:8076/zwfw_yx/inter/user/userlist</profiles.phpUrl>
 			</properties>
 		</profile>
 

agent-manager/src/main/resources/bootstrap.yml

@@ -48,5 +48,4 @@ application:
   auth:
     unloginUrl: /refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/file/common/*,/test*,/resource/list,/api/asset/*,/api/*,/uploads/*,/project/file/*,/file/*
     uncheckUrl: /refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/file/common/*,/test*,/resource/list,/api/asset/*,/api/*,/uploads/*,/project/file/*,/file/*
-
 phpUrl: @profiles.phpUrl@