From 26b1eb214c93a5a6ee693fe79af8ab9db9f2fe4d Mon Sep 17 00:00:00 2001
From: qiaozhanwei <qiaozhanwei@outlook.com>
Date: Sun, 17 Nov 2019 20:55:04 -0600
Subject: [PATCH] server startup error modify (#1263)

* ConnectionFactory add paging intercepter

* remove spotbugs-annotations.jar LGPL protocol

* test

* catch exception transaction method does not take effect to modify

* .evn rollback

* DataSourceService rollback

* LogViewServiceGrpc rollback

* dockerfile add application-api.properties and change application.properties to application-dao.properties

* server startup error modify
---
 .../api/CombinedApplicationServer.java                 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java
index 6baadb3ea..c4e80cd4e 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java
@@ -27,11 +27,11 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Import;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
-@SpringBootApplication
-@ServletComponentScan
-@ComponentScan("org.apache.dolphinscheduler")
-@Import({MasterServer.class, WorkerServer.class})
-@EnableSwagger2
+//@SpringBootApplication
+//@ServletComponentScan
+//@ComponentScan("org.apache.dolphinscheduler")
+//@Import({MasterServer.class, WorkerServer.class})
+//@EnableSwagger2
 public class CombinedApplicationServer extends SpringBootServletInitializer {
 
     public static void main(String[] args) throws Exception {
-- 
GitLab