Merge branch 'dev' of chenweida/jw2.0 into dev

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

@@ -10,19 +10,13 @@ import java.util.List;
/**
 * Created by chenweida on 2017/5/19.
 */
public interface FunctionDao extends PagingAndSortingRepository<Function, Long>, JpaSpecificationExecutor<Function> {
public interface FunctionDao extends PagingAndSortingRepository<Function, String>, JpaSpecificationExecutor<Function> {
    @Query("from Function f where f.name=?1 and f.status=1")
    Function findByName(String name);
    @Query("from Function f where f.name=?1 and f.status=1 and f.code != ?2")
    Function findByNameExcludeCode(String name, String code);
    @Query("from Function f where f.code=?1 and f.status=1")
    Function findByCode(String code);
    @Query("from Function f where f.parentCode=?1 and f.status=1")
    List<Function> getChildren(String code);
    @Query("from Function f where f.parentId=?1 and f.status=1")
    List<Function> getChildren(String parentId);
    @Query("from Function f where f.status=1")
    List<Function> findAll();

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

@@ -10,16 +10,13 @@ import java.util.List;
/**
 * Created by chenweida on 2017/5/19.
 */
public interface ModuleDao extends PagingAndSortingRepository<Module, Long>, JpaSpecificationExecutor<Module> {
public interface ModuleDao extends PagingAndSortingRepository<Module, String>, JpaSpecificationExecutor<Module> {
    @Query("from Module f where f.name=?1 and f.status=1")
    Module findByName(String name);
    @Query("from Module f where f.name=?1 and f.status=1 and f.code != ?2")
    Module findByNameExcludeCode(String name, String code);
    @Query("from Module f where f.code=?1 and f.status=1")
    Module findByCode(String code);
    @Query("from Module f where f.parentCode=?1 and f.status=1")
    List<Module> getChildren(String code);

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

@@ -12,12 +12,12 @@ import java.util.List;
/**
 * Created by chenweida on 2017/5/22.
 */
public interface ModuleFunctionDao extends PagingAndSortingRepository<ModuleFunction, Long>, JpaSpecificationExecutor<ModuleFunction> {
public interface ModuleFunctionDao extends PagingAndSortingRepository<ModuleFunction, String>, JpaSpecificationExecutor<ModuleFunction> {
    @Transactional
    @Modifying
    @Query("delete from ModuleFunction es where es.moduleId = ?1")
    int deleteByModuleCode(String moduleCode);
    int deleteByModuleCode(String moduleId);
    @Query("from ModuleFunction mf where mf.moduleId = ?1")
    List<ModuleFunction> findByModuleCode(String code);

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

@@ -8,7 +8,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/5/19.
 */
public interface SaasDao extends PagingAndSortingRepository<Saas, Long>, JpaSpecificationExecutor<Saas> {
public interface SaasDao extends PagingAndSortingRepository<Saas, String>, JpaSpecificationExecutor<Saas> {
    @Query("from Saas f where f.name=?1 and f.status=1")
    Saas findByName(String name);

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

@@ -9,7 +9,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/5/22.
 */
public interface SaasModuleDao extends PagingAndSortingRepository<SaasModule, Long>, JpaSpecificationExecutor<SaasModule> {
public interface SaasModuleDao extends PagingAndSortingRepository<SaasModule, String>, JpaSpecificationExecutor<SaasModule> {
    @Modifying
    @Query("delete from SaasModule es where es.saasId = ?1")
    int deleteBySaasCode(String saasCode);

svr/svr-base/src/main/java/com/yihu/jw/business/login/dao/BaseLoginAccountDao.java

@@ -7,5 +7,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/6/20.
 */
public interface BaseLoginAccountDao extends PagingAndSortingRepository<BaseLoginAccount, Long>, JpaSpecificationExecutor<BaseLoginAccount> {
public interface BaseLoginAccountDao extends PagingAndSortingRepository<BaseLoginAccount, String>, JpaSpecificationExecutor<BaseLoginAccount> {
}

svr/svr-base/src/main/java/com/yihu/jw/business/login/dao/BaseLoginLogDao.java

@@ -7,5 +7,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/6/20.
 */
public interface BaseLoginLogDao extends PagingAndSortingRepository<BaseLoginLog, Long>, JpaSpecificationExecutor<BaseLoginLog> {
public interface BaseLoginLogDao extends PagingAndSortingRepository<BaseLoginLog, String>, JpaSpecificationExecutor<BaseLoginLog> {
}

svr/svr-base/src/main/java/com/yihu/jw/business/sms/dao/SmsDao.java

@@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface SmsDao extends PagingAndSortingRepository<BaseSms, Long>, JpaSpecificationExecutor<BaseSms> {
public interface SmsDao extends PagingAndSortingRepository<BaseSms, String>, JpaSpecificationExecutor<BaseSms> {
    @Query("from Function f where f.name=?1 and f.status=1")
    BaseSms findByName(String name);

svr/svr-base/src/main/java/com/yihu/jw/business/sms/dao/SmsGatewayDao.java

@@ -8,7 +8,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/5/22.
 */
public interface SmsGatewayDao extends PagingAndSortingRepository<BaseSmsGateway, Long>, JpaSpecificationExecutor<BaseSmsGateway> {
public interface SmsGatewayDao extends PagingAndSortingRepository<BaseSmsGateway, String>, JpaSpecificationExecutor<BaseSmsGateway> {
    @Query("from BaseSmsGateway f where f.name=?1 and f.status=1")
    BaseSmsGateway findByName(String name);

svr/svr-base/src/main/java/com/yihu/jw/business/version/dao/UserVersionDao.java

@@ -0,0 +1,11 @@
package com.yihu.jw.business.version.dao;
import com.yihu.jw.base.version.BaseUserVersion;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/11/13.
 */
public interface UserVersionDao extends PagingAndSortingRepository<BaseUserVersion, String>, JpaSpecificationExecutor<BaseUserVersion> {
}

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

@@ -10,7 +10,7 @@ import java.util.List;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public interface WechatDao extends PagingAndSortingRepository<WxWechat, Long>, JpaSpecificationExecutor<WxWechat> {
public interface WechatDao extends PagingAndSortingRepository<WxWechat, String>, JpaSpecificationExecutor<WxWechat> {
    @Query("from WxWechat w where w.appId = ?1 and w.status!=-1")
    WxWechat findByAppId(String appId);

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

@@ -10,7 +10,7 @@ import java.util.List;
/**
 * Created by Administrator on 2017/5/18 0018.
 */
public interface WxAccessTokenDao extends PagingAndSortingRepository<WxAccessToken, Long>, JpaSpecificationExecutor<WxAccessToken> {
public interface WxAccessTokenDao extends PagingAndSortingRepository<WxAccessToken, String>, JpaSpecificationExecutor<WxAccessToken> {
    @Query("from WxAccessToken w where w.wechatCode =?1 order by w.addTimestamp desc")
    List<WxAccessToken> getWxAccessTokenByCode(String wechatCode);

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

@@ -8,7 +8,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public interface WxGraphicMessageDao extends PagingAndSortingRepository<WxGraphicMessage, Long>, JpaSpecificationExecutor<WxGraphicMessage> {
public interface WxGraphicMessageDao extends PagingAndSortingRepository<WxGraphicMessage, String>, JpaSpecificationExecutor<WxGraphicMessage> {
    @Query("from WxWechat w where w.appId = ?1 and w.status!=-1")
    WxGraphicMessage findByAppId(String appId);

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

@@ -10,7 +10,7 @@ import java.util.List;
/**
 * Created by Administrator on 2017/5/19 0019.
 */
public interface WxMenuDao  extends PagingAndSortingRepository<WxMenu, Long>, JpaSpecificationExecutor<WxMenu> {
public interface WxMenuDao  extends PagingAndSortingRepository<WxMenu, String>, JpaSpecificationExecutor<WxMenu> {
    @Query("from WxMenu m where m.id = ?1 and m.status = 1")

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

@@ -10,7 +10,7 @@ import java.util.List;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public interface WxTemplateDao extends PagingAndSortingRepository<WxTemplate, Long>, JpaSpecificationExecutor<WxTemplate> {
public interface WxTemplateDao extends PagingAndSortingRepository<WxTemplate, String>, JpaSpecificationExecutor<WxTemplate> {
    @Query("from WxTemplate w where w.id = ?1 and w.status =1")

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/BaseSaasDao.java

@@ -8,7 +8,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/5/19.
 */
public interface BaseSaasDao extends PagingAndSortingRepository<Saas, Long>, JpaSpecificationExecutor<Saas> {
public interface BaseSaasDao extends PagingAndSortingRepository<Saas, String>, JpaSpecificationExecutor<Saas> {
    @Query("from Saas f where f.name=?1 and f.status=1")
    Saas findByName(String name);

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/agreement/WlyyAgreementDao.java

@@ -8,7 +8,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2017/6/1 0001.
 */
public interface WlyyAgreementDao extends PagingAndSortingRepository<WlyyAgreement, Long>, JpaSpecificationExecutor<WlyyAgreement> {
public interface WlyyAgreementDao extends PagingAndSortingRepository<WlyyAgreement, String>, JpaSpecificationExecutor<WlyyAgreement> {
    @Query("from WlyyAgreement w where w.id=?1 and w.status !=-1")

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/agreement/WlyyAgreementKpiDao.java

@@ -8,7 +8,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2017/6/1 0001.
 */
public interface WlyyAgreementKpiDao extends PagingAndSortingRepository<WlyyAgreementKpi, Long>, JpaSpecificationExecutor<WlyyAgreementKpi> {
public interface WlyyAgreementKpiDao extends PagingAndSortingRepository<WlyyAgreementKpi, String>, JpaSpecificationExecutor<WlyyAgreementKpi> {
    @Query("from WlyyAgreementKpi w where w.id=?1 and w.status !=-1")

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/agreement/WlyyAgreementKpiLogDao.java

@@ -8,7 +8,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2017/6/1 0001.
 */
public interface WlyyAgreementKpiLogDao  extends PagingAndSortingRepository<WlyyAgreementKpiLog, Long>, JpaSpecificationExecutor<WlyyAgreementKpiLog> {
public interface WlyyAgreementKpiLogDao  extends PagingAndSortingRepository<WlyyAgreementKpiLog, String>, JpaSpecificationExecutor<WlyyAgreementKpiLog> {
    @Query("from WlyyAgreementKpiLog w where w.id =?1")
    WlyyAgreementKpiLog findById(String code);

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/agreement/WlyySignFamilyDao.java

@@ -10,7 +10,7 @@ import java.util.List;
/**
 * Created by Administrator on 2017/6/2 0002.
 */
public interface WlyySignFamilyDao  extends PagingAndSortingRepository<WlyySignFamily, Long>, JpaSpecificationExecutor<WlyySignFamily> {
public interface WlyySignFamilyDao  extends PagingAndSortingRepository<WlyySignFamily, String>, JpaSpecificationExecutor<WlyySignFamily> {
    @Query("from WlyySignFamily w where w.id = ?1")
    WlyySignFamily findById(String code);

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/doctor/DoctorDao.java

@@ -8,7 +8,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2017/6/7 0007.
 */
public interface DoctorDao extends PagingAndSortingRepository<BaseDoctors, Long>, JpaSpecificationExecutor<BaseDoctors> {
public interface DoctorDao extends PagingAndSortingRepository<BaseDoctors, String>, JpaSpecificationExecutor<BaseDoctors> {
    @Query("from BaseDoctors d where d.id = ?1 and d.status !=-1")
    BaseDoctors findById(String code);

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/doctor/HospitalDao.java

@@ -8,7 +8,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2017/6/7 0007.
 */
public interface HospitalDao extends PagingAndSortingRepository<BaseOrgHospital, Long>, JpaSpecificationExecutor<BaseOrgHospital> {
public interface HospitalDao extends PagingAndSortingRepository<BaseOrgHospital, String>, JpaSpecificationExecutor<BaseOrgHospital> {
    @Query("from BaseOrgHospital w where w.code = ?1")
    BaseOrgHospital findByCode(String code);

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/patient/AdvertisementDao.java

@@ -10,7 +10,7 @@ import java.util.List;
/**
 * Created by Administrator on 2017/6/6 0006.
 */
public interface AdvertisementDao extends PagingAndSortingRepository<WlyyAdvertisement, Long>, JpaSpecificationExecutor<WlyyAdvertisement> {
public interface AdvertisementDao extends PagingAndSortingRepository<WlyyAdvertisement, String>, JpaSpecificationExecutor<WlyyAdvertisement> {
    @Query("from WlyyAdvertisement w where w.id=?1 and w.status !=-1")

svr/svr-wlyy/src/main/java/com/yihu/jw/wlyy/dao/patient/BasePatientDao.java

@@ -8,7 +8,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2017/6/6 0006.
 */
public interface BasePatientDao extends PagingAndSortingRepository<BasePatient, Long>, JpaSpecificationExecutor<BasePatient> {
public interface BasePatientDao extends PagingAndSortingRepository<BasePatient, String>, JpaSpecificationExecutor<BasePatient> {
    @Query("from BasePatient w where w.code =?1")
    BasePatient findByCode(String code);

web-gateway/readMe.MD

@@ -19,31 +19,9 @@
    
    
版本控制
    网关对外的版本控制根据访问路径中的第一个参数决定
    例如：http://localhost:8088/v2/patient/hello   那个就是访问v2的这个版本
    对应的代码实现，在方法上添加版本的注解 @ApiVersion() 已经对应的版本号 1
    nginx根据cookie中的是否是正式版本跳转服务器
    
    @RestController
    @RequestMapping("/{version}/patient")
    public class PatientController {
    
        @GetMapping("/hello")
        @ApiVersion(1)
        @ResponseBody
        public String hello1(HttpServletRequest request){
            System.out.println("haha1..........");
    
            return "hello";
        }
    
        @GetMapping("/hello")
        @ApiVersion(2)
        @ResponseBody
        public String hello2(HttpServletRequest request){
            System.out.println("haha2.........");
            return "hello";
        }
    }
    
    如果我们传大于v2的版本那么系统会自动识别到最新的版本 v2
    例如http://localhost:8088/v5/patient/hello     那么其实还是调用v2版本
    cookie
    {
        "prod":true, ##true正式 false测试
    }

web-gateway/src/main/java/com/yihu/jw/controller/DemoController.java

@@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest;
 * Created by chenweida on 2017/5/10.
 */
@RestController
@RequestMapping("/{version}/patient")
@RequestMapping("/patient")
@Api(description = "患者")
@RefreshScope
public class DemoController {