Merge remote-tracking branch 'origin/lei_dev' into leng_dev

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ClientDetailsInitRunner.java

@@ -39,9 +39,20 @@ public class ClientDetailsInitRunner implements InitializingBean {
 
 	private final RedisTemplate redisTemplate;
 
+
+	/**
+	 * WebServerInitializedEvent
+	 * 使用 TransactionalEventListener 时启动时无法获取到事件
+	 */
 	@Async
 	@Order
-	@TransactionalEventListener({ WebServerInitializedEvent.class, ClientDetailsInitEvent.class })
+	@EventListener({ WebServerInitializedEvent.class })
+	public void WebServerInit(){
+		this.initClientDetails();
+	}
+	@Async
+	@Order
+	@TransactionalEventListener({ ClientDetailsInitEvent.class})
 	public void initClientDetails() {
 		log.debug("初始化客户端信息开始 ");
 

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java

@@ -59,9 +59,22 @@ public class DynamicRouteInitRunner implements InitializingBean {
 
 	private final RedisMessageListenerContainer listenerContainer;
 
+	/**
+	 * WebServerInitializedEvent
+	 * 使用 TransactionalEventListener 时启动时无法获取到事件
+	 */
 	@Async
 	@Order
-	@TransactionalEventListener({ WebServerInitializedEvent.class, DynamicRouteInitEvent.class })
+	@EventListener({ WebServerInitializedEvent.class })
+	public void WebServerInit(){
+		this.initRoute();
+	}
+
+
+
+	@Async
+	@Order
+	@TransactionalEventListener({ DynamicRouteInitEvent.class })
 	public void initRoute() {
 		redisTemplate.delete(CacheConstants.ROUTE_KEY);
 		log.info("开始初始化网关路由");