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

common-lib-parent-pom/pom.xml

@@ -21,6 +21,7 @@
        <module>../common/common-exception</module>
        <module>../common/common-request-mapping</module>
        <module>../common/common-util</module>
        <module>../common/common-fegin</module>
    </modules>

common/common-fegin/pom.xml

@@ -0,0 +1,161 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.base</groupId>
        <artifactId>common-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../../common-lib-parent-pom/pom.xml</relativePath>
    </parent>
    <groupId>com.yihu.jw</groupId>
    <artifactId>common-fegin</artifactId>
    <version>1.0.0</version>
    <dependencies>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-exception</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-request-mapping</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-rest-model</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.base</groupId>
            <artifactId>common-swagger</artifactId>
        </dependency>
        <!--<dependency>-->
        <!--<groupId>com.yihu.base</groupId>-->
        <!--<artifactId>common-security</artifactId>-->
        <!--</dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-starter-tomcat</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>
            <version>3.1.0</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.apache.tomcat</groupId>
            <artifactId>tomcat-servlet-api</artifactId>
            <version>8.5.28</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-jpa</artifactId>
        </dependency>
        <!--  <dependency>
              <groupId>org.springframework.boot</groupId>
              <artifactId>spring-boot-starter-tomcat</artifactId>
          </dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-jdbc</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-aop</artifactId>
        </dependency>
        <!--  <dependency>
              <groupId>org.springframework.boot</groupId>
              <artifactId>spring-boot-starter-actuator</artifactId>
          </dependency>-->
        <!--<dependency>-->
        <!--<groupId>org.springframework.boot</groupId>-->
        <!--<artifactId>spring-boot-starter-security</artifactId>-->
        <!--</dependency>-->
        <!--   <dependency>
               <groupId>org.springframework.boot</groupId>
               <artifactId>spring-boot-starter-data-redis</artifactId>
           </dependency>-->
        <!--  <dependency>
              <groupId>org.springframework.cloud</groupId>
              <artifactId>spring-cloud-starter-oauth2</artifactId>
          </dependency>-->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-eureka</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-config</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-feign</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-hystrix</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-zuul</artifactId>
        </dependency>
        <!--zipkin支持分布式追踪系统-->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-sleuth</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-annotations</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-core</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
        </dependency>
        <dependency>
            <groupId>org.json</groupId>
            <artifactId>json</artifactId>
        </dependency>
        <!--    <dependency>
                <groupId>org.springframework.security</groupId>
                <artifactId>spring-security-core</artifactId>
                <version>RELEASE</version>
            </dependency>-->
        <dependency>
            <groupId>commons-collections</groupId>
            <artifactId>commons-collections</artifactId>
        </dependency>
        <dependency>
            <groupId>commons-codec</groupId>
            <artifactId>commons-codec</artifactId>
        </dependency>
        <dependency>
            <groupId>com.sun.jna</groupId>
            <artifactId>jna</artifactId>
            <version>3.0.9</version>
        </dependency>
    </dependencies>
</project>

web-gateway/src/main/java/com/yihu/jw/feign/DemoFeign.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign;
package com.yihu.jw.fegin;
import com.yihu.jw.commnon.Contants;
import com.yihu.jw.feign.fallbackfactory.DemoFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.DemoFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.web.bind.annotation.RequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/archives/ArchivesFeign.java

@@ -1,7 +1,6 @@
package com.yihu.jw.feign.archives;
package com.yihu.jw.fegin.archives;
import com.yihu.jw.feign.fallbackfactory.archives.ArchivesFallbackFactory;
import com.yihu.jw.feign.fallbackfactory.iot.company.IotCompanyFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.archives.ArchivesFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.archives.PatientArchivesInfoVO;
import com.yihu.jw.restmodel.archives.PatientArchivesVO;

web-gateway/src/main/java/com/yihu/jw/feign/base/base/FunctionFeign.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.base.base;
package com.yihu.jw.fegin.base.base;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.fallbackfactory.base.base.FunctionFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.base.base.FunctionFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.BaseRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/base/base/ModuleFeign.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.base.base;
package com.yihu.jw.fegin.base.base;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.fallbackfactory.base.base.ModuleFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.base.base.ModuleFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.BaseRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/base/base/SaasFeign.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.base.base;
package com.yihu.jw.fegin.base.base;
import com.yihu.jw.feign.fallbackfactory.base.base.SaasFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.base.base.SaasFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.BaseRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/base/base/SystemDictFeign.java

@@ -1,8 +1,7 @@
package com.yihu.jw.feign.base.base;
package com.yihu.jw.fegin.base.base;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.fallbackfactory.base.base.SystemDictFeignFallbackFactory;
import com.yihu.jw.feign.fallbackfactory.base.base.SystemDictFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.base.base.SystemDictFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.BaseRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/base/base/SystemDictListFeign.java

@@ -1,8 +1,7 @@
package com.yihu.jw.feign.base.base;
package com.yihu.jw.fegin.base.base;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.fallbackfactory.base.base.SystemDictListFeignFallbackFactory;
import com.yihu.jw.feign.fallbackfactory.base.base.SystemDictListFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.base.base.SystemDictListFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.BaseRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/base/user/BaseMenuFeign.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.base.user;
package com.yihu.jw.fegin.base.user;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.fallbackfactory.base.user.BaseMenuFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.base.user.BaseMenuFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.BaseUserRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/base/user/BaseRoleFeign.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.base.user;
package com.yihu.jw.fegin.base.user;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.fallbackfactory.base.user.BaseRoleFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.base.user.BaseRoleFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.BaseUserRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/base/user/EmployFeign.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.base.user;
package com.yihu.jw.fegin.base.user;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.fallbackfactory.base.user.EmployeeFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.base.user.EmployeeFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.BaseRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/base/version/UserVersionFeign.java

@@ -1,7 +1,6 @@
package com.yihu.jw.feign.base.version;
package com.yihu.jw.fegin.base.version;
import com.yihu.jw.feign.fallbackfactory.base.base.SaasFeignFallbackFactory;
import com.yihu.jw.feign.fallbackfactory.base.version.UserVersionFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.base.version.UserVersionFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.rm.base.BaseRequestMapping;
import org.springframework.cloud.netflix.feign.FeignClient;

web-gateway/src/main/java/com/yihu/jw/feign/base/wx/AccessTokenFeign.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.base.wx;
package com.yihu.jw.fegin.base.wx;
import com.yihu.jw.feign.fallbackfactory.base.wx.AccessTokenFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.base.wx.AccessTokenFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.WechatRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/base/wx/GraphicMessageFeign.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.base.wx;
package com.yihu.jw.fegin.base.wx;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.fallbackfactory.base.wx.GraphicMessageFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.base.wx.GraphicMessageFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;;
import com.yihu.jw.rm.base.WechatRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/base/wx/WechatFeign.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.base.wx;
package com.yihu.jw.fegin.base.wx;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.fallbackfactory.base.wx.WechatFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.base.wx.WechatFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.WechatRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/base/wx/WechatMenuFeign.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.base.wx;
package com.yihu.jw.fegin.base.wx;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.fallbackfactory.base.wx.WechatMenuFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.base.wx.WechatMenuFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.WechatRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/base/wx/WechatTemplateFeign.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.base.wx;
package com.yihu.jw.fegin.base.wx;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.fallbackfactory.base.wx.WechatTemplateFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.base.wx.WechatTemplateFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.WechatRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/DemoFeignFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory;
package com.yihu.jw.fegin.fallbackfactory;
import com.yihu.jw.feign.DemoFeign;
import com.yihu.jw.fegin.DemoFeign;
import feign.hystrix.FallbackFactory;
import org.springframework.stereotype.Component;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/archives/ArchivesFallbackFactory.java

@@ -1,18 +1,13 @@
package com.yihu.jw.feign.fallbackfactory.archives;
package com.yihu.jw.fegin.fallbackfactory.archives;
import com.yihu.jw.feign.archives.ArchivesFeign;
import com.yihu.jw.feign.iot.company.IotCompanyFeign;
import com.yihu.jw.fegin.archives.ArchivesFeign;
import com.yihu.jw.restmodel.archives.PatientArchivesInfoVO;
import com.yihu.jw.restmodel.archives.PatientArchivesVO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.archives.PatientArchivesMapping;
import feign.hystrix.FallbackFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestParam;
/**

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/base/FunctionFeignFallbackFactory.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.fallbackfactory.base.base;
package com.yihu.jw.fegin.fallbackfactory.base.base;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.base.FunctionFeign;
import com.yihu.jw.fegin.base.base.FunctionFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.beans.factory.annotation.Autowired;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/base/ModuleFeignFallbackFactory.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.fallbackfactory.base.base;
package com.yihu.jw.fegin.fallbackfactory.base.base;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.base.ModuleFeign;
import com.yihu.jw.fegin.base.base.ModuleFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.beans.factory.annotation.Autowired;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/base/SaasFeignFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.base.base;
package com.yihu.jw.fegin.fallbackfactory.base.base;
import com.yihu.jw.feign.base.base.SaasFeign;
import com.yihu.jw.fegin.base.base.SaasFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.stereotype.Component;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/base/SystemDictFeignFallbackFactory.java

@@ -1,8 +1,7 @@
package com.yihu.jw.feign.fallbackfactory.base.base;
package com.yihu.jw.fegin.fallbackfactory.base.base;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.base.FunctionFeign;
import com.yihu.jw.feign.base.base.SystemDictFeign;
import com.yihu.jw.fegin.base.base.SystemDictFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.beans.factory.annotation.Autowired;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/base/SystemDictListFeignFallbackFactory.java

@@ -1,8 +1,7 @@
package com.yihu.jw.feign.fallbackfactory.base.base;
package com.yihu.jw.fegin.fallbackfactory.base.base;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.base.FunctionFeign;
import com.yihu.jw.feign.base.base.SystemDictListFeign;
import com.yihu.jw.fegin.base.base.SystemDictListFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.beans.factory.annotation.Autowired;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/user/BaseMenuFeignFallbackFactory.java

@@ -1,8 +1,7 @@
package com.yihu.jw.feign.fallbackfactory.base.user;
package com.yihu.jw.fegin.fallbackfactory.base.user;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.user.BaseMenuFeign;
import com.yihu.jw.feign.base.user.BaseRoleFeign;
import com.yihu.jw.fegin.base.user.BaseMenuFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.beans.factory.annotation.Autowired;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/user/BaseRoleFeignFallbackFactory.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.fallbackfactory.base.user;
package com.yihu.jw.fegin.fallbackfactory.base.user;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.user.BaseRoleFeign;
import com.yihu.jw.fegin.base.user.BaseRoleFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.beans.factory.annotation.Autowired;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/user/EmployeeFeignFallbackFactory.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.fallbackfactory.base.user;
package com.yihu.jw.fegin.fallbackfactory.base.user;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.user.EmployFeign;
import com.yihu.jw.fegin.base.user.EmployFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.beans.factory.annotation.Autowired;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/version/UserVersionFeignFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.base.version;
package com.yihu.jw.fegin.fallbackfactory.base.version;
import com.yihu.jw.feign.base.version.UserVersionFeign;
import com.yihu.jw.fegin.base.version.UserVersionFeign;
import feign.hystrix.FallbackFactory;
import org.springframework.stereotype.Component;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/wx/AccessTokenFeignFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.base.wx;
package com.yihu.jw.fegin.fallbackfactory.base.wx;
import com.yihu.jw.feign.base.wx.AccessTokenFeign;
import com.yihu.jw.fegin.base.wx.AccessTokenFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.stereotype.Component;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/wx/GraphicMessageFeignFallbackFactory.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.fallbackfactory.base.wx;
package com.yihu.jw.fegin.fallbackfactory.base.wx;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.wx.GraphicMessageFeign;
import com.yihu.jw.fegin.base.wx.GraphicMessageFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.beans.factory.annotation.Autowired;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/wx/WechatFeignFallbackFactory.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.fallbackfactory.base.wx;
package com.yihu.jw.fegin.fallbackfactory.base.wx;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.wx.WechatFeign;
import com.yihu.jw.fegin.base.wx.WechatFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.beans.factory.annotation.Autowired;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/wx/WechatMenuFeignFallbackFactory.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.fallbackfactory.base.wx;
package com.yihu.jw.fegin.fallbackfactory.base.wx;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.wx.WechatMenuFeign;
import com.yihu.jw.fegin.base.wx.WechatMenuFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.beans.factory.annotation.Autowired;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/wx/WechatTemplateFeignFallbackFactory.java

@@ -1,7 +1,7 @@
package com.yihu.jw.feign.fallbackfactory.base.wx;
package com.yihu.jw.fegin.fallbackfactory.base.wx;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.wx.WechatTemplateFeign;
import com.yihu.jw.fegin.base.wx.WechatTemplateFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.beans.factory.annotation.Autowired;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/iot/common/IotFileUploadFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.iot.common;
package com.yihu.jw.fegin.fallbackfactory.iot.common;
import com.yihu.jw.feign.iot.common.IotFileUploadFeign;
import com.yihu.jw.fegin.iot.common.IotFileUploadFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.common.UploadVO;
import feign.hystrix.FallbackFactory;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/iot/common/IotSystemDictFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.iot.common;
package com.yihu.jw.fegin.fallbackfactory.iot.common;
import com.yihu.jw.feign.iot.common.IotSystemDictFeign;
import com.yihu.jw.fegin.iot.common.IotSystemDictFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.dict.IotSystemDictVO;
import feign.hystrix.FallbackFactory;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/iot/company/IotCompanyFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.iot.company;
package com.yihu.jw.fegin.fallbackfactory.iot.company;
import com.yihu.jw.feign.iot.company.IotCompanyFeign;
import com.yihu.jw.fegin.iot.company.IotCompanyFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.company.IotCompanyCertificateVO;
import com.yihu.jw.restmodel.iot.company.IotCompanyVO;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/iot/data_input/DataInputFeignFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.iot.data_input;
package com.yihu.jw.fegin.fallbackfactory.iot.data_input;
import com.yihu.jw.feign.iot.data_input.DataInputFeign;
import com.yihu.jw.fegin.iot.data_input.DataInputFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.beans.factory.annotation.Autowired;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/iot/data_input/DataSearchFeignFallbackFactory.java

@@ -1,7 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.iot.data_input;
package com.yihu.jw.fegin.fallbackfactory.iot.data_input;
import com.yihu.jw.feign.iot.data_input.DataInputFeign;
import com.yihu.jw.feign.iot.data_input.DataSearchFeign;
import com.yihu.jw.fegin.iot.data_input.DataSearchFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.beans.factory.annotation.Autowired;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/iot/data_input/DataStandardConvertFeignFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.iot.data_input;
package com.yihu.jw.fegin.fallbackfactory.iot.data_input;
import com.yihu.jw.feign.iot.data_input.DataStandardConvertFeign;
import com.yihu.jw.fegin.iot.data_input.DataStandardConvertFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.beans.factory.annotation.Autowired;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/iot/device/IotDeviceFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.iot.device;
package com.yihu.jw.fegin.fallbackfactory.iot.device;
import com.yihu.jw.feign.iot.device.IotDeviceFeign;
import com.yihu.jw.fegin.iot.device.IotDeviceFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.base.BaseEnvelop;
import com.yihu.jw.restmodel.iot.common.ExistVO;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/iot/device/IotDeviceOrderFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.iot.device;
package com.yihu.jw.fegin.fallbackfactory.iot.device;
import com.yihu.jw.feign.iot.device.IotDeviceOrderFeign;
import com.yihu.jw.fegin.iot.device.IotDeviceOrderFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.device.IotDeviceOrderVO;
import com.yihu.jw.restmodel.iot.device.IotOrderPurchaseVO;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/iot/device/IotDeviceQualityFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.iot.device;
package com.yihu.jw.fegin.fallbackfactory.iot.device;
import com.yihu.jw.feign.iot.device.IotDeviceQualityFeign;
import com.yihu.jw.fegin.iot.device.IotDeviceQualityFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.device.IotDeviceQualityInspectionPlanVO;
import feign.hystrix.FallbackFactory;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/iot/device/IotPatientDeviceFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.iot.device;
package com.yihu.jw.fegin.fallbackfactory.iot.device;
import com.yihu.jw.feign.iot.device.IotPatientDeviceFeign;
import com.yihu.jw.fegin.iot.device.IotPatientDeviceFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.device.IotDeviceVO;
import com.yihu.jw.restmodel.iot.device.IotPatientDeviceVO;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/iot/product/IotProductFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.iot.product;
package com.yihu.jw.fegin.fallbackfactory.iot.product;
import com.yihu.jw.feign.iot.product.IotProductFeign;
import com.yihu.jw.fegin.iot.product.IotProductFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.product.IotMaintenanceUnitVO;
import com.yihu.jw.restmodel.iot.product.IotProductBaseInfoVO;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/wlyy/agreement/WlyyAgreementFeignFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.wlyy.agreement;
package com.yihu.jw.fegin.fallbackfactory.wlyy.agreement;
import com.yihu.jw.feign.wlyy.agreement.WlyyAgreementFeign;
import com.yihu.jw.fegin.wlyy.agreement.WlyyAgreementFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.stereotype.Component;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/wlyy/agreement/WlyyAgreementKpiFeignFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.wlyy.agreement;
package com.yihu.jw.fegin.fallbackfactory.wlyy.agreement;
import com.yihu.jw.feign.wlyy.agreement.WlyyAgreementKpiFeign;
import com.yihu.jw.fegin.wlyy.agreement.WlyyAgreementKpiFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.stereotype.Component;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/wlyy/agreement/WlyyAgreementKpiLogFeignFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.wlyy.agreement;
package com.yihu.jw.fegin.fallbackfactory.wlyy.agreement;
import com.yihu.jw.feign.wlyy.agreement.WlyyAgreementKpiLogFeign;
import com.yihu.jw.fegin.wlyy.agreement.WlyyAgreementKpiLogFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.stereotype.Component;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/wlyy/agreement/WlyySignFamilyFeignFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.wlyy.agreement;
package com.yihu.jw.fegin.fallbackfactory.wlyy.agreement;
import com.yihu.jw.feign.wlyy.agreement.WlyySignFamilyFeign;
import com.yihu.jw.fegin.wlyy.agreement.WlyySignFamilyFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.stereotype.Component;

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/wlyy/patient/AdvertisementFeignFallbackFactory.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.fallbackfactory.wlyy.patient;
package com.yihu.jw.fegin.fallbackfactory.wlyy.patient;
import com.yihu.jw.feign.wlyy.patient.AdvertisementFeign;
import com.yihu.jw.fegin.wlyy.patient.AdvertisementFeign;
import com.yihu.jw.restmodel.common.Envelop;
import feign.hystrix.FallbackFactory;
import org.springframework.stereotype.Component;

web-gateway/src/main/java/com/yihu/jw/feign/iot/common/IotFileUploadFeign.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.iot.common;
package com.yihu.jw.fegin.iot.common;
import com.yihu.jw.feign.fallbackfactory.iot.common.IotFileUploadFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.iot.common.IotFileUploadFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.common.UploadVO;

web-gateway/src/main/java/com/yihu/jw/feign/iot/common/IotSystemDictFeign.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.iot.common;
package com.yihu.jw.fegin.iot.common;
import com.yihu.jw.feign.fallbackfactory.iot.common.IotSystemDictFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.iot.common.IotSystemDictFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.dict.IotSystemDictVO;

web-gateway/src/main/java/com/yihu/jw/feign/iot/company/IotCompanyFeign.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.iot.company;
package com.yihu.jw.fegin.iot.company;
import com.yihu.jw.feign.fallbackfactory.iot.company.IotCompanyFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.iot.company.IotCompanyFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.company.IotCompanyCertificateVO;

web-gateway/src/main/java/com/yihu/jw/feign/iot/data_input/DataInputFeign.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.iot.data_input;
package com.yihu.jw.fegin.iot.data_input;
import com.yihu.jw.feign.fallbackfactory.iot.data_input.DataInputFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.iot.data_input.DataInputFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.iot.DataRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/iot/data_input/DataSearchFeign.java

@@ -1,8 +1,7 @@
package com.yihu.jw.feign.iot.data_input;
package com.yihu.jw.fegin.iot.data_input;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.feign.fallbackfactory.iot.data_input.DataInputFeignFallbackFactory;
import com.yihu.jw.feign.fallbackfactory.iot.data_input.DataSearchFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.iot.data_input.DataSearchFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.iot.DataRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/iot/data_input/DataStandardConvertFeign.java

@@ -1,7 +1,6 @@
package com.yihu.jw.feign.iot.data_input;
package com.yihu.jw.fegin.iot.data_input;
import com.yihu.jw.feign.fallbackfactory.iot.data_input.DataInputFeignFallbackFactory;
import com.yihu.jw.feign.fallbackfactory.iot.data_input.DataStandardConvertFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.iot.data_input.DataStandardConvertFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.iot.DataRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/iot/device/IotDeviceFeign.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.iot.device;
package com.yihu.jw.fegin.iot.device;
import com.yihu.jw.feign.fallbackfactory.iot.device.IotDeviceFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.iot.device.IotDeviceFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.base.BaseEnvelop;

web-gateway/src/main/java/com/yihu/jw/feign/iot/device/IotDeviceOrderFeign.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.iot.device;
package com.yihu.jw.fegin.iot.device;
import com.yihu.jw.feign.fallbackfactory.iot.device.IotDeviceOrderFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.iot.device.IotDeviceOrderFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.device.IotDeviceOrderVO;

web-gateway/src/main/java/com/yihu/jw/feign/iot/device/IotDeviceQualityFeign.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.iot.device;
package com.yihu.jw.fegin.iot.device;
import com.yihu.jw.feign.fallbackfactory.iot.device.IotDeviceQualityFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.iot.device.IotDeviceQualityFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.device.IotDeviceQualityInspectionPlanVO;

web-gateway/src/main/java/com/yihu/jw/feign/iot/device/IotPatientDeviceFeign.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.iot.device;
package com.yihu.jw.fegin.iot.device;
import com.yihu.jw.feign.fallbackfactory.iot.device.IotPatientDeviceFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.iot.device.IotPatientDeviceFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.device.IotDeviceVO;

web-gateway/src/main/java/com/yihu/jw/feign/iot/product/IotProductFeign.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.iot.product;
package com.yihu.jw.fegin.iot.product;
import com.yihu.jw.feign.fallbackfactory.iot.product.IotProductFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.iot.product.IotProductFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.product.IotMaintenanceUnitVO;

web-gateway/src/main/java/com/yihu/jw/feign/wlyy/agreement/WlyyAgreementFeign.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.wlyy.agreement;
package com.yihu.jw.fegin.wlyy.agreement;
import com.yihu.jw.feign.fallbackfactory.wlyy.agreement.WlyyAgreementFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.wlyy.agreement.WlyyAgreementFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/wlyy/agreement/WlyyAgreementKpiFeign.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.wlyy.agreement;
package com.yihu.jw.fegin.wlyy.agreement;
import com.yihu.jw.feign.fallbackfactory.wlyy.agreement.WlyyAgreementKpiFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.wlyy.agreement.WlyyAgreementKpiFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/wlyy/agreement/WlyyAgreementKpiLogFeign.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.wlyy.agreement;
package com.yihu.jw.fegin.wlyy.agreement;
import com.yihu.jw.feign.fallbackfactory.wlyy.agreement.WlyyAgreementKpiLogFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.wlyy.agreement.WlyyAgreementKpiLogFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/wlyy/agreement/WlyySignFamilyFeign.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.wlyy.agreement;
package com.yihu.jw.fegin.wlyy.agreement;
import com.yihu.jw.feign.fallbackfactory.wlyy.agreement.WlyySignFamilyFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.wlyy.agreement.WlyySignFamilyFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;

web-gateway/src/main/java/com/yihu/jw/feign/wlyy/patient/AdvertisementFeign.java

@@ -1,6 +1,6 @@
package com.yihu.jw.feign.wlyy.patient;
package com.yihu.jw.fegin.wlyy.patient;
import com.yihu.jw.feign.fallbackfactory.wlyy.patient.AdvertisementFeignFallbackFactory;
import com.yihu.jw.fegin.fallbackfactory.wlyy.patient.AdvertisementFeignFallbackFactory;
import com.yihu.jw.restmodel.CommonContants;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.wlyy.WlyyRequestMapping;

svr-lib-parent-pom/pom.xml

@@ -93,7 +93,7 @@
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-dependencies</artifactId>
                <version>Edgware.RELEASE</version>
                <version>Edgware.SR2</version>
                <type>pom</type>
                <scope>import</scope>
            </dependency>

svr/svr-wlyy/readme.MD

@@ -1 +1,3 @@
svr-wlyy i健康公共业务后台
svr-wlyy i健康公共业务后台

web-gateway/pom.xml

@@ -16,6 +16,11 @@
    <packaging>war</packaging>
    <dependencies>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-fegin</artifactId>
            <version>1.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-exception</artifactId>

web-gateway/src/main/java/com/yihu/jw/WebGateWayAppliaction.java

@@ -8,7 +8,6 @@ import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.netflix.feign.EnableFeignClients;
import org.springframework.cloud.netflix.hystrix.EnableHystrix;
import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
import org.springframework.context.annotation.ComponentScan;
/**
@@ -19,9 +18,11 @@ import org.springframework.context.annotation.ComponentScan;
@EnableDiscoveryClient//服务注册到发现服务
@EnableHystrix //启动断路器
//@EnableZuulProxy //启动zuul代理 路由
@EnableFeignClients //声名式的客户端
@EnableFeignClients(
        basePackages = {"com.yihu.jw.fegin"}
) //声名式的客户端
@EnableCircuitBreaker
@ComponentScan(basePackages={"com"})
@ComponentScan(basePackages = {"com"})
public class WebGateWayAppliaction {
    public static void main(String[] args) {

web-gateway/src/main/java/com/yihu/jw/config/security/UserService.java

@@ -1,7 +1,7 @@
//package com.yihu.jw.config.security;
//
//
//import com.yihu.jw.feign.base.user.EmployFeign;
//import com.yihu.jw.fegin.base.user.EmployFeign;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.security.core.authority.AuthorityUtils;
//import org.springframework.security.core.userdetails.User;

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

@@ -3,7 +3,7 @@ package com.yihu.jw.controller.archives;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.archives.ArchivesContants;
import com.yihu.jw.feign.archives.ArchivesFeign;
import com.yihu.jw.fegin.archives.ArchivesFeign;
import com.yihu.jw.restmodel.archives.PatientArchivesInfoVO;
import com.yihu.jw.restmodel.archives.PatientArchivesVO;
import com.yihu.jw.restmodel.common.Envelop;

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

@@ -4,7 +4,7 @@ import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.base.BaseContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.base.FunctionFeign;
import com.yihu.jw.fegin.base.base.FunctionFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import io.swagger.annotations.Api;

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

@@ -4,7 +4,7 @@ import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.base.BaseContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.base.ModuleFeign;
import com.yihu.jw.fegin.base.base.ModuleFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import io.swagger.annotations.Api;

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

@@ -3,7 +3,7 @@ package com.yihu.jw.controller.base.base;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.base.BaseContants;
import com.yihu.jw.feign.base.base.SaasFeign;
import com.yihu.jw.fegin.base.base.SaasFeign;
import com.yihu.jw.restmodel.common.Envelop;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

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

@@ -3,7 +3,7 @@ package com.yihu.jw.controller.base.base;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.base.BaseContants;
import com.yihu.jw.feign.base.base.SaasFeign;
import com.yihu.jw.fegin.base.base.SaasFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import io.swagger.annotations.Api;

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

@@ -4,7 +4,7 @@ import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.base.BaseContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.base.SystemDictListFeign;
import com.yihu.jw.fegin.base.base.SystemDictListFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import io.swagger.annotations.Api;

web-gateway/src/main/java/com/yihu/jw/controller/base/user/BaseMenuController.java

@@ -4,8 +4,8 @@ import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.user.BaseUserContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.user.BaseMenuFeign;
import com.yihu.jw.feign.base.user.BaseMenuFeign;
import com.yihu.jw.fegin.base.user.BaseMenuFeign;
import com.yihu.jw.fegin.base.user.BaseMenuFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import io.swagger.annotations.Api;

web-gateway/src/main/java/com/yihu/jw/controller/base/user/BaseRoleController.java

@@ -2,10 +2,9 @@ package com.yihu.jw.controller.base.user;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.base.BaseContants;
import com.yihu.jw.commnon.base.user.BaseUserContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.user.BaseRoleFeign;
import com.yihu.jw.fegin.base.user.BaseRoleFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import io.swagger.annotations.Api;

web-gateway/src/main/java/com/yihu/jw/controller/base/user/EmployController.java

@@ -4,7 +4,7 @@ import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.user.BaseUserContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.user.EmployFeign;
import com.yihu.jw.fegin.base.user.EmployFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import io.swagger.annotations.Api;

web-gateway/src/main/java/com/yihu/jw/controller/base/version/UserVersionController.java

@@ -1,9 +1,8 @@
package com.yihu.jw.controller.base.version;
import com.yihu.jw.commnon.base.base.BaseContants;
import com.yihu.jw.feign.base.version.UserVersionFeign;
import com.yihu.jw.fegin.base.version.UserVersionFeign;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatAccessTokenController.java

@@ -3,7 +3,7 @@ package com.yihu.jw.controller.base.wx;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.wx.WechatContants;
import com.yihu.jw.feign.base.wx.AccessTokenFeign;
import com.yihu.jw.fegin.base.wx.AccessTokenFeign;
import com.yihu.jw.restmodel.common.Envelop;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatConfigController.java

@@ -4,7 +4,7 @@ import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.wx.WechatContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.wx.WechatFeign;
import com.yihu.jw.fegin.base.wx.WechatFeign;
import com.yihu.jw.restmodel.common.Envelop;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatGraphicMessageController.java

@@ -4,7 +4,7 @@ import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.wx.WechatContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.wx.GraphicMessageFeign;
import com.yihu.jw.fegin.base.wx.GraphicMessageFeign;
import com.yihu.jw.restmodel.common.Envelop;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatMenuController.java

@@ -4,7 +4,7 @@ import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.wx.WechatContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.wx.WechatMenuFeign;
import com.yihu.jw.fegin.base.wx.WechatMenuFeign;
import com.yihu.jw.restmodel.common.Envelop;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatTemplateControlle.java

@@ -4,7 +4,7 @@ import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.base.wx.WechatContants;
import com.yihu.jw.exception.business.JiWeiException;
import com.yihu.jw.feign.base.wx.WechatTemplateFeign;
import com.yihu.jw.fegin.base.wx.WechatTemplateFeign;
import com.yihu.jw.restmodel.common.Envelop;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

web-gateway/src/main/java/com/yihu/jw/controller/iot/common/FileUploadController.java

@@ -3,7 +3,7 @@ package com.yihu.jw.controller.iot.common;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.iot.IotCommonContants;
import com.yihu.jw.feign.iot.common.IotFileUploadFeign;
import com.yihu.jw.fegin.iot.common.IotFileUploadFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.common.UploadVO;
import com.yihu.jw.rm.iot.IotRequestMapping;

web-gateway/src/main/java/com/yihu/jw/controller/iot/common/IotSystemDictController.java

@@ -3,7 +3,7 @@ package com.yihu.jw.controller.iot.common;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.iot.IotCommonContants;
import com.yihu.jw.feign.iot.common.IotSystemDictFeign;
import com.yihu.jw.fegin.iot.common.IotSystemDictFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.iot.dict.IotSystemDictVO;
import com.yihu.jw.rm.iot.IotRequestMapping;

web-gateway/src/main/java/com/yihu/jw/controller/iot/company/IotCompanyController.java

@@ -3,7 +3,7 @@ package com.yihu.jw.controller.iot.company;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.iot.IotCommonContants;
import com.yihu.jw.feign.iot.company.IotCompanyFeign;
import com.yihu.jw.fegin.iot.company.IotCompanyFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.iot.company.IotCompanyCertificateVO;

web-gateway/src/main/java/com/yihu/jw/controller/iot/data_input/DataInputController.java

@@ -3,7 +3,7 @@ package com.yihu.jw.controller.iot.data_input;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.iot.DataConstants;
import com.yihu.jw.feign.iot.data_input.DataInputFeign;
import com.yihu.jw.fegin.iot.data_input.DataInputFeign;
import com.yihu.jw.restmodel.common.Envelop;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

web-gateway/src/main/java/com/yihu/jw/controller/iot/data_input/DataSearchController.java

@@ -4,8 +4,8 @@ import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.iot.DataConstants;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.feign.iot.data_input.DataInputFeign;
import com.yihu.jw.feign.iot.data_input.DataSearchFeign;
import com.yihu.jw.fegin.iot.data_input.DataInputFeign;
import com.yihu.jw.fegin.iot.data_input.DataSearchFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.iot.DataRequestMapping;
import io.swagger.annotations.Api;

web-gateway/src/main/java/com/yihu/jw/controller/iot/data_input/DataStandardConvertController.java

@@ -3,7 +3,7 @@ package com.yihu.jw.controller.iot.data_input;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.iot.DataConstants;
import com.yihu.jw.feign.iot.data_input.DataStandardConvertFeign;
import com.yihu.jw.fegin.iot.data_input.DataStandardConvertFeign;
import com.yihu.jw.restmodel.common.Envelop;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

web-gateway/src/main/java/com/yihu/jw/controller/iot/device/IotDeviceController.java

@@ -1,7 +1,7 @@
package com.yihu.jw.controller.iot.device;
import com.yihu.jw.commnon.iot.IotCommonContants;
import com.yihu.jw.feign.iot.device.IotDeviceFeign;
import com.yihu.jw.fegin.iot.device.IotDeviceFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.common.base.BaseEnvelop;

web-gateway/src/main/java/com/yihu/jw/controller/iot/device/IotDeviceOrderController.java

@@ -1,7 +1,7 @@
package com.yihu.jw.controller.iot.device;
import com.yihu.jw.commnon.iot.IotCommonContants;
import com.yihu.jw.feign.iot.device.IotDeviceOrderFeign;
import com.yihu.jw.fegin.iot.device.IotDeviceOrderFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.iot.device.IotDeviceOrderVO;

web-gateway/src/main/java/com/yihu/jw/controller/iot/device/IotDeviceQualityController.java

@@ -1,7 +1,7 @@
package com.yihu.jw.controller.iot.device;
import com.yihu.jw.commnon.iot.IotCommonContants;
import com.yihu.jw.feign.iot.device.IotDeviceQualityFeign;
import com.yihu.jw.fegin.iot.device.IotDeviceQualityFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.iot.device.IotDeviceQualityInspectionPlanVO;

web-gateway/src/main/java/com/yihu/jw/controller/iot/device/IotPatientDeviceController.java

@@ -1,7 +1,7 @@
package com.yihu.jw.controller.iot.device;
import com.yihu.jw.commnon.iot.IotCommonContants;
import com.yihu.jw.feign.iot.device.IotPatientDeviceFeign;
import com.yihu.jw.fegin.iot.device.IotPatientDeviceFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.iot.device.IotDeviceVO;

web-gateway/src/main/java/com/yihu/jw/controller/iot/product/IotProductController.java

@@ -1,7 +1,7 @@
package com.yihu.jw.controller.iot.product;
import com.yihu.jw.commnon.iot.IotCommonContants;
import com.yihu.jw.feign.iot.product.IotProductFeign;
import com.yihu.jw.fegin.iot.product.IotProductFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.iot.product.IotMaintenanceUnitVO;

web-gateway/src/main/java/com/yihu/jw/controller/wlyy/agreement/WlyyAgreementController.java

@@ -3,7 +3,7 @@ package com.yihu.jw.controller.wlyy.agreement;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
import com.yihu.jw.commnon.wlyy.AgreementContants;
import com.yihu.jw.feign.wlyy.agreement.WlyyAgreementFeign;
import com.yihu.jw.fegin.wlyy.agreement.WlyyAgreementFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import io.swagger.annotations.Api;

web-gateway/src/main/java/com/yihu/jw/controller/wlyy/agreement/WlyyAgreementKpiController.java

@@ -1,7 +1,7 @@
package com.yihu.jw.controller.wlyy.agreement;
import com.yihu.jw.commnon.wlyy.AgreementContants;
import com.yihu.jw.feign.wlyy.agreement.WlyyAgreementKpiFeign;
import com.yihu.jw.fegin.wlyy.agreement.WlyyAgreementKpiFeign;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import io.swagger.annotations.Api;