merge from release_v4.1.1

examcloud-exchange-starter/shell/start.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
-PROJECT_JAR="examcloud-exchange-starter-v4.1.0-RELEASE.jar"
-
-PROJECT_JVM_ARGS=`cat start.vmoptions`
+PROJECT_JAR=`find . -name "examcloud-exchange-starter*.jar"`
+PROJECT_JAR=${PROJECT_JAR:6}
 
 PROJECT_ARGS=`cat start.args`
-
 PROJECT_ARGS=$PROJECT_ARGS" --sys.config.center.secretKey="$1
 
+PROJECT_JVM_ARGS=`cat start.vmoptions`
+
 PID_LIST=`ps -ef | grep $PROJECT_JAR | grep java | awk '{print $2}'`
 if [ ! -z "$PID_LIST" ]; then
     echo "$PROJECT_JAR is already running..."

examcloud-exchange-starter/shell/stop.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-PROJECT_JAR="examcloud-exchange-starter-v4.1.0-RELEASE.jar"
+PROJECT_JAR=`find . -name "examcloud-exchange-starter*.jar"`
+PROJECT_JAR=${PROJECT_JAR:6}
 
 ps -ef | grep $PROJECT_JAR | grep java | awk '{printf("kill -15 %s\n",$2)}' | sh
 BUILD_ID=DONTKILLME

examcloud-exchange-starter/src/main/java/cn/com/qmth/examcloud/exchange/config/Swagger2.java

@@ -23,26 +23,27 @@ public class Swagger2 {
     @Bean
     public Docket buildDocket() {
         List<Parameter> parameters = new ArrayList<>();
-        // parameters.add(new ParameterBuilder().name("rootOrgId").modelRef(new ModelRef("String")).parameterType("header").required(false).build());
-        // parameters.add(new ParameterBuilder().name("appId").modelRef(new ModelRef("String")).parameterType("header").required(false).build());
+        parameters.add(new ParameterBuilder().name("rootOrgId").modelRef(new ModelRef("String")).parameterType("header").required(false).build());
+        parameters.add(new ParameterBuilder().name("appId").modelRef(new ModelRef("String")).parameterType("header").required(false).build());
         parameters.add(new ParameterBuilder().name("access_token").modelRef(new ModelRef("String")).parameterType("header").required(false).build());
         parameters.add(new ParameterBuilder().name("timestamp").modelRef(new ModelRef("String")).parameterType("header").required(false).build());
 
         return new Docket(DocumentationType.SWAGGER_2)
-                .groupName("Version 3.0")
-                .apiInfo(info())
+                .groupName("default")
+                .apiInfo(buildApiInfo())
                 .globalOperationParameters(parameters)
                 .useDefaultResponseMessages(false)
                 .select()
+                //.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
                 .apis(RequestHandlerSelectors.basePackage("cn.com.qmth.examcloud.exchange.outer.api.provider"))
                 .paths(PathSelectors.any())
                 .build();
     }
 
-    private ApiInfo info() {
+    public ApiInfo buildApiInfo() {
         return new ApiInfoBuilder()
-                .title("接口文档")
-                .version("3.0")
+                .title("考试云平台接口文档")
+                .version("v4.x.x")
                 .build();
     }