From c5a0fd76859064ec9efdaa0b4c585cf86da70e02 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期六, 19 七月 2025 16:43:38 +0800
Subject: [PATCH] 1.优化定时任务表 2.客户配置
---
main-business/src/main/resources/db/migration/postgresql/V20250614134700__create_table_inspection_task.sql | 8 ++--
ruoyi-admin/src/main/resources/application-zd.yml.example | 76 ++++++++++++++++++++++++++++++++++++++
2 files changed, 80 insertions(+), 4 deletions(-)
diff --git a/main-business/src/main/resources/db/migration/postgresql/V20250614134700__create_table_inspection_task.sql b/main-business/src/main/resources/db/migration/postgresql/V20250614134700__create_table_inspection_task.sql
index 44611d3..dd1451e 100644
--- a/main-business/src/main/resources/db/migration/postgresql/V20250614134700__create_table_inspection_task.sql
+++ b/main-business/src/main/resources/db/migration/postgresql/V20250614134700__create_table_inspection_task.sql
@@ -3,13 +3,13 @@
(
id BIGSERIAL PRIMARY KEY, -- 浠诲姟ID (涓婚敭锛岃嚜澧為暱)
task_name VARCHAR(255), -- 浠诲姟鍚嶇О
- inspector_id BIGINT, -- 宸℃浜哄憳id
+ inspector_id VARCHAR(255), -- 宸℃浜哄憳id
inspector VARCHAR(100), -- 宸℃浜哄憳
- port TEXT, -- 宸℃鍦扮偣
remarks TEXT, -- 澶囨敞璇存槑
registrant_id BIGINT, -- 鐧昏浜哄憳id
registrant VARCHAR(100), -- 鐧昏浜哄憳
frequency_type VARCHAR(100), -- 棰戞
+ inspection_location VARCHAR(255), -- 宸℃鍦扮偣璇︾粏鎻忚堪
deleted INT NOT NULL DEFAULT 0, -- 杞垹闄ゆ爣蹇楋細0=鏈垹闄わ紝1=宸插垹闄�
create_by VARCHAR(255), -- 鍒涘缓浜虹敤鎴峰悕
@@ -29,13 +29,13 @@
COMMENT
ON COLUMN inspection_task.inspector IS '鎵ц宸℃鐨勪汉鍛樺鍚�';
COMMENT
-ON COLUMN inspection_task.port IS '宸℃鍦扮偣璇︾粏鎻忚堪';
-COMMENT
ON COLUMN inspection_task.remarks IS '浠诲姟闄勫姞璇存槑鎴栫壒娈婃儏鍐佃褰�';
COMMENT
ON COLUMN inspection_task.registrant IS '浠诲姟鐧昏浜哄鍚�';
COMMENT
ON COLUMN inspection_task.frequency_type IS '棰戞';
+COMMENT
+ON COLUMN inspection_task.inspection_location IS '宸℃鍦扮偣璇︾粏鎻忚堪';
COMMENT
ON COLUMN inspection_task.deleted IS '杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�';
diff --git a/ruoyi-admin/src/main/resources/application-zd.yml.example b/ruoyi-admin/src/main/resources/application-zd.yml.example
new file mode 100644
index 0000000..388a055
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/application-zd.yml.example
@@ -0,0 +1,76 @@
+# 鏁版嵁婧愰厤缃�
+spring:
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+# driverClassName: com.mysql.cj.jdbc.Driver # mysql椹卞姩
+ driverClassName: org.postgresql.Driver
+ druid:
+ # 涓诲簱鏁版嵁婧�
+ master:
+# mysql
+# url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# pg
+ url: jdbc:postgresql://127.0.0.1:5432/zd_java
+ username: postgres
+ password: ZDadmin123!
+ # 浠庡簱鏁版嵁婧�
+ slave:
+ # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
+ enabled: false
+ url:
+ username:
+ password:
+ # 鍒濆杩炴帴鏁�
+ initialSize: 5
+ # 鏈�灏忚繛鎺ユ睜鏁伴噺
+ minIdle: 10
+ # 鏈�澶ц繛鎺ユ睜鏁伴噺
+ maxActive: 20
+ # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
+ maxWait: 60000
+ # 閰嶇疆杩炴帴瓒呮椂鏃堕棿
+ connectTimeout: 30000
+ # 閰嶇疆缃戠粶瓒呮椂鏃堕棿
+ socketTimeout: 60000
+ # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
+ timeBetweenEvictionRunsMillis: 60000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ minEvictableIdleTimeMillis: 300000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ maxEvictableIdleTimeMillis: 900000
+ # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
+ validationQuery: SELECT VERSION()
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ webStatFilter:
+ enabled: true
+ statViewServlet:
+ enabled: true
+ # 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂�
+ allow:
+ url-pattern: /druid/*
+ # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
+ login-username: ruoyi
+ login-password: 123456
+ filter:
+ stat:
+ enabled: true
+ # 鎱QL璁板綍
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
+
+# 瀹㈡埛鏈嶅姟鍣� minio
+minio:
+ endpoint: 127.0.0.1
+ port: 9000
+ secure: false
+ accessKey: admin
+ secretKey: Admin123456@
+ preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
+ default-bucket: zd-file # 榛樿瀛樺偍妗�
+
--
Gitblit v1.9.3