From ffb62aac389a6ac596fe8d0d44d4e242beeea0f2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 10 Mar 2022 11:46:31 +0800
Subject: [PATCH] 考勤查询接口修改，电子围栏自定义新增、修改，查询一个点是否在电子围栏内接口新增
---
src/main/resources/application-dev.yml | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 7df2e73..1d31162 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -15,11 +15,7 @@
# MySql
url: jdbc:mysql://localhost:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
- password: zhba0728
-
-# url: jdbc:mysql://223.82.109.183:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-# username: root
-# password: zhba0728
+ password: ZHba@0112
# PostgreSQL
#url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
@@ -38,10 +34,25 @@
#图片批量上传zip
upload:
localtion: ${UPLOAD_DIR:/home/zhongsong/anbao}
-# localtion: ${UPLOAD_DIR:D:/test}
maxFileSize: 10240KB
maxRequestSize: 102400KB
+#ftp 设置
+ftp:
+ sqlConnect: jdbc:mysql://localhost:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ ftpHost: 172.19.1.30
+ ftpPort: 21
+ ftpUserName: yly
+ ftpPassword: Yly@123
+ ftpPath: yly/anbao/
+ localPath: /home/zhongsong/anbao/
+ ip: http://47.49.36.190:9000
+ jsonUrl: /home/zhongsong/anbao/
+ username: root
+ password: ZHba@0112
+# qfqkBaseApiUrl: http://223.82.109.183:2082/api
+ qfqkBaseApiUrl: http://localhost:83
+
#第三方登陆
social:
enabled: true
--
Gitblit v1.9.3