抽util

4dkankan-common-utils/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.fdkankan</groupId>
         <artifactId>4dkankan-utils</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -62,7 +62,6 @@
             <artifactId>fastjson</artifactId>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.springframework/spring-context -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>

4dkankan-common-utils/src/main/java/com/fdkankan/utils/constant/CameraConstant.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.constant;
+package com.fdkankan.common.constant;
 
 // 6001-7000 相机状态码
 public enum CameraConstant {

4dkankan-common-utils/src/main/java/com/fdkankan/utils/constant/ConstantFileName.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.constant;
+package com.fdkankan.common.constant;
 
 public class ConstantFileName {
     //背景音乐

4dkankan-common-utils/src/main/java/com/fdkankan/utils/constant/ConstantFilePath.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.constant;
+package com.fdkankan.common.constant;
 
 public class ConstantFilePath {
     public static final String BASE_PATH = "/mnt/4Dkankan";

4dkankan-common-utils/src/main/java/com/fdkankan/utils/constant/ConstantUrl.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.constant;
+package com.fdkankan.common.constant;
 
 public class ConstantUrl {
 

4dkankan-common-utils/src/main/java/com/fdkankan/utils/constant/ErrorCode.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.constant;
+package com.fdkankan.common.constant;
 
 public enum ErrorCode {
 

4dkankan-common-utils/src/main/java/com/fdkankan/utils/constant/ServerCode.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.constant;
+package com.fdkankan.common.constant;
 
 public enum ServerCode {
 

4dkankan-common-utils/src/main/java/com/fdkankan/utils/exception/BusinessException.java

@@ -1,7 +1,7 @@
-package com.fdkankan.utils.exception;
+package com.fdkankan.common.exception;
 
-import com.fdkankan.utils.constant.CameraConstant;
-import com.fdkankan.utils.constant.ErrorCode;
+import com.fdkankan.common.constant.CameraConstant;
+import com.fdkankan.common.constant.ErrorCode;
 import lombok.Data;
 
 /**

4dkankan-common-utils/src/main/java/com/fdkankan/utils/proto/BigSceneProto.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.proto;
+package com.fdkankan.common.proto;
 
 public final class BigSceneProto {
   private BigSceneProto() {}

4dkankan-common-utils/src/main/java/com/fdkankan/utils/proto/Common.java

@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: Common.proto
 
-package com.fdkankan.utils.proto;
+package com.fdkankan.common.proto;
 
 public final class Common {
   private Common() {}

4dkankan-common-utils/src/main/java/com/fdkankan/utils/proto/Visionmodeldata.java

@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: visionmodeldata.proto
 
-package com.fdkankan.utils.proto;
+package com.fdkankan.common.proto;
 
 public final class Visionmodeldata {
   private Visionmodeldata() {}

4dkankan-common-utils/src/main/java/com/fdkankan/utils/proto/format/CouchDBFormat.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.proto.format;
+package com.fdkankan.common.proto.format;
 
 
 import com.google.protobuf.ExtensionRegistry;

4dkankan-common-utils/src/main/java/com/fdkankan/utils/proto/format/HtmlFormat.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.proto.format;
+package com.fdkankan.common.proto.format;
 /* 
     Copyright (c) 2009, Orbitz World Wide
     All rights reserved.

4dkankan-common-utils/src/main/java/com/fdkankan/utils/proto/format/JavaPropsFormat.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.proto.format;
+package com.fdkankan.common.proto.format;
 
 import com.google.protobuf.*;
 

4dkankan-common-utils/src/main/java/com/fdkankan/utils/proto/format/JsonFormat.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.proto.format;
+package com.fdkankan.common.proto.format;
 /* 
 	Copyright (c) 2009, Orbitz World Wide
 	All rights reserved.

4dkankan-common-utils/src/main/java/com/fdkankan/utils/proto/format/XmlFormat.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.proto.format;
+package com.fdkankan.common.proto.format;
 /* 
     Copyright (c) 2009, Orbitz World Wide
     All rights reserved.

4dkankan-common-utils/src/main/java/com/fdkankan/utils/response/PageInfo.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.response;
+package com.fdkankan.common.response;
 
 import lombok.Data;
 

4dkankan-common-utils/src/main/java/com/fdkankan/utils/response/ResultData.java

@@ -1,6 +1,6 @@
-package com.fdkankan.utils.response;
+package com.fdkankan.common.response;
 
-import com.fdkankan.utils.constant.ErrorCode;
+import com.fdkankan.common.constant.ErrorCode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

4dkankan-common-utils/src/main/java/com/fdkankan/utils/utils/Base64Converter.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.utils;
+package com.fdkankan.common.utils;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Base64;

4dkankan-common-utils/src/main/java/com/fdkankan/utils/utils/ConstantCmd.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.utils;
+package com.fdkankan.common.utils;
 
 public class ConstantCmd {
 

4dkankan-common-utils/src/main/java/com/fdkankan/utils/utils/CreateObjUtil.java

@@ -1,11 +1,11 @@
-package com.fdkankan.utils.utils;
-
-import com.fdkankan.utils.constant.ConstantFileName;
-import com.fdkankan.utils.constant.ConstantFilePath;
-import com.fdkankan.utils.proto.BigSceneProto;
-import com.fdkankan.utils.proto.Common;
-import com.fdkankan.utils.proto.Visionmodeldata;
-import com.fdkankan.utils.proto.format.JsonFormat;
+package com.fdkankan.common.utils;
+
+import com.fdkankan.common.constant.ConstantFileName;
+import com.fdkankan.common.constant.ConstantFilePath;
+import com.fdkankan.common.proto.BigSceneProto;
+import com.fdkankan.common.proto.Common;
+import com.fdkankan.common.proto.Visionmodeldata;
+import com.fdkankan.common.proto.format.JsonFormat;
 import com.google.protobuf.TextFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

4dkankan-common-utils/src/main/java/com/fdkankan/utils/utils/DataUtils.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.utils;
+package com.fdkankan.common.utils;
 
 import cn.hutool.core.util.StrUtil;
 import org.springframework.stereotype.Component;

4dkankan-common-utils/src/main/java/com/fdkankan/utils/utils/FileUtil.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.utils;
+package com.fdkankan.common.utils;
 
 import java.io.*;
 import java.nio.ByteBuffer;

4dkankan-common-utils/src/main/java/com/fdkankan/utils/utils/FileUtils.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.utils;
+package com.fdkankan.common.utils;
 
 import com.alibaba.fastjson.JSONObject;
 import it.sauronsoftware.jave.*;

4dkankan-common-utils/src/main/java/com/fdkankan/utils/utils/JwtUtil.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.utils;
+package com.fdkankan.common.utils;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.exceptions.JWTDecodeException;

4dkankan-common-utils/src/main/java/com/fdkankan/utils/utils/SHAUtils.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.utils;
+package com.fdkankan.common.utils;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;

4dkankan-common-utils/src/main/java/com/fdkankan/utils/utils/StreamGobbler.java

@@ -1,4 +1,4 @@
-package com.fdkankan.utils.utils;
+package com.fdkankan.common.utils;
 
 import java.io.*;
 

pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>com.fdkankan</groupId>
     <artifactId>4dkankan-utils</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.3</version>
     <packaging>pom</packaging>