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 @@
-
-
+
\ 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 @@
- 18
- 18
+ 17
+ 17
2.2.0
1.18.20
1.2.76
2.6
1.2.1
- 1.3.0
+ 1.4.3
3.10.2
3.0.3
1.9.4
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+