瀏覽代碼

网关统一命名

Progr1mmer 6 年之前
父節點
當前提交
e40a12342b

+ 7 - 4
gateway/basic-gateway/pom.xml

@ -10,7 +10,7 @@
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>basic-gateway</artifactId>
    <artifactId>ag-basic</artifactId>
    <version>${parent.version}</version>
    <packaging>war</packaging>
@ -52,7 +52,6 @@
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-config</artifactId>
            <scope>${dependency.scope}</scope>
        </dependency>
        <!-- 安全认证中心-->
@ -70,17 +69,21 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
            <scope>${dependency.scope}</scope>
        </dependency>
        <dependency>
            <groupId>redis.clients</groupId>
            <artifactId>jedis</artifactId>
        </dependency>
        <!-- Redis  -->
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-web</artifactId>
        </dependency>
    </dependencies>
    <build>
        <finalName>basic-gateway</finalName>
        <finalName>ag-basic</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

+ 3 - 3
gateway/basic-gateway/src/main/java/com/yihu/BasicGateway.java

@ -13,15 +13,15 @@ import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
@EnableEurekaClient
@EnableZuulProxy
@SpringBootApplication
public class BasicGateway extends SpringBootServletInitializer {
public class AgBasicServer extends SpringBootServletInitializer {
    public static void main(String [] args) {
        SpringApplication.run(BasicGateway.class, args);
        SpringApplication.run(AgBasicServer.class, args);
    }
    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
        return application.sources(BasicGateway.class);
        return application.sources(AgBasicServer.class);
    }
}

+ 1 - 1
gateway/basic-gateway/src/main/java/com/yihu/gateway/config/WebSecurityConfig.java

@ -1,4 +1,4 @@
package com.yihu.gateway.config;
package com.yihu.jw.gateway.config;
import org.springframework.boot.autoconfigure.security.SecurityProperties;
import org.springframework.context.annotation.Configuration;

+ 5 - 5
gateway/basic-gateway/src/main/java/com/yihu/gateway/filter/BasicZuulFilter.java

@ -1,9 +1,9 @@
//package com.yihu.gateway.filter;
//package com.yihu.jw.gateway.filter;
//
//import com.fasterxml.jackson.databind.ObjectMapper;
//import com.netflix.zuul.ZuulFilter;
//import com.netflix.zuul.context.RequestContext;
//import com.yihu.ehr.util.rest.Envelop;
//import com.yihu.jw.restmodel.web.Envelop;
//import org.slf4j.Logger;
//import org.slf4j.LoggerFactory;
//import org.springframework.beans.factory.annotation.Autowired;
@ -114,10 +114,10 @@
//    private Object forbidden(RequestContext requestContext, int status, String errorMsg) {
//        requestContext.setSendZuulResponse(false);
//        Envelop envelop = new Envelop();
//        envelop.setErrorCode(status);
//        envelop.setErrorMsg(errorMsg);
//        envelop.setMessage(errorMsg);
//        envelop.setStatus(status);
//        try {
//            requestContext.setResponseStatusCode(status);
//            //requestContext.setResponseStatusCode(status);
//            requestContext.getResponse().getWriter().write(objectMapper.writeValueAsString(envelop));
//        } catch (IOException e) {
//            requestContext.setResponseStatusCode(HttpStatus.INTERNAL_SERVER_ERROR.value());

gateway/basic-gateway/src/main/resources/application.yml → gateway/ag-basic/src/main/resources/application.yml


+ 1 - 1
gateway/basic-gateway/src/main/resources/bootstrap.yml

@ -1,6 +1,6 @@
spring:
  application:
    name: basic-gateway
    name: ag-basic
  cloud:
    config:
      failFast: true

+ 1 - 1
wlyy-parent-pom/pom.xml

@ -60,7 +60,7 @@
        <!-- 暂时保留 -->
        <!-- 网关服务 -->
        <module>../gateway/basic-gateway</module> <!-- web网关 -->
        <module>../gateway/ag-basic</module> <!-- web网关 -->
        <!--业务微服务-->
        <module>../svr/svr-base</module><!-- 基础微服务 -->