jw2.0配置bug修复

base/common-data-mysql/pom.xml

@@ -16,7 +16,7 @@
    <dependencies>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <groupId>com.yihu.base</groupId>
            <artifactId>common-util</artifactId>
        </dependency>
        <dependency>

base/common-quartz/src/main/java/com/yihu/base/config/quartz/DefaultJobFactory.java

@@ -1,4 +1,4 @@
package com.yihu.jw.config.quartz;
package com.yihu.base.config.quartz;
import org.quartz.spi.TriggerFiredBundle;
import org.springframework.beans.factory.annotation.Autowired;

base/common-quartz/src/main/java/com/yihu/base/config/quartz/DefaultSchedulerConfig.java

@@ -1,11 +1,13 @@
package com.yihu.jw.config.quartz;
package com.yihu.base.config.quartz;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.PropertiesFactoryBean;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.core.io.ClassPathResource;
import org.springframework.scheduling.quartz.SchedulerFactoryBean;
@@ -22,15 +24,15 @@ public class DefaultSchedulerConfig {
    private ApplicationContext applicationContext;
    @Autowired
    private DefaultJobFactory jobFactory;
    @Autowired
    private DataSource dataSource;
    @Value("${quartz.namespace}")
    private String namspace = "default_namespace";
    @Value("${quartz.overwriteExistingJobs}")
    private Boolean OverwriteExistingJobs = true;
    @Bean
    @Bean("SchedulerFactoryBean")
    SchedulerFactoryBean schedulerFactoryBean() throws IOException {
        SchedulerFactoryBean bean = new SchedulerFactoryBean();
        bean.setJobFactory(jobFactory);

base/common-quartz/src/main/java/com/yihu/base/config/quartz/QuartzHelper.java

@@ -1,7 +1,8 @@
package com.yihu.jw.config.quartz;
package com.yihu.base.config.quartz;
import org.quartz.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.quartz.SchedulerFactoryBean;
import org.springframework.stereotype.Component;

common/common-exception/pom.xml

@@ -16,7 +16,7 @@
    <dependencies>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <groupId>com.yihu.base</groupId>
            <artifactId>common-util</artifactId>
        </dependency>
        <dependency>

common/common-rest-model/pom.xml

@@ -16,7 +16,7 @@
    <dependencies>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <groupId>com.yihu.base</groupId>
            <artifactId>common-util</artifactId>
        </dependency>
        <dependency>

server/svr-configuration/src/main/resources/bootstrap.yml

@@ -28,7 +28,7 @@ spring:
##git配置
  cloud:
    config:
      failFast: true ##启动快速失败 即链接不到配置服务就启动失败
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
#          uri: http://192.168.1.220:10080/chenweida/jw.config.git
@@ -43,7 +43,7 @@ spring:
##git配置
  cloud:
    config:
      failFast: true ##启动快速失败 即链接不到配置服务就启动失败
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
#          uri: http://192.168.1.220:10080/EHR/ehr.config.git
@@ -73,7 +73,7 @@ spring:
##git配置
  cloud:
    config:
      failFast: true ##启动快速失败 即链接不到配置服务就启动失败
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        native:
          search-locations: file:G:\idea_workspace\jkzl_git\jw.config  ##本地的got配置路径
          search-locations: file:D:\Software\soft\IdeaWorkSpace\jwDevelopment\jw.config  ##本地的got配置路径

svr-lib-parent-pom/pom.xml

@@ -120,7 +120,7 @@
                <version>${version.myCommon}</version>
            </dependency>
            <dependency>
                <groupId>com.yihu.jw</groupId>
                <groupId>com.yihu.base</groupId>
                <artifactId>common-util</artifactId>
                <version>${version.myCommon}</version>
            </dependency>
@@ -160,11 +160,6 @@
                <artifactId>spring-cloud-starter-ribbon</artifactId>
                <version>${version.springCloud}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-zuul</artifactId>
                <version>${version.springCloud}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-bus-amqp</artifactId>
@@ -273,11 +268,6 @@
                <artifactId>spring-boot-starter-data-jpa</artifactId>
                <version>${version.springBoot}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-logging</artifactId>
                <version>${version.springBoot}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-starter-websocket</artifactId>
@@ -444,6 +434,7 @@
                <groupId>org.springside</groupId>
                <artifactId>springside-core</artifactId>
                <version>${version.springside}</version>
                <classifier>GA</classifier>
            </dependency>
            <!--hibernate start-->
            <dependency>
@@ -530,16 +521,16 @@
            <!--json end -->
            <!-- es 客户端 start-->
            <dependency>
            <!--<dependency>
                <groupId>io.searchbox</groupId>
                <artifactId>jest</artifactId>
                <version>${version.jest}</version>
            </dependency>
            <dependency>
            </dependency>-->
            <!--<dependency>
                <groupId>org.elasticsearch</groupId>
                <artifactId>elasticsearch</artifactId>
                <version>${version.elasticsearch}</version>
            </dependency>
            </dependency>-->
            <!-- es 客户端 end-->
            <dependency>
@@ -617,13 +608,7 @@
                <!--json 包-->
            </dependency>
            <dependency>
                <groupId>org.springframework.data</groupId>
                <artifactId>spring-data-hadoop-hbase</artifactId>
                <version>${version.spring-data-hadoop}</version>
            </dependency>
            <!-- hbase start-->
            <dependency>
                <groupId>org.springframework.data</groupId>
                <artifactId>spring-data-hadoop-hbase</artifactId>

svr/svr-base/pom.xml

@@ -29,8 +29,7 @@
            <artifactId>common-exception</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-util</artifactId>
            <groupId>com.yihu.base</groupId>            <artifactId>common-util</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>

svr/svr-demo/src/main/java/com/yihu/jw/DemoApplication.java

@@ -1,4 +1,4 @@
package com.yihu.jw;
package com.yihu;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

svr/svr-demo/src/main/java/com/yihu/jw/controller/DemoController.java

@@ -1,25 +1,26 @@
package com.yihu.jw.controller;
import com.yihu.jw.config.quartz.QuartzHelper;
import com.yihu.jw.restmodel.common.Envelop;
import org.quartz.SchedulerException;
import com.yihu.base.config.quartz.QuartzHelper;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.ApplicationContextAware;
import org.springframework.scheduling.quartz.SchedulerFactoryBean;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created by chenweida on 2017/11/3.
 */
@RestController
public class DemoController {
    @Autowired
    @Qualifier("SchedulerFactoryBean")
    SchedulerFactoryBean schedulerFactoryBean;
    @Autowired
    ApplicationContextAware f;
    @Autowired
    private QuartzHelper quartzHelper;

svr/svr-manage/pom.xml

@@ -30,7 +30,7 @@
            <artifactId>common-rest-model</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <groupId>com.yihu.base</groupId>
            <artifactId>common-util</artifactId>
        </dependency>
        <dependency>
@@ -108,6 +108,8 @@
        <dependency>
            <groupId>org.springside</groupId>
            <artifactId>springside-core</artifactId>
            <version>4.2.3-GA</version>
            <!--<classifier>GA</classifier>-->
        </dependency>
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>

svr/svr-wlyy/pom.xml

@@ -36,7 +36,7 @@
            <artifactId>common-rest-model</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <groupId>com.yihu.base</groupId>
            <artifactId>common-util</artifactId>
        </dependency>
        <dependency>