From 743cafe0637505aae10a0aac046d1a3647f1b4a4 Mon Sep 17 00:00:00 2001
From: bunny <1319900154@qq.com>
Date: Fri, 22 Mar 2024 19:21:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BF=AE=E6=94=B9):=20=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                   |  3 +--
 pom.xml                                          |  6 +++---
 .../controller/notify/PayNotifyController.java   |  3 ++-
 sky-server/src/main/resources/application.yml    |  5 +++--
 sky-server/src/main/resources/mybatis-config.xml | 16 ++++++++++++++++
 5 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 sky-server/src/main/resources/mybatis-config.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4049589..df00c07 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,9 +7,8 @@
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
-    <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="corretto-18" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index bc14ec3..a015f0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,14 +20,14 @@
     </modules>
 
     <properties>
-        <maven.compiler.source>18</maven.compiler.source>
-        <maven.compiler.target>18</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <mybatis.spring>2.2.0</mybatis.spring>
         <lombok>1.18.20</lombok>
         <fastjson>1.2.76</fastjson>
         <commons.lang>2.6</commons.lang>
         <druid>1.2.1</druid>
-        <pagehelper>1.3.0</pagehelper>
+        <pagehelper>1.4.3</pagehelper>
         <aliyun.sdk.oss>3.10.2</aliyun.sdk.oss>
         <knife4j>3.0.3</knife4j>
         <aspectj>1.9.4</aspectj>
diff --git a/sky-server/src/main/java/com/sky/controller/notify/PayNotifyController.java b/sky-server/src/main/java/com/sky/controller/notify/PayNotifyController.java
index 66ec78d..bb9cea0 100644
--- a/sky-server/src/main/java/com/sky/controller/notify/PayNotifyController.java
+++ b/sky-server/src/main/java/com/sky/controller/notify/PayNotifyController.java
@@ -9,6 +9,7 @@ import com.wechat.pay.contrib.apache.httpclient.util.AesUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -70,7 +71,7 @@ public class PayNotifyController {
         StringBuilder result = new StringBuilder();
         String line = null;
         while ((line = reader.readLine()) != null) {
-            if (!result.isEmpty()) {
+            if (!StringUtils.isEmpty(result)) {
                 result.append("\n");
             }
             result.append(line);
diff --git a/sky-server/src/main/resources/application.yml b/sky-server/src/main/resources/application.yml
index f3979ff..827f4ec 100644
--- a/sky-server/src/main/resources/application.yml
+++ b/sky-server/src/main/resources/application.yml
@@ -27,8 +27,9 @@ mybatis:
   #mapper配置文件
   mapper-locations: classpath:mapper/*.xml
   type-aliases-package: com.sky.pojo.entity
-  configuration:
-    map-underscore-to-camel-case: true # 开启驼峰命名
+  config-location: classpath:mybatis-config.xml
+#  configuration:
+#    map-underscore-to-camel-case: true # 开启驼峰命名
 
 logging:
   level:
diff --git a/sky-server/src/main/resources/mybatis-config.xml b/sky-server/src/main/resources/mybatis-config.xml
new file mode 100644
index 0000000..89898c2
--- /dev/null
+++ b/sky-server/src/main/resources/mybatis-config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration PUBLIC
+        "-//mybatis.org//DTD Config 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+    <settings>
+        <!-- 设置驼峰标识 -->
+        <setting name="mapUnderscoreToCamelCase" value="true"/>
+        <!-- 打印SQL语句 -->
+        <setting name="logImpl" value="STDOUT_LOGGING"/>
+    </settings>
+    <plugins>
+        <!-- 分页插件 -->
+        <plugin interceptor="com.github.pagehelper.PageInterceptor"/>
+    </plugins>
+</configuration>