diff --git a/.gitignore b/.gitignore index 417c2004..20072a6c 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,5 @@ build/ .vscode/ ### logs ### -qcast3/ \ No newline at end of file +qcast3/ +src/test diff --git a/src/main/java/com/interplug/qcast/config/swagger/SwaggerConfig.java b/src/main/java/com/interplug/qcast/config/swagger/SwaggerConfig.java index f83f1d0d..f3577fb6 100644 --- a/src/main/java/com/interplug/qcast/config/swagger/SwaggerConfig.java +++ b/src/main/java/com/interplug/qcast/config/swagger/SwaggerConfig.java @@ -4,11 +4,13 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.media.StringSchema; import io.swagger.v3.oas.models.parameters.Parameter; +import io.swagger.v3.oas.models.servers.Server; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springdoc.core.customizers.OpenApiCustomizer; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; @@ -20,30 +22,51 @@ public class SwaggerConfig { @Autowired Environment env; + @Value("${swagger.url}") + private String swaggerUrl; + @Bean public OpenAPI baseApi() { String activeProfile = env.getProperty("spring.profiles.active"); if (log.isDebugEnabled()) { log.debug("Active profile: {}", activeProfile); } + + Server server = new Server(); + server.setUrl(swaggerUrl); + OpenAPI openAPI = new OpenAPI(); - openAPI.info( - new Info().title("QCast API").version("1.0").description("QCast API Documentation")); + openAPI + .info(new Info().title("QCast API").version("1.0").description("QCast API Documentation")) + .addServersItem(server); return openAPI; } @Bean public GroupedOpenApi allApi() { - return GroupedOpenApi.builder().group("ALL").packagesToScan("com.interplug.qcast.biz").addOpenApiCustomizer(openApiCustomizer()).build(); + return GroupedOpenApi.builder() + .group("ALL") + .packagesToScan("com.interplug.qcast.biz") + .addOpenApiCustomizer(openApiCustomizer()) + .build(); } - + @Bean public OpenApiCustomizer openApiCustomizer() { - Parameter lang = new Parameter().name("lang").description("Language").in("header").schema(new StringSchema()); - return openApi -> openApi.getPaths().values().forEach( - pathItem -> pathItem.readOperations().forEach( - operation -> operation.addParametersItem(lang) - ) - ); + Parameter lang = + new Parameter() + .name("lang") + .description("Language") + .in("header") + .schema(new StringSchema()); + return openApi -> + openApi + .getPaths() + .values() + .forEach( + pathItem -> + pathItem + .readOperations() + .forEach(operation -> operation.addParametersItem(lang))); } } diff --git a/src/main/resources/config/application-dev-interplug.yml b/src/main/resources/config/application-dev-interplug.yml index c41ce07e..e0d8d647 100644 --- a/src/main/resources/config/application-dev-interplug.yml +++ b/src/main/resources/config/application-dev-interplug.yml @@ -63,4 +63,6 @@ file: ini.drawing.img.path: https://files.hanasys.jp/Drawing front: - url: http://1.248.227.176:3000 \ No newline at end of file + url: http://1.248.227.176:3000 + +swagger.url: http://localhost:38080 \ No newline at end of file diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index dd94c4fe..03e5bf37 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -6,9 +6,11 @@ server: spring: datasource: driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true + #jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true + jdbc-url: jdbc:log4jdbc:sqlserver://192.168.200.220:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=false username: pvDBuser - password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck) + #password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck) + password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6) maximum-pool-size: 4 pool-name: Master-HikariPool # datasource: @@ -63,4 +65,6 @@ file: ini.drawing.img.path: https://files.hanasys.jp/Drawing front: - url: http://1.248.227.176:3000 \ No newline at end of file + url: http://1.248.227.176:3000 + +swagger.url: https://dev-api.hanasys.jp \ No newline at end of file diff --git a/src/main/resources/config/application-local.yml b/src/main/resources/config/application-local.yml index b2d1426d..d02ddfdd 100644 --- a/src/main/resources/config/application-local.yml +++ b/src/main/resources/config/application-local.yml @@ -6,9 +6,10 @@ server: spring: datasource: driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true + #jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true + jdbc-url: jdbc:log4jdbc:sqlserver://192.168.200.220:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=false username: pvDBuser - password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck) + password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6) maximum-pool-size: 4 pool-name: Master-HikariPool # datasource: diff --git a/src/main/resources/config/application-prd.yml b/src/main/resources/config/application-prd.yml index a1e54f6a..745e0678 100644 --- a/src/main/resources/config/application-prd.yml +++ b/src/main/resources/config/application-prd.yml @@ -63,4 +63,6 @@ file: ini.drawing.img.path: https://files.hanasys.jp/Drawing front: - url: https://hanasys.jp \ No newline at end of file + url: https://hanasys.jp + +swagger.url: https://api.hanasys.jp \ No newline at end of file diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 4b446025..aa010a73 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -82,3 +82,4 @@ springdoc: swagger-ui: operations-sorter: alpha +swagger.url: http://localhost:8080 \ No newline at end of file