diff --git a/src/main/java/com/example/demo/Util/BaseDES.java b/src/main/java/com/example/demo/Util/BaseDES.java
index 6159c44..95523c2 100644
--- a/src/main/java/com/example/demo/Util/BaseDES.java
+++ b/src/main/java/com/example/demo/Util/BaseDES.java
@@ -4,6 +4,8 @@ package com.example.demo.Util;
 import javax.crypto.Cipher;
 import java.security.*;
 
+import static org.apache.poi.poifs.crypt.CipherAlgorithm.des;
+
 
 public class BaseDES {
 	private static String strDefaultKey = "98hltleg";
@@ -91,6 +93,8 @@ public class BaseDES {
 	public static void main(String args[]) {
 		try {
 			BaseDES d = new BaseDES();
+			String encryptedText = d.encrypt("90000909");
+			System.out.println("加密结果：" + encryptedText);
 			System.out.println("加密字符串：90005179》"+d.encrypt("90005179"));
 			System.out.println("解密字符串：6aaef5277c050f7ae383f816651098ff》"+d.decrypt("6aaef5277c050f7ae383f816651098ff"));
 			} catch (Exception e) {
diff --git a/src/main/java/com/example/demo/domain/entity/Activity.java b/src/main/java/com/example/demo/domain/entity/Activity.java
index 7068f41..18f2926 100644
--- a/src/main/java/com/example/demo/domain/entity/Activity.java
+++ b/src/main/java/com/example/demo/domain/entity/Activity.java
@@ -22,18 +22,18 @@ public class Activity implements Serializable {
     private Integer adminId;
     private String dept;
 
-    @JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "UTC")
+    @JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "Asia/Shanghai")
 
     private Date startTime;
 
-    @JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "UTC")
+    @JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "Asia/Shanghai")
 
     private Date endTime;
 
     private String activityName;
     private BigDecimal rechargeRatio;
 
-    @JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "UTC")
+    @JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
diff --git a/src/main/java/com/example/demo/domain/entity/Admin.java b/src/main/java/com/example/demo/domain/entity/Admin.java
index 22bbf74..7a5b430 100644
--- a/src/main/java/com/example/demo/domain/entity/Admin.java
+++ b/src/main/java/com/example/demo/domain/entity/Admin.java
@@ -95,13 +95,15 @@ public class Admin implements UserDetails, Serializable {
     private String adminFlag;
     private String store;
     private String token;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
     private String jwcode;
     private Integer status1;
     private String remark;
 
+    private String machineId;
+
 
     @Override
     @JsonIgnore
diff --git a/src/main/java/com/example/demo/domain/entity/Audit.java b/src/main/java/com/example/demo/domain/entity/Audit.java
index e3f4d01..4b612b7 100644
--- a/src/main/java/com/example/demo/domain/entity/Audit.java
+++ b/src/main/java/com/example/demo/domain/entity/Audit.java
@@ -20,7 +20,7 @@ public class Audit {
     private Integer adminId;
     private Integer status;
     private Integer AuditFlag;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
     private Date startDate;
diff --git a/src/main/java/com/example/demo/domain/entity/Detail.java b/src/main/java/com/example/demo/domain/entity/Detail.java
index 3287d58..8968cce 100644
--- a/src/main/java/com/example/demo/domain/entity/Detail.java
+++ b/src/main/java/com/example/demo/domain/entity/Detail.java
@@ -35,7 +35,7 @@ public class Detail implements Serializable {
     private Integer status;
     private Integer updateType;
     private Integer detailFlag;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
     private String username;
diff --git a/src/main/java/com/example/demo/domain/entity/DetailY.java b/src/main/java/com/example/demo/domain/entity/DetailY.java
index c035051..ffdc081 100644
--- a/src/main/java/com/example/demo/domain/entity/DetailY.java
+++ b/src/main/java/com/example/demo/domain/entity/DetailY.java
@@ -35,7 +35,7 @@ public class DetailY implements Serializable {
     private Integer status;
     private Integer updateType;
     private Integer detailFlag;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
     private Date endDate;
diff --git a/src/main/java/com/example/demo/domain/entity/Rate.java b/src/main/java/com/example/demo/domain/entity/Rate.java
index 635d998..da080ae 100644
--- a/src/main/java/com/example/demo/domain/entity/Rate.java
+++ b/src/main/java/com/example/demo/domain/entity/Rate.java
@@ -12,18 +12,18 @@ import java.util.Date;
 @NoArgsConstructor
 public class Rate {
     private Integer rateId;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startTime;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
     private String currency;
     private BigDecimal exchangeRate;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date updateTime;
     private Integer adminId;
diff --git a/src/main/java/com/example/demo/domain/entity/Recharge.java b/src/main/java/com/example/demo/domain/entity/Recharge.java
index 87bee95..54d9f9d 100644
--- a/src/main/java/com/example/demo/domain/entity/Recharge.java
+++ b/src/main/java/com/example/demo/domain/entity/Recharge.java
@@ -29,7 +29,7 @@ public class Recharge {
     private String rechargeRatio;
     private String remark;
     private Integer flag;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
     private Date startDate;
diff --git a/src/main/java/com/example/demo/domain/entity/User.java b/src/main/java/com/example/demo/domain/entity/User.java
index 656af3c..b953385 100644
--- a/src/main/java/com/example/demo/domain/entity/User.java
+++ b/src/main/java/com/example/demo/domain/entity/User.java
@@ -22,7 +22,7 @@ public class User {
     private Date birthday;
     private String head;
     private Integer UserFlag;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
     private String signature;
diff --git a/src/main/java/com/example/demo/domain/entity/UserDetailExport.java b/src/main/java/com/example/demo/domain/entity/UserDetailExport.java
index ad21138..8910895 100644
--- a/src/main/java/com/example/demo/domain/entity/UserDetailExport.java
+++ b/src/main/java/com/example/demo/domain/entity/UserDetailExport.java
@@ -47,7 +47,7 @@ public class UserDetailExport {
     @ExcelProperty("提交人")
     @ColumnWidth(20)
     private String createAdmin;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 }
diff --git a/src/main/java/com/example/demo/domain/entity/UserGold.java b/src/main/java/com/example/demo/domain/entity/UserGold.java
index 9293aa8..6b1b357 100644
--- a/src/main/java/com/example/demo/domain/entity/UserGold.java
+++ b/src/main/java/com/example/demo/domain/entity/UserGold.java
@@ -11,7 +11,7 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 public class UserGold {
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
 
     private String jwcode;
diff --git a/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java b/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java
index e0766d9..0ac5ce4 100644
--- a/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java
+++ b/src/main/java/com/example/demo/domain/vo/ConsumeDetail.java
@@ -10,7 +10,7 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 public class  ConsumeDetail {
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Integer detailId;
     private String name;
@@ -33,7 +33,7 @@ public class  ConsumeDetail {
     private Integer status;
     private String updateType;
     private Integer detailFlag;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
     private Integer adminId;
diff --git a/src/main/java/com/example/demo/domain/vo/DetailExport.java b/src/main/java/com/example/demo/domain/vo/DetailExport.java
index f7a6cd4..74b3e8b 100644
--- a/src/main/java/com/example/demo/domain/vo/DetailExport.java
+++ b/src/main/java/com/example/demo/domain/vo/DetailExport.java
@@ -17,10 +17,10 @@ public class DetailExport {
     private String jwcode;
     private String token;
     private String area;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endDate;
 
diff --git a/src/main/java/com/example/demo/domain/vo/ERP.java b/src/main/java/com/example/demo/domain/vo/ERP.java
index 47c6e98..efcd7e8 100644
--- a/src/main/java/com/example/demo/domain/vo/ERP.java
+++ b/src/main/java/com/example/demo/domain/vo/ERP.java
@@ -18,7 +18,7 @@ public class ERP {
     private String productName;
     private String reamrk;
     private String type;
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
     private String consumePlatform;
     private String name;
diff --git a/src/main/java/com/example/demo/domain/vo/Meium.java b/src/main/java/com/example/demo/domain/vo/Meium.java
index d295cc7..bbd15ae 100644
--- a/src/main/java/com/example/demo/domain/vo/Meium.java
+++ b/src/main/java/com/example/demo/domain/vo/Meium.java
@@ -28,7 +28,7 @@ public class Meium implements Serializable {
     private BigDecimal taskSumCoin;
     private  String area;
     private  String store;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private BigDecimal totalRechargeSum;
     private Date searchStartTime;
diff --git a/src/main/java/com/example/demo/domain/vo/RechargeVo.java b/src/main/java/com/example/demo/domain/vo/RechargeVo.java
index 8e361fa..7e261f6 100644
--- a/src/main/java/com/example/demo/domain/vo/RechargeVo.java
+++ b/src/main/java/com/example/demo/domain/vo/RechargeVo.java
@@ -27,7 +27,7 @@ public class RechargeVo {
 
     private String remark;
     private Integer flag;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
     private Date startDate;
diff --git a/src/main/java/com/example/demo/domain/vo/SumCoin.java b/src/main/java/com/example/demo/domain/vo/SumCoin.java
index 96ca3dc..b454757 100644
--- a/src/main/java/com/example/demo/domain/vo/SumCoin.java
+++ b/src/main/java/com/example/demo/domain/vo/SumCoin.java
@@ -58,11 +58,11 @@ public class SumCoin {
     private BigDecimal yearSumFreeCoin;
     //全年累计消耗金币数--下面  消耗任务金币
     private BigDecimal yearSumTaskCoin;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date searchStartTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date searchEndTime;
     private  Integer updateType;
diff --git a/src/main/java/com/example/demo/domain/vo/UserVo.java b/src/main/java/com/example/demo/domain/vo/UserVo.java
index 18c8f5a..c15a0be 100644
--- a/src/main/java/com/example/demo/domain/vo/UserVo.java
+++ b/src/main/java/com/example/demo/domain/vo/UserVo.java
@@ -11,7 +11,7 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 public class UserVo {
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private String jwcode;
     private String name;
diff --git a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java
index 6ed68fc..fd08ee7 100644
--- a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java
@@ -84,18 +84,25 @@ public class AdminServiceImpl implements AdminService {
     }
     @Override
     public Admin login(Admin admin) throws Exception {
-        System.out.println("第一步");
+
+        Admin admin1=adminMapper.selectByJwcode(admin);
+        String[] machineIds = admin1.getMachineId().split(",");
+        boolean flag = false;
+        for(String machineId:machineIds) {
+            if (admin.getMachineId() != null && admin.getMachineId().equals(machineId))
+                flag = true;
+        }
+        if (!flag) {
+            throw new RuntimeException("你没有使用该机器的权限！");
+        }
         System.out.println(admin.getJwcode());
         System.out.println(admin.getPassword());
         UsernamePasswordAuthenticationToken token =
                 new UsernamePasswordAuthenticationToken(admin.getJwcode(),admin.getPassword());
-        System.out.println(token+"第二步");
         try {
             Authentication authentication = authenticationManager.authenticate(token);
-            System.out.println(authentication+"第一步");
             Admin loginAdmin = (Admin) authentication.getPrincipal();
-            System.out.println(token);
-            System.out.println(loginAdmin+"logAdmin");
+
             return loginAdmin;
         }catch (BadCredentialsException exception){
             throw new BadCredentialsException("用户或密码错误");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 859c1cc..8a546a6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
       connection-timeout: 30000
       pool-name: HwgoldHikariCP
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=GMT%2b8
+    url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai
 #    url: jdbc:mysql://39.101.133.168/hwgold?serverTimezone=GMT%2b8
     username: hwgold
     password: 'AGX4Z3YMxiCG3GR2'