From b6e5380701b632bf42c38145bfd62da84d06b8a6 Mon Sep 17 00:00:00 2001
From: liupoppo <liuzp315@tom.com>
Date: Wed, 20 Aug 2025 09:00:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8D=95=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                         |  5 +++
 pom.xml                                            | 16 +++----
 .../com/yxt/yythmall/YxtYythmallApplication.java   | 12 +++--
 .../biz/empcardgift/EmpCardGiftService.java        |  8 ++--
 .../yxt/yythmall/mallplus/biz/util/ColUtil.java    | 52 +++++++++++-----------
 src/main/resources/application-devv.yml            | 20 +++++----
 6 files changed, 64 insertions(+), 49 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..81ab424
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/.idea/
+**/debug/
+**/target/
+**/.idea/
+**/logs/
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 301fc8e..8199b98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,15 +27,15 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
+<!--        </dependency>-->
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-openfeign</artifactId>-->
+<!--        </dependency>-->
 
         <!--mysql-->
         <dependency>
diff --git a/src/main/java/com/yxt/yythmall/YxtYythmallApplication.java b/src/main/java/com/yxt/yythmall/YxtYythmallApplication.java
index 5937c35..b74210a 100644
--- a/src/main/java/com/yxt/yythmall/YxtYythmallApplication.java
+++ b/src/main/java/com/yxt/yythmall/YxtYythmallApplication.java
@@ -3,8 +3,12 @@ package com.yxt.yythmall;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
+//import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
 
 /**
  * @author dimengzhe
@@ -16,9 +20,11 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 })
 // 启用自带定时任务
 @EnableScheduling
-@EnableFeignClients(basePackages = {})
+//@EnableFeignClients(basePackages = {})
 public class YxtYythmallApplication {
     public static void main(String[] args) {
-        SpringApplication.run(YxtYythmallApplication.class, args);
+        ConfigurableApplicationContext context = SpringApplication.run(YxtYythmallApplication.class, args);
+        Map<String, Object> beansWithAnnotation = context.getBeansWithAnnotation(RestController.class);
+        beansWithAnnotation.forEach((k, v) -> System.out.println(k + ":" + v));
     }
 }
diff --git a/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java b/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java
index 41861ac..f0d3b53 100644
--- a/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java
+++ b/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java
@@ -3,7 +3,7 @@ package com.yxt.yythmall.biz.empcardgift;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.nacos.client.naming.utils.CollectionUtils;
+//import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -1004,7 +1004,8 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
         //        LocalDate saturday = now.with(firstInMonth(DayOfWeek.SATURDAY));
         LocalDate saturday = now.with(DayOfWeek.SATURDAY);
         do {
-            if (CollectionUtils.isEmpty(weekMap)) {
+//            if (CollectionUtils.isEmpty(weekMap)) {
+            if (weekMap.isEmpty()) {
                 weekMap.add(saturday.toString());
             } else {
                 weekMap.add(saturday.toString());
@@ -1016,7 +1017,8 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
         // 第一个星期天
         LocalDate sunday = now.with(DayOfWeek.SUNDAY);
         do {
-            if (CollectionUtils.isEmpty(weekMap)) {
+//            if (CollectionUtils.isEmpty(weekMap)) {
+            if (weekMap.isEmpty()) {
                 weekMap.add(saturday.toString());
             } else {
                 weekMap.add(sunday.toString());
diff --git a/src/main/java/com/yxt/yythmall/mallplus/biz/util/ColUtil.java b/src/main/java/com/yxt/yythmall/mallplus/biz/util/ColUtil.java
index 6917a2c..1b05813 100644
--- a/src/main/java/com/yxt/yythmall/mallplus/biz/util/ColUtil.java
+++ b/src/main/java/com/yxt/yythmall/mallplus/biz/util/ColUtil.java
@@ -1,8 +1,8 @@
 package com.yxt.yythmall.mallplus.biz.util;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
+//import org.apache.commons.configuration.Configuration;
+//import org.apache.commons.configuration.ConfigurationException;
+//import org.apache.commons.configuration.PropertiesConfiguration;
 
 /**
  * sql字段转java
@@ -12,27 +12,27 @@ import org.apache.commons.configuration.PropertiesConfiguration;
  */
 public class ColUtil {
 
-    /**
-     * 转换mysql数据类型为java数据类型
-     *
-     * @param type 数据库字段类型
-     * @return String
-     */
-    static String cloToJava(String type) {
-        Configuration config = getConfig();
-        assert config != null;
-        return config.getString(type, "unknowType");
-    }
-
-    /**
-     * 获取配置信息
-     */
-    public static PropertiesConfiguration getConfig() {
-        try {
-            return new PropertiesConfiguration("generator.properties");
-        } catch (ConfigurationException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
+//    /**
+//     * 转换mysql数据类型为java数据类型
+//     *
+//     * @param type 数据库字段类型
+//     * @return String
+//     */
+//    static String cloToJava(String type) {
+//        Configuration config = getConfig();
+//        assert config != null;
+//        return config.getString(type, "unknowType");
+//    }
+//
+//    /**
+//     * 获取配置信息
+//     */
+//    public static PropertiesConfiguration getConfig() {
+//        try {
+//            return new PropertiesConfiguration("generator.properties");
+//        } catch (ConfigurationException e) {
+//            e.printStackTrace();
+//        }
+//        return null;
+//    }
 }
diff --git a/src/main/resources/application-devv.yml b/src/main/resources/application-devv.yml
index 9be7613..d5ba5da 100644
--- a/src/main/resources/application-devv.yml
+++ b/src/main/resources/application-devv.yml
@@ -3,20 +3,22 @@ spring:
     hikari:
       max-lifetime: 500000
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://39.104.100.138:3306/yxt_lpk_yythmall?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://127.0.0.1:3306/ss_ordermall?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+#    url: jdbc:mysql://39.104.100.138:3306/yxt_lpk_yythmall?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
 #    url: jdbc:mysql://8.130.39.13:3306/yxt_lpk_yythmall?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
     username: root
 #    password: 1LAiGz$t1*Iw
-    password: yxt_mysql_138
-  cloud:
-    nacos:
-      discovery:
-        namespace: lipinka
-        server-addr: 39.104.100.138:8848
-        register-enabled: false
+#    password: yxt_mysql_138
+    password: root
+#  cloud:
+#    nacos:
+#      discovery:
+#        namespace: lipinka
+#        server-addr: 39.104.100.138:8848
+#        register-enabled: false
   redis:
     database: 3  # Redis数据库索引（默认为0）
-    host: 39.104.100.138
+    host: 127.0.0.1
     jedis:
       pool:
         max-active: -1  #连接池最大连接数（使用负值表示没有限制）