Commit 30db5c14 authored by liwenhe1993's avatar liwenhe1993 Committed by dailidong
Browse files

Api module relp server module/1756 (#1766) 



* Remove server module on api module

1. Remove server module and add dao module.
2. Move quartz in server module to dao module.
3. Update config and class.


to resolve conflicts，I deleted CombinedApplicationServer.java

Co-authored-by: default avatardailidong <dailidong66@gmail.com>
parent 9549910f

dockerfile/conf/dolphinscheduler/conf/quartz.properties

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ org.quartz.jobStore.dataSource = myDs 
#============================================================================

# Configure Datasources

#============================================================================

org.quartz.dataSource.myDs.connectionProvider.class = org.apache.dolphinscheduler.server.quartz.DruidConnectionProvider

org.quartz.dataSource.myDs.connectionProvider.class = org.apache.dolphinscheduler.dao.quartz.DruidConnectionProvider

org.quartz.dataSource.myDs.driver = org.postgresql.Driver

org.quartz.dataSource.myDs.URL=jdbc:postgresql://127.0.0.1:5432/dolphinscheduler

org.quartz.dataSource.myDs.user=root

dolphinscheduler-api/pom.xml

+7 −25
Original line number Diff line number Diff line
@@ -31,35 +31,19 @@ 
    <dependency>

      <groupId>org.apache.dolphinscheduler</groupId>

      <artifactId>dolphinscheduler-alert</artifactId>

    </dependency>



    <dependency>

      <groupId>org.apache.dolphinscheduler</groupId>

      <artifactId>dolphinscheduler-server</artifactId>

      <exclusions>

        <exclusion>

          <groupId>io.netty</groupId>

          <artifactId>netty</artifactId>

        </exclusion>

        <exclusion>

          <groupId>io.netty</groupId>

          <artifactId>netty-all</artifactId>

        </exclusion>

        <exclusion>

          <groupId>com.google</groupId>

          <artifactId>netty</artifactId>

        </exclusion>

        <exclusion>

          <artifactId>leveldbjni-all</artifactId>

          <groupId>org.fusesource.leveldbjni</groupId>

        </exclusion>

        <exclusion>

          <artifactId>protobuf-java</artifactId>

          <groupId>com.google.protobuf</groupId>

          <groupId>org.apache.dolphinscheduler</groupId>

          <artifactId>dolphinscheduler-dao</artifactId>

        </exclusion>

      </exclusions>

    </dependency>



    <dependency>

      <groupId>org.apache.dolphinscheduler</groupId>

      <artifactId>dolphinscheduler-dao</artifactId>

    </dependency>



    <!--springboot-->

    <dependency>

      <groupId>org.springframework.boot</groupId>
@@ -92,8 +76,6 @@ 
      </exclusions>

    </dependency>







    <dependency>

      <groupId>org.springframework.boot</groupId>

      <artifactId>spring-boot-starter-aop</artifactId>

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper; 
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;

import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper;

import org.apache.dolphinscheduler.dao.utils.cron.CronUtils;

import org.apache.dolphinscheduler.server.quartz.ProcessScheduleJob;

import org.apache.dolphinscheduler.server.quartz.QuartzExecutors;

import org.apache.dolphinscheduler.dao.quartz.ProcessScheduleJob;

import org.apache.dolphinscheduler.dao.quartz.QuartzExecutors;

import com.baomidou.mybatisplus.core.metadata.IPage;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

import org.quartz.CronExpression;

dolphinscheduler-common/src/main/resources/quartz.properties

+1 −1
Original line number Diff line number Diff line
@@ -58,6 +58,6 @@ org.quartz.jobStore.dataSource = myDs 
#============================================================================

# Configure Datasources  

#============================================================================

org.quartz.dataSource.myDs.connectionProvider.class = org.apache.dolphinscheduler.server.quartz.DruidConnectionProvider

org.quartz.dataSource.myDs.connectionProvider.class = org.apache.dolphinscheduler.dao.quartz.DruidConnectionProvider

org.quartz.dataSource.myDs.maxConnections = 10

org.quartz.dataSource.myDs.validationQuery = select 1
 
 No newline at end of file

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/DruidConnectionProvider.java→dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/quartz/DruidConnectionProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package org.apache.dolphinscheduler.server.quartz;

package org.apache.dolphinscheduler.dao.quartz;



import com.alibaba.druid.pool.DruidDataSource;

import org.quartz.SchedulerException;