@dev 优化代码

sleepybear1113 · May 3, 2022 · 62fb1d6 · 62fb1d6
1 parent 0fc0795
commit 62fb1d6
Show file tree

Hide file tree

Showing 10 changed files with 120 additions and 82 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,4 +35,5 @@ build/
 .vscode/
 /out/
 
-src/main/resources/application-tencent.yml
+### 自定义 ###
+application-tencent.yml
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.xjx</groupId>
     <artifactId>ddt-crawler</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
     <name>ddt-crawler</name>
     <description>ddt-crawler</description>
     <properties>
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/src/main/java/com/xjx/ddtcrawler/domain/BaseDomain.java b/src/main/java/com/xjx/ddtcrawler/domain/BaseDomain.java
@@ -0,0 +1,26 @@
+package com.xjx.ddtcrawler.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * There is description
+ *
+ * @author sleepybear
+ * @date 2022/05/03 15:53
+ */
+@Data
+public class BaseDomain implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -5347501343901713024L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    @TableField("modify_time")
+    private Long modifyTime;
+}
diff --git a/src/main/java/com/xjx/ddtcrawler/domain/Template.java b/src/main/java/com/xjx/ddtcrawler/domain/Template.java
@@ -1,49 +1,44 @@
 package com.xjx.ddtcrawler.domain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.xjx.ddtcrawler.utils.EncryptedUtils;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
-import java.io.Serializable;
 
 /**
  * @author XJX
  * @date 2021/8/1 20:56
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @TableName("template")
-public class Template implements Serializable {
+public class Template extends BaseDomain {
     @Serial
     private static final long serialVersionUID = 6076962907927806205L;
 
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
     @TableField("name")
     private String name;
     @TableField("price")
     private Double price;
-    @TableField("modify_time")
-    private Long modifyTime;
     @TableField(exist = false)
     private Boolean isEncrypted = false;
 
     public void encryptId() {
         if (this.isEncrypted) {
             return;
         }
-        this.id = EncryptedUtils.encryptTemplateId(this.id);
+        this.setId(EncryptedUtils.encryptTemplateId(this.getId()));
         this.isEncrypted = true;
     }
 
     public void decryptId() {
         if (!this.isEncrypted) {
             return;
         }
-        this.id = EncryptedUtils.decryptTemplateId(this.id);
+        this.setId(EncryptedUtils.decryptTemplateId(this.getId()));
         this.isEncrypted = false;
     }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -5,7 +5,7 @@ spring:
   datasource:
     username: root
     password: root
-    url: jdbc:mysql://127.0.0.1:3306/?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&autoReconnect=true
+    url: jdbc:mysql://${mysql.url}/ddt?useUnicode=true&autoReconnect=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
     driver-class-name: com.mysql.cj.jdbc.Driver
     hikari:
       connection-test-query: SELECT 1
@@ -21,6 +21,9 @@ logging:
       xjx:
         mapper : debug
 
+# 自定义配置
+mysql:
+  url: 127.0.0.1:3306
 user-id:
   admin: 10000,20000
   common: 11111,22222
diff --git a/src/main/resources/static/css/css.css b/src/main/resources/static/css/css.css
@@ -0,0 +1,45 @@
+td, th {
+    text-align: center;
+    border: 1px solid;
+}
+
+.table-item-name {
+    width: 200px;
+}
+
+.table-seller {
+    width: 200px;
+}
+
+.table-time {
+    width: 200px;
+}
+
+.bid-unit-black {
+    color: black;
+}
+
+.mouth-unit-black {
+    color: black;
+}
+
+.bid-unit-red {
+    color: red;
+}
+
+.mouth-unit-red {
+    color: red;
+}
+
+.has-buyer {
+    color: cadetblue;
+}
+
+.expected-price {
+    color: darkgray;
+}
+
+.has-border {
+    border: darkgray solid 1px;
+    display: inline-block;
+}
diff --git a/src/main/resources/static/ddt.html b/src/main/resources/static/ddt.html
@@ -3,59 +3,14 @@
 <head>
     <meta charset="UTF-8">
     <title>ddt</title>
+    <link href="css/css.css" rel="stylesheet">
 </head>
-<style>
-    td, th {
-        text-align: center;
-        border: 1px solid;
-    }
 
-    .table-item-name {
-        width: 200px;
-    }
+<script src="lib/js/axios.min.js"></script>
+<script src="js/conf/axios-conf.js"></script>
+<script src="js/js.js"></script>
 
-    .table-seller {
-        width: 200px;
-    }
-
-    .table-time {
-        width: 200px;
-    }
-
-    .bid-unit-black {
-        color: black;
-    }
-
-    .mouth-unit-black {
-        color: black;
-    }
-
-    .bid-unit-red {
-        color: red;
-    }
-
-    .mouth-unit-red {
-        color: red;
-    }
-
-    .has-buyer {
-        color: cadetblue;
-    }
-
-    .expected-price {
-        color: darkgray;
-    }
-
-    .has-border {
-        border: darkgray solid 1px;
-        display: inline-block;
-    }
-</style>
 <body>
-
-<script src="axios.min.js"></script>
-<script src="js.js"></script>
-
 <div style="border: black 1px solid; padding: 3px">
     <div>
         <label for="selfId">selfId </label><input id="selfId" value="">

diff --git a/src/main/resources/static/js/conf/axios-conf.js b/src/main/resources/static/js/conf/axios-conf.js
@@ -0,0 +1,32 @@
+// axios 全局拦截器
+axios.interceptors.response.use(
+    // 如果返回的状态码为 200，说明接口请求成功，可以正常拿到数据
+    (response) => {
+        let res = response.data;
+        let code = res.code;
+        if (code === 0) {
+            return response
+        } else {
+            let message = res.message;
+            if (code > -10) {
+                alert(message);
+            } else {
+                alert("系统错误！\n" + message);
+            }
+            // 直接拒绝往下面返回结果信息
+            return Promise.reject(response);
+        }
+    },
+    // 否则的话抛出错误
+    (error) => {
+        let response = error.response;
+        if (response == null) {
+            alert(`请求失败，请检查网络`);
+            return Promise.reject(error);
+        }
+        let status = response.status;
+        let request = error.request;
+        alert(`请求失败，status = ${status}\n url：${request.responseURL}`);
+        return Promise.reject(error);
+    }
+);
diff --git a/src/main/resources/static/js.js → src/main/resources/static/js/js.js b/src/main/resources/static/js.js → src/main/resources/static/js/js.js
@@ -12,9 +12,6 @@ function saveUser() {
         // 接口数据
         let data = res.data;
         console.log(data);
-        if (!processErrorResult(data)) {
-            return;
-        }
 
         let success = data.result;
         if (success) {
@@ -36,10 +33,6 @@ function createTemporaryLicense() {
     }).then(res => {
         // 接口数据
         let data = res.data;
-        let success = processErrorResult(data);
-        if (!success) {
-            return;
-        }
         console.log(data);
         alert(data.result.message);
     });
@@ -54,10 +47,6 @@ function deleteTemporaryLicense() {
     }).then(res => {
         // 接口数据
         let data = res.data;
-        let success = processErrorResult(data);
-        if (!success) {
-            return;
-        }
         console.log(data);
     });
 }
@@ -175,10 +164,6 @@ function getAuctionItems() {
     }).then(res => {
         // 接口数据
         let data = res.data;
-        let success = processErrorResult(data);
-        if (!success) {
-            return;
-        }
 
         console.log(data);
         data = data.result;
@@ -223,10 +208,6 @@ function getAuctionPriceOder(priceType, sort) {
     }).then(res => {
         // 接口数据
         let data = res.data;
-        let success = processErrorResult(data);
-        if (!success) {
-            return;
-        }
 
         data = data.result;
         console.log(data);

diff --git a/src/main/resources/static/axios.min.js → ...main/resources/static/lib/js/axios.min.js b/src/main/resources/static/axios.min.js → ...main/resources/static/lib/js/axios.min.js