Jelajahi Sumber

淘宝的版本以及判断

xiaochan 2 bulan lalu
induk
melakukan
5f5d5cc895

+ 3 - 16
pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>13.2.9</version>
+    <version>13.3.2</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>
@@ -231,17 +231,6 @@
             <artifactId>logstash-logback-encoder</artifactId>
             <version>7.0.1</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.taobao</groupId>-->
-<!--            <artifactId>taobao-sdk-auto</artifactId>-->
-<!--            <version>1.0.0</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.taobao</groupId>-->
-<!--            <artifactId>taobao-sdk-source</artifactId>-->
-<!--            <version>1.0.0</version>-->
-<!--        </dependency>-->
-
         <dependency>
             <groupId>com.taobao</groupId>
             <artifactId>taobao-sdk-auto</artifactId>
@@ -255,7 +244,8 @@
             <artifactId>taobao-sdk-source</artifactId>
             <version>1.0.0</version>
             <scope>system</scope>
-            <systemPath>${pom.basedir}/src/main/resources/taobao/taobao-sdk-source/taobao-sdk-source-1.0.0.jar</systemPath>
+            <systemPath>${pom.basedir}/src/main/resources/taobao/taobao-sdk-source/taobao-sdk-source-1.0.0.jar
+            </systemPath>
         </dependency>
 
     </dependencies>
@@ -278,9 +268,6 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-<!--                    <arguments>-->
-<!--                        <argument>${project.basedir}\lib</argument>-->
-<!--                    </arguments>-->
                     <executable>true</executable>
                     <includeSystemScope>true</includeSystemScope>
                     <excludes>

+ 1 - 3
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -1510,7 +1510,7 @@ public class YiZhuLuRuServer {
                 vo.setCode(i.getGroupNo());
                 vo.setName(i.getGroupName());
                 vo.setIsDefault(false);
-                if (i.getStartTime() != null && i.getEndTime() != null) {
+                if (StrUtil.isNotBlank(i.getStartTime()) && StrUtil.isNotBlank(i.getEndTime())) {
                     vo.setIsDefault(DateUtil.isInTimeRange(now, i.getStartTime(), i.getEndTime()));
                 }
                 map.computeIfAbsent(item.getKey(), (k) -> new ArrayList<>()).add(vo);
@@ -1518,6 +1518,4 @@ public class YiZhuLuRuServer {
         }
         return map;
     }
-
-
 }