代码优化

asgard2023 · Jul 17, 2022 · fc32d37 · fc32d37
1 parent 25f84ec
commit fc32d37
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/m3u8sync/src/main/java/org/ccs/m3u8sync/downup/down/DownConstant.java b/m3u8sync/src/main/java/org/ccs/m3u8sync/downup/down/DownConstant.java
@@ -1,6 +1,9 @@
 package org.ccs.m3u8sync.downup.down;
 
 public class DownConstant {
+ private DownConstant(){
+
+ }
 
  //因子
  public static final float FACTOR = 1.15F;
@@ -26,7 +29,7 @@ public class DownConstant {
  public static final String TS_SOURCE = ".ts";
 
  public static final String M3U8 = ".m3u8";
- public static final String M3U8_FFmpeg = ".text";
+ public static final String M3U8_FF_MPEG = ".text";
  public static final String MP4= ".mp4";
  public static final String KEY = ".key";
 }
diff --git a/m3u8sync/src/main/java/org/ccs/m3u8sync/exceptions/BaseException.java b/m3u8sync/src/main/java/org/ccs/m3u8sync/exceptions/BaseException.java
@@ -8,8 +8,8 @@ public class BaseException extends RuntimeException {
  *
  */
  private static final long serialVersionUID = 1L;
- private String resultCode;
- private String title = "Error";
+ private final String resultCode;
+ private final String title = "Error";
 
 
  private static final Map<String, String> errorCodeMap;
@@ -39,15 +39,7 @@ public String getResultCode() {
  return resultCode;
  }
 
- public void setResultCode(String resultCode) {
- this.resultCode = resultCode;
- }
-
  public String getTitle() {
  return title;
  }
-
- public void setTitle(String title) {
- this.title = title;
- }
 }
diff --git a/m3u8sync/src/main/java/org/ccs/m3u8sync/exceptions/GlobalExceptionHandler.java b/m3u8sync/src/main/java/org/ccs/m3u8sync/exceptions/GlobalExceptionHandler.java
@@ -60,17 +60,21 @@ private Map<String, Object> getRequestMap(HttpServletRequest req) {
  @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
  @ResponseBody
  public Object handleException(HttpServletRequest request, Exception ex) {
- if (ex != null && (ex instanceof HttpRequestMethodNotSupportedException
+ if(ex==null){
+ logger.error("---handleException method={} \n request={}", request.getMethod(), this.getRequestMap(request), ex);
+ return null;
+ }
+ if (ex instanceof HttpRequestMethodNotSupportedException
  || ex instanceof HttpMediaTypeNotSupportedException
- || ex instanceof HttpMediaTypeNotAcceptableException)) {
+ || ex instanceof HttpMediaTypeNotAcceptableException){
  logger.error("---handleException method={} uri={} error={}", request.getMethod(), request.getRequestURI(), ex.getMessage(), ex);
  ResultData resultData = ResultData.error(new FailedException());
  resultData.setErrorMsg(ex.getMessage());
  return resultData;
  }
 
 
- String messageError = ex != null ? ex.getMessage() : null;
+ String messageError = ex.getMessage();
  logger.error("---handleException method={} error={} \n request={}", request.getMethod(), messageError, this.getRequestMap(request), ex);
 
  ResultData resultData = ResultData.error(new UnknownException(ex.getMessage()));

diff --git a/m3u8sync/src/main/java/org/ccs/m3u8sync/exceptions/ResultCode.java b/m3u8sync/src/main/java/org/ccs/m3u8sync/exceptions/ResultCode.java
@@ -23,8 +23,8 @@ public enum ResultCode {
  FILE_UNEXIST("100011", "文件不存在"),
  FILE_INVALID("100012", "文件无效"),
  FILE_NORMAL("100013", "文件正常");
- private String code;
- private String msg;
+ private final String code;
+ private final String msg;
 
  ResultCode(String code, String msg) {
  this.code = code;

diff --git a/m3u8sync/src/main/java/org/ccs/m3u8sync/utils/CommUtils.java b/m3u8sync/src/main/java/org/ccs/m3u8sync/utils/CommUtils.java
@@ -18,7 +18,7 @@ private CommUtils() {
  /**
  * 取数据前maxLength位
  *
- * @param str
+ * @param str string str
  * @param maxLength
  * @return
  */
@@ -57,7 +57,7 @@ public static String getString(Object obj) {
  }
 
  /**
- * @return
+ * @return isStartWith
  */
  public static boolean startWithChar(String str, char ch) {
  if (str == null || str.length() < 1) {
@@ -67,7 +67,7 @@ public static boolean startWithChar(String str, char ch) {
  }
 
  /**
- * @return
+ * @return isEndWith
  */
  public static boolean endWithChar(String str, char ch) {
  if (str == null || str.length() < 1) {