From 95786582ad848ba99ebcc716c6ecf24e90f8c3d5 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 19 五月 2025 10:29:08 +0800
Subject: [PATCH] 工时添加判断是否有检验值,没有检验值默认填充工时
---
ruoyi-admin/src/main/resources/application-druid.yml | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index dfad74e..c88c67b 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -8,7 +8,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://114.132.189.42:9004/lims-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/center-lims?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
# 浠庡簱鏁版嵁婧�
@@ -103,6 +103,13 @@
# 鏄惁寮�鍚痵wagger
enabled: true
+# 鏃ュ織閰嶇疆
+logging:
+ file-location: /javaWork/lims-ruoyi
+ level:
+ com.ruoyi: info
+ org.springframework: warn
+
minio:
endpoint: http://114.132.189.42/
port: 7019
@@ -118,7 +125,6 @@
allowed: png,jpg,jpeg,gif
wordUrl: D:\椤圭洰鏂囦欢瀛樺偍\word
-twoCode: D:\椤圭洰鏂囦欢瀛樺偍\two_code
#oa:
@@ -126,6 +132,21 @@
# prodIp: http://192.168.21.53:8081
# unqualifiedProcessId: 41974
+# 浜轰簨绯荤粺
+personnel:
+ # 姝ｅ紡鍦板潃
+ code: https://ztt-sso.ztt.cn/oauth2/token
+ # 瑁呭浜轰簨姝ｅ紡搴�
+ appId: 6f5f6a0c-2a01-4ef6-9e75-c8a6f0c2f044
+ appSecret: 89b9c4735b1e5ee9d6a8544b9b38bb03
+ companies: https://ztt-connector.ztt.cn/api/org/v1/companies
+ simple: https://ztt-connector.ztt.cn/api/org/v1/employees/simple?companyId=
+ # 浜哄憳瀵嗙爜鑾峰彇
+ password: https://ztt-connector.ztt.cn/api/org/v1/employees/original_pwd/
+ department: https://ztt-connector.ztt.cn/api/org/v1/companies/companyId/departments
+ person: https://ztt-connector.ztt.cn/api/org/v1/employees/simple/
+
+# 浼佷笟寰俊閫氱煡
wechat:
# 璐ㄩ噺鎶ユ閫氱煡
examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=21993616-9966-4fe4-81b0-68e99a40c964
--
Gitblit v1.9.3