Merge branch 'dev' of http://192.168.1.220:10080/chenweida/jw2.0 into dev

Conflicts:
	svr-lib-parent-pom/pom.xml
	svr/svr-base/pom.xml

common/common-mysql/pom.xml

@@ -52,5 +52,10 @@
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-jpa</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-commons</artifactId>
        </dependency>
    </dependencies>
</project>

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

@@ -8,6 +8,20 @@ security:
    password:  jkzl
#发现服务
eureka:
  client:
    healthcheck:
      enabled: true #启动监控检查
  instance:
    #eurika使用IP不使用host
    prefer-ip-address: true
    #定制化在eurika中显示的名称
    ##instance-id: ${spring.application.name}:${spring.application.instance_id:${server.port}}
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
---
spring:
  profiles: jwdev

svr-lib-parent-pom/pom.xml

@@ -44,7 +44,8 @@
        <version.jackson>2.8.1</version.jackson>
        <version.myCommon>1.0.0</version.myCommon>
        <version.spring>4.3.8.RELEASE</version.spring>
        <version.spring-data-jpa>2.0.0.M2</version.spring-data-jpa>
        <version.spring-data-jpa>1.11.3.RELEASE</version.spring-data-jpa>
        <version.spring-data-common>1.13.3.RELEASE</version.spring-data-common>
        <version.zipkin>1.24.0</version.zipkin>
        <version.hibernate>5.0.12.Final</version.hibernate>
        <version.hibernate-jpa>1.0.0.Final</version.hibernate-jpa>
@@ -273,7 +274,6 @@
                <artifactId>spring-core</artifactId>
                <version>${version.spring}</version>
            </dependency>
            <dependency>
                <groupId>org.springframework</groupId>
                <artifactId>spring-web</artifactId>
@@ -297,7 +297,7 @@
            <dependency>
                <groupId>org.springframework.data</groupId>
                <artifactId>spring-data-commons</artifactId>
                <version>${version.spring-data-jpa}</version>
                <version>${version.spring-data-common}</version>
            </dependency>
            <!--spring end-->

svr/svr-base/pom.xml

@@ -38,10 +38,6 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-autoconfigure</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -83,6 +79,10 @@
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-core</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
@@ -96,5 +96,17 @@
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-web</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-jpa</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
            <artifactId>spring-data-commons</artifactId>
        </dependency>
    </dependencies>
</project>

svr/svr-base/src/main/java/com/yihu/jw/SvrBaseApplication.java

@@ -8,6 +8,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.web.client.RestTemplate;
/**

svr/svr-base/src/main/java/com/yihu/jw/base/controller/FunctionController.java

@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
/**

svr/svr-base/src/main/java/com/yihu/jw/base/dao/FunctionDao.java

@@ -8,11 +8,14 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/5/19.
 */
public interface FunctionDao  extends PagingAndSortingRepository<Function, Long>, JpaSpecificationExecutor<Function> {
public interface FunctionDao extends PagingAndSortingRepository<Function, Long>, JpaSpecificationExecutor<Function> {
    @Query("from Function f where f.name=?1 and f.status=0")
    public Function findByName(String name);
    Function findByName(String name);
    @Query("from Function f where f.name=?1 and f.status=0 and f.code != ?2")
    public Function findByNameExcludeCode(String name,String code);
    Function findByNameExcludeCode(String name, String code);
    @Query("from Function f where f.code=?1 and f.status=0")
    Function findByCode(String code);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/ModuleDao.java

@@ -1,6 +1,5 @@
package com.yihu.jw.base.dao;
import com.yihu.jw.base.model.Function;
import com.yihu.jw.base.model.Module;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
@@ -11,9 +10,11 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 */
public interface ModuleDao extends PagingAndSortingRepository<Module, Long>, JpaSpecificationExecutor<Module> {
    @Query("from Module f where f.name=?1 and f.status=0")
    public Module findByName(String name);
    Module findByName(String name);
    @Query("from Module f where f.name=?1 and f.status=0 and f.code != ?2")
    public Module findByNameExcludeCode(String name, String code);
    Module findByNameExcludeCode(String name, String code);
    @Query("from Module f where f.code=?1 and f.status=0")
    Module findByCode(String code);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/SaasDao.java

@@ -1,6 +1,5 @@
package com.yihu.jw.base.dao;
import com.yihu.jw.base.model.Function;
import com.yihu.jw.base.model.Saas;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
@@ -11,9 +10,11 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 */
public interface SaasDao extends PagingAndSortingRepository<Saas, Long>, JpaSpecificationExecutor<Saas> {
    @Query("from Saas f where f.name=?1 and f.status=0")
    public Saas findByName(String name);
    Saas findByName(String name);
    @Query("from Saas f where f.name=?1 and f.status=0 and f.code != ?2")
    public Saas findByNameExcludeCode(String name, String code);
    Saas findByNameExcludeCode(String name, String code);
    @Query("from Saas f where f.code=?1 and f.status=0")
    Saas findByCode(String code);
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/FunctionService.java

@@ -6,7 +6,6 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.BaseContants;
import com.yihu.jw.restmodel.common.CommonContants;
import com.yihu.jw.restmodel.exception.ApiException;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

svr/svr-base/src/main/java/com/yihu/jw/wx/dao/WxTemplateDao.java

@@ -0,0 +1,7 @@
package com.yihu.jw.wx.dao;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public class WxTemplateDao {
}

svr/svr-base/src/main/resources/application.yml

@@ -4,6 +4,8 @@ spring:
    name:  svr-base  ##注册到发现服务的id 如果id一样 eurika会自动做负载
---
spring:
  profiles: dev