Merge branch 'master' of http://106.120.201.126:14725/signal/traffic-signal-platform

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/service/impl/StrategyControlServiceImpl.java

@@ -408,7 +408,7 @@ public class StrategyControlServiceImpl implements StrategyControlService {
                         if (StringUtils.equals("24:00", entHour)) {
                             entHour = "23:59";
                         }
-                        String format = DateUtil.format(current, Constants.DATE_FORMAT.E_DATE_FORMAT_MINUTE);
+                        String format = DateUtil.format(current, Constants.DATE_FORMAT.E_DATE_FORMAT_HOUR_MINUTE);
                         Date currentTime = DateUtil.parse(format, "HH:mm");
                         Date startHourDate = DateUtil.parse(startHour, "HH:mm");
                         Date endHourDate = DateUtil.parse(entHour, "HH:mm");

signal-optimize-service/src/main/resources/bootstrap.yaml

 spring:
   profiles:
-    active: test
\ No newline at end of file
+    active: docker
\ No newline at end of file

signal-utc-service/pom.xml

@@ -26,6 +26,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>2.0.4</version>
+        </dependency>
         <!-- ElasticSearch依赖 -->
         <dependency>
             <groupId>org.elasticsearch.client</groupId>

signal-utc-service/src/main/java/net/wanji/utc/config/Knife4jConfiguration.java

+/*
+ * Copyright (C) 2018 Zhejiang xiaominfo Technology CO.,LTD.
+ * All rights reserved.
+ * Official Web Site: http://www.xiaominfo.com.
+ * Developer Web Site: http://open.xiaominfo.com.
+ */
+
+package net.wanji.utc.config;
+
+import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
+import com.google.common.collect.Lists;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.*;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.contexts.SecurityContext;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.List;
+
+//import com.github.xiaoymin.knife4j.spring.extension.OpenApiExtensionResolver;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
+
+/**
+ * @author <a href="mailto:xiaoymin@foxmail.com">xiaoymin@foxmail.com</a>
+ * 2020/11/07 9:26
+ * @since:knife4j-spring-boot-fast-demo 1.0
+ */
+@Configuration
+//@EnableSwagger2WebMvc
+@EnableSwagger2
+@EnableKnife4j
+public class Knife4jConfiguration {
+
+    /**
+     * 设置头,因为平台携带token进行验证，所以需要在Swagger添加头设置的功能
+     * @return
+     */
+    private List<SecurityScheme> securitySchemes(){
+        return Lists.newArrayList(
+                new ApiKey("Authorization","token","header"));
+    }
+
+    private List<SecurityContext> securityContexts(){
+
+        return Lists.newArrayList(SecurityContext.builder()
+                .securityReferences(defaultAuth())
+                .forPaths(PathSelectors.regex("^(?!login).*$"))
+                .build()
+        );
+    }
+
+    private List<SecurityReference> defaultAuth() {
+        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+        authorizationScopes[0] = authorizationScope;
+        return Lists.newArrayList(
+                new SecurityReference("Authorization",authorizationScopes)
+        );
+    }
+
+    @Bean(value = "defaultApi2")
+    public Docket defaultApi2() {
+        String groupName="v0.1版本";
+        Docket docket=new Docket(DocumentationType.SWAGGER_2)
+                //.host(swaggerDocUrl)
+                .apiInfo(apiInfo())
+                .groupName(groupName)
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.wanji.holo.restful"))
+                .paths(PathSelectors.any())
+                .build()
+                .securitySchemes(securitySchemes())
+                .securityContexts(securityContexts())
+                ;//.extensions(openApiExtensionResolver.buildSettingExtensions());
+        return docket;
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("信控系统接口文档")
+                .description("信控系统 RESTful APIs")
+                //.termsOfServiceUrl(swaggerDocUrl)
+                .contact("wj@qq.com")
+                .version("0.1")
+                .build();
+    }
+}