From d1791f762791428af91467b8855de83d54f015f9 Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期五, 17 四月 2026 15:23:21 +0800
Subject: [PATCH] feat: 1.新增物料、物料类型、材料检验统计等表维护功能 2.完善判定依据-判断依据明细 3.新增判断依据、物料管理等字典翻译类 4.成品物料批次-原始数据维护页面
---
RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/application-dev.yml | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/application-dev.yml b/RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/application-dev.yml
index 8e3efe6..619e6b3 100755
--- a/RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/RuoYi-Vue-Plus/ruoyi-admin/src/main/resources/application-dev.yml
@@ -45,7 +45,7 @@
master:
type: ${spring.datasource.type}
driverClassName: org.postgresql.Driver
- url: jdbc:postgresql://192.168.2.26:5432/postgres?currentSchema=public&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+ url: jdbc:postgresql://127.0.0.1:5433/postgres?currentSchema=public&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
username: postgres
password: 123456
# master:
@@ -64,12 +64,19 @@
# url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
# username:
# password:
-# oracle:
-# type: ${spring.datasource.type}
-# driverClassName: oracle.jdbc.OracleDriver
-# url: jdbc:oracle:thin:@//localhost:1521/XE
-# username: ROOT
-# password: root
+ oracle_zs:
+ lazy: true
+ type: ${spring.datasource.type}
+ driverClassName: oracle.jdbc.OracleDriver
+ url: jdbc:oracle:thin:@127.0.0.1:1521:xe
+ username: appusr
+ password: lanbaoit
+ oracle_sc:
+ type: ${spring.datasource.type}
+ driverClassName: oracle.jdbc.OracleDriver
+ url: jdbc:oracle:thin:@127.0.0.1:1521:xe
+ username: gfsc
+ password: lbit
# postgres:
# type: ${spring.datasource.type}
# driverClassName: org.postgresql.Driver
--
Gitblit v1.9.3