浏览代码

jw2.0配置bug修复

LiTaohong 7 年之前
父节点
当前提交
725be36098
共有 2 个文件被更改,包括 20 次插入9 次删除
  1. 20 4
      svr-lib-parent-pom/pom.xml
  2. 0 5
      svr/svr-demo/src/main/java/com/yihu/jw/controller/DemoController.java

+ 20 - 4
svr-lib-parent-pom/pom.xml

@ -160,6 +160,11 @@
                <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>
@ -268,6 +273,11 @@
                <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>
@ -521,16 +531,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>
@ -608,7 +618,13 @@
                <!--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>

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

@ -15,12 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
public class DemoController {
    @Autowired
    @Qualifier("SchedulerFactoryBean")
    SchedulerFactoryBean schedulerFactoryBean;
    @Autowired
    ApplicationContextAware f;
    @Autowired
    private QuartzHelper quartzHelper;