最后提交
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e13db8a
--- /dev/null
+++ b/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.supwisdom.dlpay.DoorApplicationKt
+
diff --git a/Makefile b/Makefile
index 833335a..c7fe4f1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-GRADLE=./gradlew
+GRADLE=gradlew
.PHONY: clean build
diff --git a/build.gradle b/build.gradle
index 3c7b3e1..0a241d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -81,12 +81,17 @@
implementation group: 'taglibs', name: 'standard', version: '1.1.2'
implementation group: 'commons-codec', name: 'commons-codec', version: '1.13'
implementation files('libs/ojdbc6.jar')
+ implementation group: 'org.apache.httpcomponents',name: 'httpcore',version: '4.4.10'
+ implementation group: 'org.apache.httpcomponents',name: 'httpclient',version: '4.5.3'
implementation 'cn.afterturn:easypoi-web:3.0.3'
implementation 'cn.afterturn:easypoi-base:3.0.3'
implementation 'com.github.penggle:kaptcha:2.3.2'
+ implementation group: 'junit',name:'junit',version:'4.12'
+ implementation group: 'org.hamcrest',name: 'hamcrest-core',version:'1.3'
+
annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
annotationProcessor 'org.projectlombok:lombok:1.18.8'
diff --git a/config/application-devel-pg.properties b/config/application-devel-pg.properties
index f7d9824..e3330f9 100644
--- a/config/application-devel-pg.properties
+++ b/config/application-devel-pg.properties
@@ -10,10 +10,13 @@
spring.datasource.password=123456
database.dbtype=postgresql
# Redis settings
-spring.redis.host=172.28.201.101
-spring.redis.port=16379
-spring.redis.password=kingstar
+# spring.redis.host=172.28.201.101
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=123456
spring.redis.database=2
+
+
# jwt settings
jwt.secret=Zj5taLomEbrM0lk+NMQZbHfSxaDU1wekjT+kiC3YzDw=
# timeout seconds
@@ -22,12 +25,9 @@
spring.jackson.serialization.fail-on-empty-beans=false
server.port=8099
-# payapi.url=https://yy.dlsmk.cn/payapi/
-# payapi.appid=300003
-# payapi.secret=b32309b244904e1789b055eb1da51db1
+payapi.url=https://yy.dlsmk.cn/payapi
-payapi.url=http://172.28.43.3:8099/payapi
-payapi.appid=200001
-payapi.secret=dc1d26c0d43e442588092c8d45c21bce
+#payapi.url=http://172.28.43.3:8099/payapi
+
diff --git "a/src/main/webapp/upload/\344\272\272\345\221\230\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\277 \0501\051.xls" "b/src/main/webapp/upload/\344\272\272\345\221\230\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\277 \0501\051.xls"
new file mode 100644
index 0000000..5a34570
--- /dev/null
+++ "b/src/main/webapp/upload/\344\272\272\345\221\230\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\277 \0501\051.xls"
Binary files differ
diff --git "a/src/main/webapp/upload/\344\272\272\345\221\230\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\277 \0502\051.xls" "b/src/main/webapp/upload/\344\272\272\345\221\230\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\277 \0502\051.xls"
new file mode 100644
index 0000000..39f77cb
--- /dev/null
+++ "b/src/main/webapp/upload/\344\272\272\345\221\230\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\277 \0502\051.xls"
Binary files differ
diff --git "a/src/main/webapp/upload/\344\272\272\345\221\230\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\277 \050X\051.xls" "b/src/main/webapp/upload/\344\272\272\345\221\230\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\277 \050X\051.xls"
new file mode 100644
index 0000000..a544e37
--- /dev/null
+++ "b/src/main/webapp/upload/\344\272\272\345\221\230\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\277 \050X\051.xls"
Binary files differ
diff --git "a/src/main/webapp/upload/\344\272\272\345\221\230\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\277.xls" "b/src/main/webapp/upload/\344\272\272\345\221\230\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\277.xls"
new file mode 100644
index 0000000..17d5498
--- /dev/null
+++ "b/src/main/webapp/upload/\344\272\272\345\221\230\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\277.xls"
Binary files differ
diff --git "a/src/main/webapp/upload/\344\272\272\345\221\230\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\2771.xls" "b/src/main/webapp/upload/\344\272\272\345\221\230\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\2771.xls"
new file mode 100644
index 0000000..c272795
--- /dev/null
+++ "b/src/main/webapp/upload/\344\272\272\345\221\230\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\2771.xls"
Binary files differ
diff --git "a/src/main/webapp/upload/\346\237\245\350\257\242\346\250\241\346\235\277 \0501\051.xls" "b/src/main/webapp/upload/\346\237\245\350\257\242\346\250\241\346\235\277 \0501\051.xls"
new file mode 100644
index 0000000..5a251b9
--- /dev/null
+++ "b/src/main/webapp/upload/\346\237\245\350\257\242\346\250\241\346\235\277 \0501\051.xls"
Binary files differ
diff --git "a/src/main/webapp/upload/\350\256\276\345\244\207\345\257\274\345\205\245\346\250\241\346\235\277 \0501\051.xls" "b/src/main/webapp/upload/\350\256\276\345\244\207\345\257\274\345\205\245\346\250\241\346\235\277 \0501\051.xls"
new file mode 100644
index 0000000..8a9965d
--- /dev/null
+++ "b/src/main/webapp/upload/\350\256\276\345\244\207\345\257\274\345\205\245\346\250\241\346\235\277 \0501\051.xls"
Binary files differ
diff --git "a/src/main/webapp/upload/\350\256\276\345\244\207\345\257\274\345\205\245\346\250\241\346\235\277.xls" "b/src/main/webapp/upload/\350\256\276\345\244\207\345\257\274\345\205\245\346\250\241\346\235\277.xls"
new file mode 100644
index 0000000..e0b8bb8
--- /dev/null
+++ "b/src/main/webapp/upload/\350\256\276\345\244\207\345\257\274\345\205\245\346\250\241\346\235\277.xls"
Binary files differ
diff --git "a/src/main/webapp/upload/\351\227\250\347\246\201\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\277.xls" "b/src/main/webapp/upload/\351\227\250\347\246\201\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\277.xls"
new file mode 100644
index 0000000..3e2c87d
--- /dev/null
+++ "b/src/main/webapp/upload/\351\227\250\347\246\201\345\220\215\345\215\225\345\257\274\345\205\245\346\250\241\346\235\277.xls"
Binary files differ