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, 14 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 9bd45f1..c88c67b 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -8,9 +8,9 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://10.16.173.59:3306/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: zttZTT123!
+ password: 123456
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -96,7 +96,7 @@
configuration:
map-underscore-to-camel-case: true
cache-enabled: false
- log-impl: # org.apache.ibatis.logging.stdout.StdOutImpl
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# Swagger閰嶇疆
swagger:
@@ -134,14 +134,17 @@
# 浜轰簨绯荤粺
personnel:
- code:
- appId:
- appSecret:
- companies:
- simple:
- password:
- department:
- person:
+ # 姝ｅ紡鍦板潃
+ 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:
--
Gitblit v1.9.3