Browse Source

适配修改

胡荣基 4 months ago
parent
commit
8958810a63

File diff suppressed because it is too large
+ 1 - 0
certificate/licence.txt


File diff suppressed because it is too large
+ 0 - 1
licence/certificate/licence.txt


BIN
licence/client-offline/lib/core-licence-1.0.0.RELEASE.jar


+ 8 - 3
licence/client-offline/pom.xml

@@ -17,14 +17,19 @@
     </properties>
 
     <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.shcd</groupId>
-            <artifactId>core</artifactId>
+            <artifactId>core-licence</artifactId>
             <version>1.0.0.RELEASE</version>
-            <!-- 引用一个本地的 JAR 文件,而不是从 Maven 的中央仓库或其他远程仓库中获取 -->
             <scope>system</scope>
             <!-- 指定该 JAR 文件的路径 -->
-            <systemPath>${project.basedir}/src/main/resources/lib/core-1.0.0.RELEASE.jar</systemPath>
+            <systemPath>${project.basedir}/lib/core-licence-1.0.0.RELEASE.jar</systemPath>
         </dependency>
     </dependencies>
 

BIN
licence/client-offline/src/main/resources/lib/core-1.0.0.RELEASE.jar


+ 1 - 1
licence/core/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>核心 jar 包</description>
-    <artifactId>core</artifactId>
+    <artifactId>core-licence</artifactId>
     <packaging>jar</packaging>
 
     <properties>

+ 1 - 1
licence/core/src/main/java/com/shcd/constant/CommonKeys.java

@@ -21,7 +21,7 @@ public class CommonKeys {
     /**
      * 失败编码
      */
-    public static final int ERROR_CODE = -1;
+    public static final int ERROR_CODE = 599;
 
     /**
      * 失败信息

+ 24 - 24
licence/core/src/main/java/com/shcd/util/CallResult.java

@@ -22,7 +22,7 @@ public class CallResult<T> implements Serializable {
     /**
      * 消息
      */
-    private String message;
+    private String msg;
 
     /**
      * 数据
@@ -39,12 +39,12 @@ public class CallResult<T> implements Serializable {
      * 全参构造函数
      *
      * @param code
-     * @param message
+     * @param msg
      * @param data
      */
-    public CallResult(int code, String message, T data) {
+    public CallResult(int code, String msg, T data) {
         this.code = code;
-        this.message = message;
+        this.msg = msg;
         this.data = data;
     }
 
@@ -71,24 +71,24 @@ public class CallResult<T> implements Serializable {
     /**
      * 调用成功,返回自定义消息、数据
      *
-     * @param message
+     * @param msg
      * @param data
      * @return
      */
-    public static <T> CallResult success(String message, T data) {
-        return new CallResult(CommonKeys.SUCCESS_CODE, message, data);
+    public static <T> CallResult success(String msg, T data) {
+        return new CallResult(CommonKeys.SUCCESS_CODE, msg, data);
     }
 
     /**
-     * 调用成功,返回自定义 code、message、data
+     * 调用成功,返回自定义 code、msg、data
      *
      * @param code
-     * @param message
+     * @param msg
      * @param data
      * @return
      */
-    public static <T> CallResult success(int code, String message, T data) {
-        return new CallResult(code, message, data);
+    public static <T> CallResult success(int code, String msg, T data) {
+        return new CallResult(code, msg, data);
     }
 
     /**
@@ -103,11 +103,11 @@ public class CallResult<T> implements Serializable {
     /**
      * 调用失败,返回自定义提示消息
      *
-     * @param message
+     * @param msg
      * @return
      */
-    public static CallResult error(String message) {
-        return new CallResult(CommonKeys.ERROR_CODE, message, "");
+    public static CallResult error(String msg) {
+        return new CallResult(CommonKeys.ERROR_CODE, msg, "");
     }
 
     /**
@@ -123,24 +123,24 @@ public class CallResult<T> implements Serializable {
     /**
      * 调用失败,返回自定义消息、数据
      *
-     * @param message
+     * @param msg
      * @param data
      * @return
      */
-    public static <T> CallResult error(String message, T data) {
-        return new CallResult(CommonKeys.ERROR_CODE, message, data);
+    public static <T> CallResult error(String msg, T data) {
+        return new CallResult(CommonKeys.ERROR_CODE, msg, data);
     }
 
     /**
      * 调用失败,返回自定义消息、数据
      *
      * @param code
-     * @param message
+     * @param msg
      * @param data
      * @return
      */
-    public static <T> CallResult error(int code, String message, T data) {
-        return new CallResult(code, message, data);
+    public static <T> CallResult error(int code, String msg, T data) {
+        return new CallResult(code, msg, data);
     }
 
     /************************  以下是 get、set 方法  ***************************/
@@ -152,12 +152,12 @@ public class CallResult<T> implements Serializable {
         this.code = code;
     }
 
-    public String getMessage() {
-        return message;
+    public String getMsg() {
+        return msg;
     }
 
-    public void setMessage(String message) {
-        this.message = message;
+    public void setMsg(String msg) {
+        this.msg = msg;
     }
 
     public T getData() {

+ 1 - 1
licence/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.12.RELEASE</version>
+        <version>2.5.15</version>
     </parent>
 
     <dependencies>