瀏覽代碼

接口密钥 auth验证 配置文件

wangzhe 2 年之前
父節點
當前提交
f732c6d801

+ 9 - 9
sooka-auth/src/main/java/com/sooka/model/db/IntDetailed.java

@@ -35,20 +35,20 @@ public class IntDetailed {
     private String intId;
     private String intId;
 
 
     /** 开始时间 */
     /** 开始时间 */
-    @Column
-    private String strAt;
+//    @Column
+//    private String strAt;
 
 
     /** 结束时间 */
     /** 结束时间 */
-    @Column
-    private String endAt;
+//    @Column
+//    private String endAt;
 
 
     /** secret_key */
     /** secret_key */
     @Column
     @Column
     private String secretKey;
     private String secretKey;
 
 
     /** 状态 */
     /** 状态 */
-    @Column
-    private String status;
+//    @Column
+//    private String status;
 
 
     @Override
     @Override
     public String toString() {
     public String toString() {
@@ -56,10 +56,10 @@ public class IntDetailed {
                 "id='" + id + '\'' +
                 "id='" + id + '\'' +
                 ", recordId='" + recordId + '\'' +
                 ", recordId='" + recordId + '\'' +
                 ", intId='" + intId + '\'' +
                 ", intId='" + intId + '\'' +
-                ", strAt='" + strAt + '\'' +
-                ", endAt='" + endAt + '\'' +
+//                ", strAt='" + strAt + '\'' +
+//                ", endAt='" + endAt + '\'' +
                 ", secretKey='" + secretKey + '\'' +
                 ", secretKey='" + secretKey + '\'' +
-                ", status='" + status + '\'' +
+//                ", status='" + status + '\'' +
                 '}';
                 '}';
     }
     }
 }
 }

+ 3 - 1
sooka-auth/src/main/java/com/sooka/service/impl/AuthServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.entity.Example;
 
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 import java.util.Objects;
 import java.util.Objects;
@@ -57,7 +58,8 @@ public class AuthServiceImpl implements AuthService {
                 // 2022-10-20 - 2022-10-29
                 // 2022-10-20 - 2022-10-29
                 String startTime = duration.split(" - ")[0];
                 String startTime = duration.split(" - ")[0];
                 String endTime = duration.split(" - ")[1];
                 String endTime = duration.split(" - ")[1];
-                if(startTime == null && endTime == null){
+                String nowTime = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+                if(nowTime.compareTo(startTime) != -1 && endTime.compareTo(nowTime) != -1){
                     isAuthExpires = false; // 授权有效
                     isAuthExpires = false; // 授权有效
                     System.out.println("授权有效");
                     System.out.println("授权有效");
                 }else {
                 }else {

+ 5 - 3
sooka-auth/src/main/resources/application-dev.yml

@@ -9,10 +9,12 @@ spring:
   datasource:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     driver-class-name: com.mysql.cj.jdbc.Driver
 #    url: jdbc:mysql://36.97.65.105:53306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
 #    url: jdbc:mysql://36.97.65.105:53306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+  # 互联网
+#    url: jdbc:mysql://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+  # 政务网 Vpn
 #    url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #    url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-    url: jdbc:mysql://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-
-
+  # 政务网 dzzw
+    url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: thsjzt
     username: thsjzt
     password: thsjzt
     password: thsjzt
     # Hikari will use the above plus the following to setup connection pooling
     # Hikari will use the above plus the following to setup connection pooling

+ 5 - 1
sooka-auth/src/main/resources/application.yml

@@ -6,5 +6,9 @@ spring:
   cloud:
   cloud:
     nacos:
     nacos:
       discovery:
       discovery:
+        # 政务网 Vpn
 #        server-addr: 172.17.5.4:8848
 #        server-addr: 172.17.5.4:8848
-        server-addr: 10.0.51.4:8848
+        # 政务网 dzzw
+        server-addr: 172.18.128.78:8848
+        # 互联网
+#        server-addr: 10.0.51.4:8848