deason 4 år sedan
förälder
incheckning
ae1dab8c3b
13 ändrade filer med 21 tillägg och 17 borttagningar
  1. 5 5
      examcloud-commons/src/main/java/cn/com/qmth/examcloud/commons/util/OKHttpUtil.java
  2. 1 1
      examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/GeetestAutoConfiguration.java
  3. 1 1
      examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/GeetestProperties.java
  4. 1 1
      examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/model/IModel.java
  5. 1 1
      examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/model/RegisterReq.java
  6. 1 1
      examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/model/RegisterResp.java
  7. 1 1
      examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/model/ValidateReq.java
  8. 1 1
      examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/model/ValidateResp.java
  9. 1 1
      examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/service/GeetestService.java
  10. 1 1
      examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/service/GeetestSessionManager.java
  11. 1 1
      examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/service/impl/GeetestServiceImpl.java
  12. 5 1
      examcloud-support/src/main/java/cn/com/qmth/examcloud/support/handler/richText/RichTextHandlerFactory.java
  13. 1 1
      examcloud-web/src/main/java/cn/com/qmth/examcloud/web/filestorage/impl/AliyunRefreshCdn.java

+ 5 - 5
examcloud-commons/src/main/java/cn/com/qmth/examcloud/commons/util/OKHttpUtil.java

@@ -96,7 +96,7 @@ public class OKHttpUtil {
 	 * @return
 	 */
 	public static Response call(HttpMethod httpMethod, String url, Map<String, String> headers,
-			String jsonBody) {
+								String jsonBody) {
 		return call(httpMethod, url, headers, new JsonBodyBuilder(jsonBody));
 	}
 
@@ -111,7 +111,7 @@ public class OKHttpUtil {
 	 * @return
 	 */
 	public static Response call(HttpMethod httpMethod, String url, Map<String, String> headers,
-			RequestBodyBuilder requestBodyBuilder) {
+								RequestBodyBuilder requestBodyBuilder) {
 
 		LOG.info("[okhttp3] new call: " + httpMethod + " " + url);
 		LOG.info("[okhttp3] headers: " + JsonUtil.toJson(headers));
@@ -210,7 +210,7 @@ public class OKHttpUtil {
 	 * @return
 	 */
 	public static Response call(HttpMethod httpMethod, String url, Map<String, String> headers,
-			Map<String, String> params) {
+								Map<String, String> params) {
 
 		LOG.info("[okhttp3] new call: " + httpMethod + " " + url);
 		LOG.info("[okhttp3] headers: " + JsonUtil.toJson(headers));
@@ -265,7 +265,7 @@ public class OKHttpUtil {
 	 * @return
 	 */
 	public static Response call(HttpMethod httpMethod, String url, Map<String, String> headers,
-			Map<String, String> params, List<FormFilePart> formFilePartList) {
+								Map<String, String> params, List<FormFilePart> formFilePartList) {
 
 		LOG.info("[okhttp3] new call: " + httpMethod + " " + url);
 		LOG.info("[okhttp3] headers: " + JsonUtil.toJson(headers));
@@ -307,4 +307,4 @@ public class OKHttpUtil {
 		}
 	}
 
-}
+}

+ 1 - 1
examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/GeetestAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 "https://github.com/deason" All Rights Reserved.
+ * Copyright (c) 2020 QMTH All Rights Reserved.
  * Created by Deason on 2020-07-22 16:19:27
  */
 

+ 1 - 1
examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/GeetestProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 "https://github.com/deason" All Rights Reserved.
+ * Copyright (c) 2020 QMTH All Rights Reserved.
  * Created by Deason on 2020-07-22 16:19:27
  */
 

+ 1 - 1
examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/model/IModel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 "https://github.com/deason" All Rights Reserved.
+ * Copyright (c) 2020 QMTH All Rights Reserved.
  * Created by Deason on 2020-07-24 10:06:25
  */
 

+ 1 - 1
examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/model/RegisterReq.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 "https://github.com/deason" All Rights Reserved.
+ * Copyright (c) 2020 QMTH All Rights Reserved.
  * Created by Deason on 2020-07-22 16:19:27
  */
 

+ 1 - 1
examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/model/RegisterResp.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 "https://github.com/deason" All Rights Reserved.
+ * Copyright (c) 2020 QMTH All Rights Reserved.
  * Created by Deason on 2020-07-22 16:19:27
  */
 

+ 1 - 1
examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/model/ValidateReq.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 "https://github.com/deason" All Rights Reserved.
+ * Copyright (c) 2020 QMTH All Rights Reserved.
  * Created by Deason on 2020-07-22 16:19:27
  */
 

+ 1 - 1
examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/model/ValidateResp.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 "https://github.com/deason" All Rights Reserved.
+ * Copyright (c) 2020 QMTH All Rights Reserved.
  * Created by Deason on 2020-07-22 16:19:27
  */
 

+ 1 - 1
examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/service/GeetestService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 "https://github.com/deason" All Rights Reserved.
+ * Copyright (c) 2020 QMTH All Rights Reserved.
  * Created by Deason on 2020-07-22 16:19:27
  */
 

+ 1 - 1
examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/service/GeetestSessionManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 "https://github.com/deason" All Rights Reserved.
+ * Copyright (c) 2020 QMTH All Rights Reserved.
  * Created by Deason on 2020-07-24 09:43:49
  */
 

+ 1 - 1
examcloud-starters/examcloud-geetest-starter/src/main/java/cn/com/qmth/examcloud/starters/greetest/service/impl/GeetestServiceImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 "https://github.com/deason" All Rights Reserved.
+ * Copyright (c) 2020 QMTH All Rights Reserved.
  * Created by Deason on 2020-07-22 16:19:27
  */
 

+ 5 - 1
examcloud-support/src/main/java/cn/com/qmth/examcloud/support/handler/richText/RichTextHandlerFactory.java

@@ -19,7 +19,6 @@ public class RichTextHandlerFactory {
         handlerMap.put("text",new HtmlTextHandler());
         handlerMap.put("image",new ImageTextHandler());
         handlerMap.put("audio",new AudioTextHandler());
-        handlerMap.put("complex",new ComplexTextHandler());
     }
 
     /**
@@ -32,6 +31,11 @@ public class RichTextHandlerFactory {
             throw new StatusException("900101","参数type不允许为空");
         }
 
+        //由于复合文处理类中有公共字段,所以必须是多例
+        if (type.equals("complex")) {
+            return new ComplexTextHandler();
+        }
+
         if (!handlerMap.containsKey(type)) {
             throw new StatusException("900102","不支持的文本类型");
         }

+ 1 - 1
examcloud-web/src/main/java/cn/com/qmth/examcloud/web/filestorage/impl/AliyunRefreshCdn.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 "https://github.com/deason" All Rights Reserved.
+ * Copyright (c) 2020 QMTH All Rights Reserved.
  * Created by Deason on 2020-08-31 10:24:15
  */