From a97603d1e60e1c82f6929709cb0a2e1572ceb1b6 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 19 Nov 2021 18:00:03 +0800
Subject: [PATCH] 20211119

---
 .../java/com/ccsens/common/util/Constant.java |  2 -
 pom.xml                                       |  3 +-
 signin/src/main/resources/application.yml     |  4 +-
 .../java/com/ccsens/tall/util/TaskUtil.java   |  4 +-
 .../test/java/com/ccsens/util/Base64Test.java |  2 +-
 .../test/java/com/ccsens/util/OtherTest.java  | 45 ++++++++++---------
 6 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/common/src/main/java/com/ccsens/common/util/Constant.java b/common/src/main/java/com/ccsens/common/util/Constant.java
index 9029499d..5b83b0e3 100644
--- a/common/src/main/java/com/ccsens/common/util/Constant.java
+++ b/common/src/main/java/com/ccsens/common/util/Constant.java
@@ -1,7 +1,5 @@
 package com.ccsens.common.util;
 
-import org.omg.CORBA.StringHolder;
-
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/pom.xml b/pom.xml
index 53c70268..65db9fea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,6 +9,7 @@
         <module>cloudutil</module>
         <module>util</module>
         <module>tall</module>
+        <module>common</module>
 <!--        <module>recovery</module>-->
 <!--        <module>ht</module>-->
 <!--        <module>game</module>-->
@@ -19,9 +20,7 @@
 <!--        <module>ct</module>-->
         <!--<module>tcm</module>-->
         <module>signin</module>
-        <module>common</module>
         <module>wechatutil</module>
-
         <!--        <module>pims</module>-->
 <!--        <module>health</module>-->
 <!--        <module>ct</module>-->
diff --git a/signin/src/main/resources/application.yml b/signin/src/main/resources/application.yml
index b5408a3a..e75cc2c3 100644
--- a/signin/src/main/resources/application.yml
+++ b/signin/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: prod
+    include: util-prod,common
 
diff --git a/tall/src/main/java/com/ccsens/tall/util/TaskUtil.java b/tall/src/main/java/com/ccsens/tall/util/TaskUtil.java
index 547c33eb..cff83d65 100644
--- a/tall/src/main/java/com/ccsens/tall/util/TaskUtil.java
+++ b/tall/src/main/java/com/ccsens/tall/util/TaskUtil.java
@@ -56,7 +56,7 @@ public class TaskUtil {
         }
         //判断时间不明确的为全局任务（时间为空或跨天）
         for (TaskVo.NormalTask detail : taskDetails) {
-            log.info("传入判断是否是全局：{}",detail);
+//            log.info("传入判断是否是全局：{}",detail);
             if((process==1 && detail.getProcess()!=2) || (process==2 && detail.getProcess()==2)){
                 continue;
             }
@@ -94,7 +94,7 @@ public class TaskUtil {
                 beginMin = detail.getBeginTime() < beginMin ? detail.getBeginTime() : beginMin;
                 endMax = detail.getEndTime() > endMax ? detail.getEndTime() : endMax;
             }
-            log.info("判断是否是全局：{}",temp);
+//            log.info("判断是否是全局：{}",temp);
         }
 //        //跨越全视窗的为全局任务
 //        for (TaskVo.NormalTask detail : temp) {
diff --git a/util/src/test/java/com/ccsens/util/Base64Test.java b/util/src/test/java/com/ccsens/util/Base64Test.java
index 137e7ecb..c3018814 100644
--- a/util/src/test/java/com/ccsens/util/Base64Test.java
+++ b/util/src/test/java/com/ccsens/util/Base64Test.java
@@ -91,7 +91,7 @@ public class Base64Test {
     /**
      * 文件转base64
      *
-     * @param path
+     * @param
      * @return
      * @throws Exception
      */
diff --git a/util/src/test/java/com/ccsens/util/OtherTest.java b/util/src/test/java/com/ccsens/util/OtherTest.java
index fea42f01..a22dc8e3 100644
--- a/util/src/test/java/com/ccsens/util/OtherTest.java
+++ b/util/src/test/java/com/ccsens/util/OtherTest.java
@@ -323,27 +323,27 @@ public class OtherTest {
 
     @Test
     public void test16() {
-        long s = 1642608000000L;
-        long e = 1642661444000L;
-
-        //开始时间
-        Calendar min = Calendar.getInstance();
-        min.setTime(new Date(s));
-        min.set(Calendar.HOUR_OF_DAY, 0);
-        min.set(Calendar.MINUTE, 0);
-        min.set(Calendar.SECOND, 0);
-        min.set(Calendar.MILLISECOND, 0);
-
-
-        //结束时间
-        Calendar max = Calendar.getInstance();
-        max.setTime(new Date(e));
-        max.set(Calendar.HOUR_OF_DAY, 0);
-        max.set(Calendar.MINUTE, 0);
-        max.set(Calendar.SECOND, 0);
-        max.set(Calendar.MILLISECOND, 0);
-
-        System.out.println(max.after(min));
+//        long s = 1642608000000L;
+//        long e = 1642661444000L;
+//
+//        //开始时间
+//        Calendar min = Calendar.getInstance();
+//        min.setTime(new Date(s));
+//        min.set(Calendar.HOUR_OF_DAY, 0);
+//        min.set(Calendar.MINUTE, 0);
+//        min.set(Calendar.SECOND, 0);
+//        min.set(Calendar.MILLISECOND, 0);
+//
+//
+//        //结束时间
+//        Calendar max = Calendar.getInstance();
+//        max.setTime(new Date(e));
+//        max.set(Calendar.HOUR_OF_DAY, 0);
+//        max.set(Calendar.MINUTE, 0);
+//        max.set(Calendar.SECOND, 0);
+//        max.set(Calendar.MILLISECOND, 0);
+//
+//        System.out.println(max.after(min));
 
 //
 //        System.out.println("开始日期" + new SimpleDateFormat("yyyy-MM-dd").format(min.getTime()));
@@ -406,7 +406,8 @@ public class OtherTest {
 //            return holidays;
 //        }
 
-
+        System.out.println(Integer.MAX_VALUE);
+        System.out.println(Long.MAX_VALUE);
 
     }
 }