From a63db08aa59c1ef700217d50034ecc56ab213190 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Fri, 2 Dec 2022 16:44:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=87=8F=E8=A1=A5=E5=8D=95=E5=BE=80?=
 =?UTF-8?q?=E6=9D=A5=E5=8D=95=E4=BD=8D=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/sale/admin/util/DateUtil.java    | 14 +++++++++++++-
 .../src/main/resources/application-dev.properties  |  2 +-
 .../src/main/resources/application.properties      |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java b/api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java
index 3bf449d..e88e8db 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/util/DateUtil.java
@@ -520,7 +520,7 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils {
     public static String getBeforeMinute(String actDate, int hour) {
         try {
             long time = timeToStamp(actDate);
-            long move = hour * 1000 * 60 * 60*60;
+            long move = hour * 1000 * 60 * 60 * 60;
             time = time - move;
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date date = new Date(time);
@@ -531,6 +531,7 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils {
         }
         return null;
     }
+
     public static String getLastDayFormat(int amount) {
         SimpleDateFormat smdate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar calendar = new GregorianCalendar();
@@ -540,4 +541,15 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils {
         return formatDate;
     }
 
+
+    public static String formatExpireTime(String str) {
+        try {
+            Date date = DateUtil.parseDate(str, "yyyyMMdd");
+            return formatDate(date, "yyyy-MM-dd");
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return str;
+    }
+
 }
\ No newline at end of file
diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties
index 1cb1302..739995e 100644
--- a/api-admin/src/main/resources/application-dev.properties
+++ b/api-admin/src/main/resources/application-dev.properties
@@ -1,7 +1,7 @@
 # \u751F\u4EA7\u73AF\u5883
 server.port=9907
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_ph?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_za?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=123456
 spring.datasource.hikari.connection-timeout=60000
diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties
index 0f5d7b4..e487e91 100644
--- a/api-admin/src/main/resources/application.properties
+++ b/api-admin/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-spring.profiles.active=pro
+spring.profiles.active=dev
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver