Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-09-20 b10977d128dfc77497f1cc33df13d55e8801a3f7

 ZuulZYTravel/src/main/java/com/sinata/zuul/ZuulApplication.java

@@ -35,7 +35,7 @@
@EnableZuulProxy//开启网关服务
@EnableDiscoveryClient//开启eureka客户端的消费者
@SpringBootApplication
public class ZuulApplication extends SpringBootServletInitializer {
public class ZuulApplication /*extends SpringBootServletInitializer*/ {

    public static void main(String[] args) {
        SpringApplication.run(ZuulApplication.class, args);
@@ -109,9 +109,8 @@
        public List<SwaggerResource> get() {
            List resource=new ArrayList<>();
            //name可以随便写，location前缀要与zuul配置的path一致。zuul开了token验证,要加上token,否则不用加?token=1
//            resource.add(swaggerResource("user","/user-server/v2/api-docs","1.0"));
//            resource.add(swaggerResource("driver","/driver-server/v2/api-docs","1.0"));
//            resource.add(swaggerResource("dispatch","/dispatch-server/v2/api-docs","1.0"));
            resource.add(swaggerResource("user","/user-server/v2/api-docs","1.0"));
            resource.add(swaggerResource("driver","/driver-server/v2/api-docs","1.0"));
            return resource;
        }

@@ -125,8 +124,8 @@
        }
    }

    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
        return builder.sources(ZuulApplication.class);
    }
//    @Override
//    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
//        return builder.sources(ZuulApplication.class);
//    }
}