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 | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 8890bb6..1d31162 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -13,9 +13,10 @@
# commandTimeout: 5000
datasource:
# MySql
- #url: jdbc:mysql://localhost:3306/bladex_boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
- #username: root
- #password: root
+ 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: ZHba@0112
+
# PostgreSQL
#url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
#username: postgres
@@ -25,9 +26,32 @@
#username: BLADEX_BOOT
#password: BLADEX_BOOT
# SqlServer
- url: jdbc:sqlserver://47.110.245.84:1433;DatabaseName=zhba
- username: sa
- password: jxpskj2018
+ #url: jdbc:sqlserver://223.82.109.183:1433;DatabaseName=zhbaw
+ #username: sa
+ #password: zhbaw@2021
+
+
+#图片批量上传zip
+upload:
+ localtion: ${UPLOAD_DIR:/home/zhongsong/anbao}
+ 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:
@@ -48,3 +72,5 @@
upload-domain: http://localhost:8999
remote-path: /usr/share/nginx/html
+
+
--
Gitblit v1.9.3