From ecd6e50d0bb2c74e4b3f7a23e0d44f5e001987ea Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 13:57:47 +0800
Subject: [PATCH] 冲突解决
---
/dev/null | 140 ----------------------------------------------
src/main/resources/application-dev.yml | 14 ++--
src/main/java/com/ruoyi/sales/mapper/InvoiceLedgerMapper.java | 3
3 files changed, 8 insertions(+), 149 deletions(-)
diff --git "a/$\173project.build.directory\175/classes/.github/FUNDING.yml" "b/$\173project.build.directory\175/classes/.github/FUNDING.yml"
deleted file mode 100644
index fbcab77..0000000
--- "a/$\173project.build.directory\175/classes/.github/FUNDING.yml"
+++ /dev/null
@@ -1 +0,0 @@
-custom: http://doc.ruoyi.vip/ruoyi-vue/other/donate.html
diff --git "a/$\173project.build.directory\175/classes/.gitignore" "b/$\173project.build.directory\175/classes/.gitignore"
deleted file mode 100644
index 09bdfea..0000000
--- "a/$\173project.build.directory\175/classes/.gitignore"
+++ /dev/null
@@ -1,46 +0,0 @@
-######################################################################
-# Build Tools
-
-.gradle
-/build/
-!gradle/wrapper/gradle-wrapper.jar
-
-target/
-!.mvn/wrapper/maven-wrapper.jar
-
-######################################################################
-# IDE
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### JRebel ###
-rebel.xml
-### NetBeans ###
-nbproject/private/
-build/*
-nbbuild/
-dist/
-nbdist/
-.nb-gradle/
-
-######################################################################
-# Others
-*.log
-*.xml.versionsBackup
-*.swp
-
-!*/build/*.java
-!*/build/*.html
-!*/build/*.xml
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/LICENSE" "b/$\173project.build.directory\175/classes/LICENSE"
deleted file mode 100644
index 8564f29..0000000
--- "a/$\173project.build.directory\175/classes/LICENSE"
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 RuoYi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/META-INF/spring-devtools.properties" "b/$\173project.build.directory\175/classes/META-INF/spring-devtools.properties"
deleted file mode 100644
index 37e7b58..0000000
--- "a/$\173project.build.directory\175/classes/META-INF/spring-devtools.properties"
+++ /dev/null
@@ -1 +0,0 @@
-restart.include.json=/com.alibaba.fastjson2.*.jar
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/README.md" "b/$\173project.build.directory\175/classes/README.md"
deleted file mode 100644
index db81290..0000000
--- "a/$\173project.build.directory\175/classes/README.md"
+++ /dev/null
@@ -1,94 +0,0 @@
-<p align="center">
- <img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
-</p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.9</h1>
-<h4 align="center">鍩轰簬SpringBoot+Vue鍓嶅悗绔垎绂荤殑Java蹇�熷紑鍙戞鏋�</h4>
-<p align="center">
- <a href="https://gitee.com/y_project/RuoYi-Vue/stargazers"><img src="https://gitee.com/y_project/RuoYi-Vue/badge/star.svg?theme=dark"></a>
- <a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.9-brightgreen.svg"></a>
- <a href="https://gitee.com/y_project/RuoYi-Vue/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
-</p>
-
-## 骞冲彴绠�浠�
-
-* 鏈粨搴撲负RuoYi-Vue鐨勫崟搴旂敤鐗堟湰锛屼繚鎸佸悓姝ユ洿鏂般��
-* 閰嶅鍓嶇浠ｇ爜鍦板潃[RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue/tree/master/ruoyi-ui)锛屾妧鏈爤锛圼Vue2](https://cn.vuejs.org) + [Element](https://github.com/ElemeFE/element) + [Vue CLI](https://cli.vuejs.org/zh)锛夈��
-* 閰嶅鍓嶇浠ｇ爜鍦板潃[RuoYi-Vue3](https://gitcode.com/yangzongzhuan/RuoYi-Vue3)锛屾妧鏈爤锛圼Vue3](https://v3.cn.vuejs.org) + [Element Plus](https://element-plus.org/zh-CN) + [Vite](https://cn.vitejs.dev)锛夈��
-* 鍓嶇閲囩敤Vue銆丒lement UI銆�
-* 鍚庣閲囩敤Spring Boot銆丼pring Security銆丷edis & Jwt銆�
-* 鏉冮檺璁よ瘉浣跨敤Jwt锛屾敮鎸佸缁堢璁よ瘉绯荤粺銆�
-* 鏀寔鍔犺浇鍔ㄦ�佹潈闄愯彍鍗曪紝澶氭柟寮忚交鏉炬潈闄愭帶鍒躲��
-* 楂樻晥鐜囧紑鍙戯紝浣跨敤浠ｇ爜鐢熸垚鍣ㄥ彲浠ヤ竴閿敓鎴愬墠鍚庣浠ｇ爜銆�
-* 涓嶅垎绂荤増鏈紝璇风Щ姝RuoYi](https://gitee.com/y_project/RuoYi)锛屽井鏈嶅姟鐗堟湰锛岃绉绘[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
-* 闃块噷浜戞姌鎵ｅ満锛歔鐐规垜杩涘叆](http://aly.ruoyi.vip)锛岃吘璁簯绉掓潃鍦猴細[鐐规垜杩涘叆](http://txy.ruoyi.vip)
-
-## 鍐呯疆鍔熻兘
-
-1. 鐢ㄦ埛绠＄悊锛氱敤鎴锋槸绯荤粺鎿嶄綔鑰咃紝璇ュ姛鑳戒富瑕佸畬鎴愮郴缁熺敤鎴烽厤缃��
-2. 閮ㄩ棬绠＄悊锛氶厤缃郴缁熺粍缁囨満鏋勶紙鍏徃銆侀儴闂ㄣ�佸皬缁勶級锛屾爲缁撴瀯灞曠幇鏀寔鏁版嵁鏉冮檺銆�
-3. 宀椾綅绠＄悊锛氶厤缃郴缁熺敤鎴锋墍灞炴媴浠昏亴鍔°��
-4. 鑿滃崟绠＄悊锛氶厤缃郴缁熻彍鍗曪紝鎿嶄綔鏉冮檺锛屾寜閽潈闄愭爣璇嗙瓑銆�
-5. 瑙掕壊绠＄悊锛氳鑹茶彍鍗曟潈闄愬垎閰嶃�佽缃鑹叉寜鏈烘瀯杩涜鏁版嵁鑼冨洿鏉冮檺鍒掑垎銆�
-6. 瀛楀吀绠＄悊锛氬绯荤粺涓粡甯镐娇鐢ㄧ殑涓�浜涜緝涓哄浐瀹氱殑鏁版嵁杩涜缁存姢銆�
-7. 鍙傛暟绠＄悊锛氬绯荤粺鍔ㄦ�侀厤缃父鐢ㄥ弬鏁般��
-8. 閫氱煡鍏憡锛氱郴缁熼�氱煡鍏憡淇℃伅鍙戝竷缁存姢銆�
-9. 鎿嶄綔鏃ュ織锛氱郴缁熸甯告搷浣滄棩蹇楄褰曞拰鏌ヨ锛涚郴缁熷紓甯镐俊鎭棩蹇楄褰曞拰鏌ヨ銆�
-10. 鐧诲綍鏃ュ織锛氱郴缁熺櫥褰曟棩蹇楄褰曟煡璇㈠寘鍚櫥褰曞紓甯搞��
-11. 鍦ㄧ嚎鐢ㄦ埛锛氬綋鍓嶇郴缁熶腑娲昏穬鐢ㄦ埛鐘舵�佺洃鎺с��
-12. 瀹氭椂浠诲姟锛氬湪绾匡紙娣诲姞銆佷慨鏀广�佸垹闄�)浠诲姟璋冨害鍖呭惈鎵ц缁撴灉鏃ュ織銆�
-13. 浠ｇ爜鐢熸垚锛氬墠鍚庣浠ｇ爜鐨勭敓鎴愶紙java銆乭tml銆亁ml銆乻ql锛夋敮鎸丆RUD涓嬭浇 銆�
-14. 绯荤粺鎺ュ彛锛氭牴鎹笟鍔′唬鐮佽嚜鍔ㄧ敓鎴愮浉鍏崇殑api鎺ュ彛鏂囨。銆�
-15. 鏈嶅姟鐩戞帶锛氱洃瑙嗗綋鍓嶇郴缁烠PU銆佸唴瀛樸�佺鐩樸�佸爢鏍堢瓑鐩稿叧淇℃伅銆�
-16. 缂撳瓨鐩戞帶锛氬绯荤粺鐨勭紦瀛樹俊鎭煡璇紝鍛戒护缁熻绛夈��
-17. 鍦ㄧ嚎鏋勫缓鍣細鎷栧姩琛ㄥ崟鍏冪礌鐢熸垚鐩稿簲鐨凥TML浠ｇ爜銆�
-18. 杩炴帴姹犵洃瑙嗭細鐩戣褰撳墠绯荤粺鏁版嵁搴撹繛鎺ユ睜鐘舵�侊紝鍙繘琛屽垎鏋怱QL鎵惧嚭绯荤粺鎬ц兘鐡堕銆�
-
-## 鍦ㄧ嚎浣撻獙
-
-- admin/admin123
-- 闄嗛檰缁画鏀跺埌涓�浜涙墦璧忥紝涓轰簡鏇村ソ鐨勪綋楠屽凡鐢ㄤ簬婕旂ず鏈嶅姟鍣ㄥ崌绾с�傝阿璋㈠悇浣嶅皬浼欎即銆�
-
-婕旂ず鍦板潃锛歨ttp://vue.ruoyi.vip
-鏂囨。鍦板潃锛歨ttp://doc.ruoyi.vip
-
-## 婕旂ず鍥�
-
-<table>
- <tr>
- <td><img src="https://oscimg.oschina.net/oscnet/cd1f90be5f2684f4560c9519c0f2a232ee8.jpg"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/1cbcf0e6f257c7d3a063c0e3f2ff989e4b3.jpg"/></td>
- </tr>
- <tr>
- <td><img src="https://oscimg.oschina.net/oscnet/up-8074972883b5ba0622e13246738ebba237a.png"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/up-9f88719cdfca9af2e58b352a20e23d43b12.png"/></td>
- </tr>
- <tr>
- <td><img src="https://oscimg.oschina.net/oscnet/up-39bf2584ec3a529b0d5a3b70d15c9b37646.png"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/up-936ec82d1f4872e1bc980927654b6007307.png"/></td>
- </tr>
- <tr>
- <td><img src="https://oscimg.oschina.net/oscnet/up-b2d62ceb95d2dd9b3fbe157bb70d26001e9.png"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/up-d67451d308b7a79ad6819723396f7c3d77a.png"/></td>
- </tr>
- <tr>
- <td><img src="https://oscimg.oschina.net/oscnet/5e8c387724954459291aafd5eb52b456f53.jpg"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/644e78da53c2e92a95dfda4f76e6d117c4b.jpg"/></td>
- </tr>
- <tr>
- <td><img src="https://oscimg.oschina.net/oscnet/up-8370a0d02977eebf6dbf854c8450293c937.png"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/up-49003ed83f60f633e7153609a53a2b644f7.png"/></td>
- </tr>
- <tr>
- <td><img src="https://oscimg.oschina.net/oscnet/up-d4fe726319ece268d4746602c39cffc0621.png"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/up-c195234bbcd30be6927f037a6755e6ab69c.png"/></td>
- </tr>
- <tr>
- <td><img src="https://oscimg.oschina.net/oscnet/b6115bc8c31de52951982e509930b20684a.jpg"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/up-5e4daac0bb59612c5038448acbcef235e3a.png"/></td>
- </tr>
-</table>
-
-
-## 鑻ヤ緷鍓嶅悗绔垎绂讳氦娴佺兢
-
-QQ缇わ細 [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ 鐐瑰嚮鎸夐挳鍏ョ兢銆�
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-bdsm.yml" "b/$\173project.build.directory\175/classes/application-bdsm.yml"
deleted file mode 100644
index d623a1d..0000000
--- "a/$\173project.build.directory\175/classes/application-bdsm.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9096
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-bdsm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 15
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-bhmy.yml" "b/$\173project.build.directory\175/classes/application-bhmy.yml"
deleted file mode 100644
index 741e60b..0000000
--- "a/$\173project.build.directory\175/classes/application-bhmy.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9070
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-bhmy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 11
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-cjny.yml" "b/$\173project.build.directory\175/classes/application-cjny.yml"
deleted file mode 100644
index 3bb202c..0000000
--- "a/$\173project.build.directory\175/classes/application-cjny.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9038
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-cjny?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 4
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-cmny.yml" "b/$\173project.build.directory\175/classes/application-cmny.yml"
deleted file mode 100644
index 810c8a8..0000000
--- "a/$\173project.build.directory\175/classes/application-cmny.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9088
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-cmny?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 12
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-demo.yml" "b/$\173project.build.directory\175/classes/application-demo.yml"
deleted file mode 100644
index ee53b79..0000000
--- "a/$\173project.build.directory\175/classes/application-demo.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9036
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: demo-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-dev.yml" "b/$\173project.build.directory\175/classes/application-dev.yml"
deleted file mode 100644
index dd0f9c6..0000000
--- "a/$\173project.build.directory\175/classes/application-dev.yml"
+++ /dev/null
@@ -1,244 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: D:/ruoyi/uploadPath
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 7003
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://114.132.189.42:9099/product-inventory-management-hysn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
- host: 127.0.0.1
-# host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password: 123456
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
- # Quartz瀹氭椂浠诲姟閰嶇疆锛堟柊澧為儴鍒嗭級
- quartz:
- job-store-type: jdbc # 浣跨敤鏁版嵁搴撳瓨鍌�
- jdbc:
- initialize-schema: never # 棣栨杩愯鏃惰嚜鍔ㄥ垱寤鸿〃缁撴瀯锛屾垚鍔熷悗鏀逛负never
- schema: classpath:org/quartz/impl/jdbcjobstore/tables_mysql_innodb.sql # MySQL琛ㄧ粨鏋勮剼鏈�
- properties:
- org:
- quartz:
- scheduler:
- instanceName: RuoYiScheduler
- instanceId: AUTO
- jobStore:
- class: org.quartz.impl.jdbcjobstore.JobStoreTX
- driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate # MySQL閫傞厤
- tablePrefix: qrtz_ # 琛ㄥ悕鍓嶇紑锛屼笌鑴氭湰涓�鑷�
- isClustered: false # 鍗曡妭鐐规ā寮忥紙闆嗙兢闇�鏀逛负true锛�
- clusterCheckinInterval: 10000
- txIsolationLevelSerializable: true
- threadPool:
- class: org.quartz.simpl.SimpleThreadPool
- threadCount: 10 # 绾跨▼姹犲ぇ灏�
- threadPriority: 5
- makeThreadsDaemons: true
- updateCheck: false # 鍏抽棴鐗堟湰妫�鏌�
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: D:/ruoyi/temp/uploads # 涓存椂鐩綍
- upload-dir: D:/ruoyi/prod/uploads # 姝ｅ紡鐩綍
diff --git "a/$\173project.build.directory\175/classes/application-dhdc.yml" "b/$\173project.build.directory\175/classes/application-dhdc.yml"
deleted file mode 100644
index 52fbd62..0000000
--- "a/$\173project.build.directory\175/classes/application-dhdc.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9032
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://192.168.1.8:3306/product-inventory-management-dhdc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 192.168.1.8
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 1
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-druid.yml" "b/$\173project.build.directory\175/classes/application-druid.yml"
deleted file mode 100644
index 5cbaf32..0000000
--- "a/$\173project.build.directory\175/classes/application-druid.yml"
+++ /dev/null
@@ -1,69 +0,0 @@
-# 鏁版嵁婧愰厤缃�
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://localhost:3306/product-inventory-management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# url: jdbc:mysql://114.132.189.42:9004/product-inventory-management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
-
-file:
- temp-dir: D:/ruoyi/temp/uploads # 涓存椂鐩綍
- upload-dir: D:/ruoyi/prod/uploads # 姝ｅ紡鐩綍
-# temp-dir: /javaWork/product-inventory-management/file/temp/uploads
-# upload-dir: /javaWork/product-inventory-management/file/prod/uploads
-
diff --git "a/$\173project.build.directory\175/classes/application-hbkj.yml" "b/$\173project.build.directory\175/classes/application-hbkj.yml"
deleted file mode 100644
index 36a993c..0000000
--- "a/$\173project.build.directory\175/classes/application-hbkj.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9117
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hbkj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 3
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-hbxm.yml" "b/$\173project.build.directory\175/classes/application-hbxm.yml"
deleted file mode 100644
index 51f6710..0000000
--- "a/$\173project.build.directory\175/classes/application-hbxm.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9100
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hbxm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 13
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-hckx.yml" "b/$\173project.build.directory\175/classes/application-hckx.yml"
deleted file mode 100644
index 6de381e..0000000
--- "a/$\173project.build.directory\175/classes/application-hckx.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9090
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hckx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 12
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-hcmy.yml" "b/$\173project.build.directory\175/classes/application-hcmy.yml"
deleted file mode 100644
index 3521d7a..0000000
--- "a/$\173project.build.directory\175/classes/application-hcmy.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9103
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hcmy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 15
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-hhkj.yml" "b/$\173project.build.directory\175/classes/application-hhkj.yml"
deleted file mode 100644
index 152f330..0000000
--- "a/$\173project.build.directory\175/classes/application-hhkj.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9046
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hhkj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-hsmy.yml" "b/$\173project.build.directory\175/classes/application-hsmy.yml"
deleted file mode 100644
index f057f3f..0000000
--- "a/$\173project.build.directory\175/classes/application-hsmy.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9115
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hsmy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 2
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-hsxny.yml" "b/$\173project.build.directory\175/classes/application-hsxny.yml"
deleted file mode 100644
index 4c0a3f3..0000000
--- "a/$\173project.build.directory\175/classes/application-hsxny.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9101
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hsxny?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 12
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-hxgy.yml" "b/$\173project.build.directory\175/classes/application-hxgy.yml"
deleted file mode 100644
index 1a36dc4..0000000
--- "a/$\173project.build.directory\175/classes/application-hxgy.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9098
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hxgy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 14
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-hxsj.yml" "b/$\173project.build.directory\175/classes/application-hxsj.yml"
deleted file mode 100644
index d756e6e..0000000
--- "a/$\173project.build.directory\175/classes/application-hxsj.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8088
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hxsj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: hxsj@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 15
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-hysn.yml" "b/$\173project.build.directory\175/classes/application-hysn.yml"
deleted file mode 100644
index 825d908..0000000
--- "a/$\173project.build.directory\175/classes/application-hysn.yml"
+++ /dev/null
@@ -1,244 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9034
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hysn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 5
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
- # Quartz瀹氭椂浠诲姟閰嶇疆锛堟柊澧為儴鍒嗭級
- quartz:
- job-store-type: jdbc # 浣跨敤鏁版嵁搴撳瓨鍌�
- jdbc:
- initialize-schema: never # 棣栨杩愯鏃惰嚜鍔ㄥ垱寤鸿〃缁撴瀯锛屾垚鍔熷悗鏀逛负never
- schema: classpath:org/quartz/impl/jdbcjobstore/tables_mysql_innodb.sql # MySQL琛ㄧ粨鏋勮剼鏈�
- properties:
- org:
- quartz:
- scheduler:
- instanceName: RuoYiScheduler
- instanceId: AUTO
- jobStore:
- class: org.quartz.impl.jdbcjobstore.JobStoreTX
- driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate # MySQL閫傞厤
- tablePrefix: qrtz_ # 琛ㄥ悕鍓嶇紑锛屼笌鑴氭湰涓�鑷�
- isClustered: false # 鍗曡妭鐐规ā寮忥紙闆嗙兢闇�鏀逛负true锛�
- clusterCheckinInterval: 10000
- txIsolationLevelSerializable: true
- threadPool:
- class: org.quartz.simpl.SimpleThreadPool
- threadCount: 10 # 绾跨▼姹犲ぇ灏�
- threadPriority: 5
- makeThreadsDaemons: true
- updateCheck: false # 鍏抽棴鐗堟湰妫�鏌�
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: false
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-jjxm.yml" "b/$\173project.build.directory\175/classes/application-jjxm.yml"
deleted file mode 100644
index d5115a7..0000000
--- "a/$\173project.build.directory\175/classes/application-jjxm.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9107
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-jjxm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-jlsn.yml" "b/$\173project.build.directory\175/classes/application-jlsn.yml"
deleted file mode 100644
index 72e6df9..0000000
--- "a/$\173project.build.directory\175/classes/application-jlsn.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9094
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-jlsn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 13
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-jsmy.yml" "b/$\173project.build.directory\175/classes/application-jsmy.yml"
deleted file mode 100644
index e38a579..0000000
--- "a/$\173project.build.directory\175/classes/application-jsmy.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9042
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-jsmy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 6
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-jsyny.yml" "b/$\173project.build.directory\175/classes/application-jsyny.yml"
deleted file mode 100644
index a813c9a..0000000
--- "a/$\173project.build.directory\175/classes/application-jsyny.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9074
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-jsyny?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 12
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-jyhj.yml" "b/$\173project.build.directory\175/classes/application-jyhj.yml"
deleted file mode 100644
index 48965fd..0000000
--- "a/$\173project.build.directory\175/classes/application-jyhj.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9030
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.16.230.40:3306/product-inventory-management-jyhj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.16.230.40
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-mkzs.yml" "b/$\173project.build.directory\175/classes/application-mkzs.yml"
deleted file mode 100644
index 6e91a95..0000000
--- "a/$\173project.build.directory\175/classes/application-mkzs.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9111
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-mkzs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 1
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-mqsp.yml" "b/$\173project.build.directory\175/classes/application-mqsp.yml"
deleted file mode 100644
index a09955d..0000000
--- "a/$\173project.build.directory\175/classes/application-mqsp.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9123
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-lqmsp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 6
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-mxsc.yml" "b/$\173project.build.directory\175/classes/application-mxsc.yml"
deleted file mode 100644
index 792bc4b..0000000
--- "a/$\173project.build.directory\175/classes/application-mxsc.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9048
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-mxsc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-nydl.yml" "b/$\173project.build.directory\175/classes/application-nydl.yml"
deleted file mode 100644
index 7d9428e..0000000
--- "a/$\173project.build.directory\175/classes/application-nydl.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9104
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://192.168.0.182:3306/product-inventory-management-nydl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: HpencZdyK7WrtQvBUKnr
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 192.168.0.182
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-phmk.yml" "b/$\173project.build.directory\175/classes/application-phmk.yml"
deleted file mode 100644
index f8a7a15..0000000
--- "a/$\173project.build.directory\175/classes/application-phmk.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9119
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-phmk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 4
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-prod.yml" "b/$\173project.build.directory\175/classes/application-prod.yml"
deleted file mode 100644
index 7c4b412..0000000
--- "a/$\173project.build.directory\175/classes/application-prod.yml"
+++ /dev/null
@@ -1,220 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 7003
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://114.132.189.42:9004/product-inventory-management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
- host: 127.0.0.1
-# host: localhost
-# host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
- password: root2022!
-# password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: false
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-qlmc.yml" "b/$\173project.build.directory\175/classes/application-qlmc.yml"
deleted file mode 100644
index 3b8c0d0..0000000
--- "a/$\173project.build.directory\175/classes/application-qlmc.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8090
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-qlmc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: qlmc@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 15
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-rzny.yml" "b/$\173project.build.directory\175/classes/application-rzny.yml"
deleted file mode 100644
index 22e060e..0000000
--- "a/$\173project.build.directory\175/classes/application-rzny.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9058
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-rzny?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-tjxm.yml" "b/$\173project.build.directory\175/classes/application-tjxm.yml"
deleted file mode 100644
index 1130bb1..0000000
--- "a/$\173project.build.directory\175/classes/application-tjxm.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9064
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-tjxm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 9
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-trsw.yml" "b/$\173project.build.directory\175/classes/application-trsw.yml"
deleted file mode 100644
index d9a0678..0000000
--- "a/$\173project.build.directory\175/classes/application-trsw.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9129
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: demo-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-trsw?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 13
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-tymk.yml" "b/$\173project.build.directory\175/classes/application-tymk.yml"
deleted file mode 100644
index d836ed9..0000000
--- "a/$\173project.build.directory\175/classes/application-tymk.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9121
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-tymk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 5
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-wdsy.yml" "b/$\173project.build.directory\175/classes/application-wdsy.yml"
deleted file mode 100644
index b55f3fb..0000000
--- "a/$\173project.build.directory\175/classes/application-wdsy.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8068
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://114.132.189.42:9004/product-inventory-management-wdsy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 2
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: false
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-xyhb.yml" "b/$\173project.build.directory\175/classes/application-xyhb.yml"
deleted file mode 100644
index c710d56..0000000
--- "a/$\173project.build.directory\175/classes/application-xyhb.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9052
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-xyhb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 8
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-zjyj.yml" "b/$\173project.build.directory\175/classes/application-zjyj.yml"
deleted file mode 100644
index e6e4b6a..0000000
--- "a/$\173project.build.directory\175/classes/application-zjyj.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8078
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://114.132.189.42:9004/product-inventory-management-zjyj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: false
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-zqhx.yml" "b/$\173project.build.directory\175/classes/application-zqhx.yml"
deleted file mode 100644
index 3a6cf4d..0000000
--- "a/$\173project.build.directory\175/classes/application-zqhx.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 1234
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://114.132.189.42:9004/product-inventory-management-zqhx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 1
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: false
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-zyrq.yml" "b/$\173project.build.directory\175/classes/application-zyrq.yml"
deleted file mode 100644
index 9030508..0000000
--- "a/$\173project.build.directory\175/classes/application-zyrq.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9030
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: demo-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://192.168.10.230:3306/product-inventory-management-zyrq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: zyrq@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 192.168.10.230
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application-zyrqCopy.yml" "b/$\173project.build.directory\175/classes/application-zyrqCopy.yml"
deleted file mode 100644
index b73a211..0000000
--- "a/$\173project.build.directory\175/classes/application-zyrqCopy.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9030
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: demo-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-zyrq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 5
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/application.yml" "b/$\173project.build.directory\175/classes/application.yml"
deleted file mode 100644
index c79d967..0000000
--- "a/$\173project.build.directory\175/classes/application.yml"
+++ /dev/null
@@ -1,4 +0,0 @@
-# Spring閰嶇疆
-spring:
- profiles:
- active: dev
diff --git "a/$\173project.build.directory\175/classes/banner.txt" "b/$\173project.build.directory\175/classes/banner.txt"
deleted file mode 100644
index 0931cb8..0000000
--- "a/$\173project.build.directory\175/classes/banner.txt"
+++ /dev/null
@@ -1,24 +0,0 @@
-Application Version: ${ruoyi.version}
-Spring Boot Version: ${spring-boot.version}
-////////////////////////////////////////////////////////////////////
-// _ooOoo_ //
-// o8888888o //
-// 88" . "88 //
-// (| ^_^ |) //
-// O\ = /O //
-// ____/`---'\____ //
-// .' \\| |// `. //
-// / \\||| : |||// \ //
-// / _||||| -:- |||||- \ //
-// | | \\\ - /// | | //
-// | \_| ''\---/'' | | //
-// \ .-\__ `-` ___/-. / //
-// ___`. .' /--.--\ `. . ___ //
-// ."" '< `.___\_<|>_/___.' >'"". //
-// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
-// \ \ `-. \_ __\ /__ _/ .-` / / //
-// ========`-.____`-.___\_____/___.-`____.-'======== //
-// `=---=' //
-// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
-// 浣涚淇濅綉 姘镐笉瀹曟満 姘告棤BUG //
-////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/bin/clean.bat" "b/$\173project.build.directory\175/classes/bin/clean.bat"
deleted file mode 100644
index 24c0974..0000000
--- "a/$\173project.build.directory\175/classes/bin/clean.bat"
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 清理工程target生成路径。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-call mvn clean
-
-pause
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/bin/package.bat" "b/$\173project.build.directory\175/classes/bin/package.bat"
deleted file mode 100644
index c693ec0..0000000
--- "a/$\173project.build.directory\175/classes/bin/package.bat"
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 打包Web工程，生成war/jar包文件。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-call mvn clean package -Dmaven.test.skip=true
-
-pause
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/bin/run-tomcat.bat" "b/$\173project.build.directory\175/classes/bin/run-tomcat.bat"
deleted file mode 100644
index 53f936d..0000000
--- "a/$\173project.build.directory\175/classes/bin/run-tomcat.bat"
+++ /dev/null
@@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [信息] 使用内嵌Tomcat运行Web工程。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-title %cd%
-set MAVEN_OPTS=%MAVEN_OPTS% -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-call mvn clean spring-boot:run -Dmaven.test.skip=true -U
-
-pause
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/doc/add.sql" "b/$\173project.build.directory\175/classes/doc/add.sql"
deleted file mode 100644
index 8902911..0000000
--- "a/$\173project.build.directory\175/classes/doc/add.sql"
+++ /dev/null
@@ -1,132 +0,0 @@
-
-# 璁惧鍙拌处
-create table `product-inventory-management`.device_repair
-(
- id bigint auto_increment
- primary key,
- device_ledger_id varchar(255) not null comment '璁惧鍙拌处id',
- repair_time timestamp null comment '鎶ヤ慨鏃ユ湡',
- repair_name varchar(255) not null comment '鎶ヤ慨浜�',
- remark varchar(255) not null comment '鏁呴殰鐜拌薄',
- maintenance_name varchar not null comment '缁翠慨浜�',
- maintenance_time timestamp null comment '缁翠慨鏃堕棿',
- maintenance_result varchar(255) null comment '缁翠慨缁撴灉',
- status int default 0 comment '鐘舵��',
- create_time datetime null comment '褰曞叆鏃堕棿',
- update_time datetime null comment '鏇存柊鏃堕棿',
- create_user varchar(255) not null comment '褰曞叆浜�',
- update_user varchar(255) not null comment '鏇存柊浜�',
- tenant_id bigint not null comment '绉熸埛id'
-);
-
-# 璁惧缁翠慨
-create table `product-inventory-management`.device_ledger
-(
- id bigint auto_increment
- primary key,
- device_name varchar(255) not null comment '璁惧鍚嶇О',
- device_model varchar(255) not null comment '瑙勬牸鍨嬪彿',
- supplier_name varchar(255) not null comment '渚涘簲鍟�',
- unit varchar(255) not null comment '鍗曚綅',
- number decimal not null comment '鏁伴噺',
- tax_including_price_unit decimal not null comment '鍚◣鍗曚环',
- tax_including_price_total decimal not null comment '鍚◣鎬讳环',
- tax_rate decimal not null comment '绋庣巼',
- un_tax_including_price_total decimal not null comment '涓嶅惈绋庢�讳环',
- create_time timestamp null comment '褰曞叆鏃堕棿',
- update_time timestamp null comment '鏇存柊鏃堕棿',
- create_user varchar(255) not null comment '褰曞叆浜�',
- update_user varchar(255) not null comment '鏇存柊浜�',
- tenant_id bigint not null comment '绉熸埛id'
-);
-
-create table `product-inventory-management`.device_maintenance
-(
- id bigint auto_increment
- primary key,
- device_ledger_id varchar(255) not null comment '璁惧鍙拌处id',
- maintenance__plan_time timestamp null comment '璁″垝淇濆吇鏃ユ湡',
- maintenance_actually_name varchar(255) not null comment '瀹為檯淇濆吇浜�',
- maintenance_actually_time timestamp null comment '瀹為檯淇濆吇鏃ユ湡',
- maintenance_result int not null default 0 comment '淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ',
- status int not null default 0 comment '鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨',
- create_time datetime null comment '褰曞叆鏃堕棿',
- update_time datetime null comment '鏇存柊鏃堕棿',
- create_user varchar(255) not null comment '褰曞叆浜�',
- update_user varchar(255) not null comment '鏇存柊浜�',
- tenant_id bigint not null comment '绉熸埛id'
-);
-
-
-alter table purchase_ledger
- add payment_method varchar(255) null;
-alter table sales_ledger
- add payment_method varchar(255) null;
-
-
-alter table payment_registration
- modify sale_ledger_id bigint default 0 null comment '閿�鍞彴璐d';
-
-
-alter table ticket_registration
- add enter_date timestamp null;
-
-alter table product_record
- add 鍒梍name int null comment 'sale_ledger_projectI_id';
-
-# 娣诲姞璁惧鍚嶇О鍜岃鏍煎瀷鍙�
-ALTER TABLE `product-inventory-management`.`device_repair`
- ADD COLUMN `device_name` varchar(255) NULL AFTER `tenant_id`,
- ADD COLUMN `device_model` varchar(255) NULL AFTER `device_name`;
-
-ALTER TABLE `product-inventory-management`.`device_maintenance`
- ADD COLUMN `device_name` varchar(255) NULL AFTER `tenant_id`,
- ADD COLUMN `device_model` varchar(255) NULL AFTER `device_name`;
-
-
-
-DROP TABLE IF EXISTS storage_attachment;
-CREATE TABLE storage_attachment (
- id BIGINT AUTO_INCREMENT PRIMARY KEY,
- create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
- update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
- deleted BIGINT DEFAULT 0 NOT NULL,
- record_type SMALLINT DEFAULT 0 NOT NULL,
- record_id BIGINT DEFAULT 0 NOT NULL,
- name VARCHAR(100) DEFAULT '' NOT NULL,
- storage_blob_id BIGINT DEFAULT 0 NOT NULL
-) COMMENT='閫氱敤鏂囦欢涓婁紶鐨勯檮浠朵俊鎭�';
-
-ALTER TABLE storage_attachment
- COMMENT '閫氱敤鏂囦欢涓婁紶鐨勯檮浠朵俊鎭�';
-
-ALTER TABLE storage_attachment MODIFY record_type SMALLINT COMMENT '鍏宠仈鐨勮褰曠被鍨�';
-ALTER TABLE storage_attachment MODIFY record_id BIGINT COMMENT '鍏宠仈鐨勮褰昳d';
-ALTER TABLE storage_attachment MODIFY name VARCHAR(100) COMMENT '鍚嶇О, 濡�: file, avatar (鍖哄垎鍚屼竴鏉¤褰曚笉鍚岀被鍨嬬殑闄勪欢)';
-ALTER TABLE storage_attachment MODIFY storage_blob_id BIGINT COMMENT '鍏宠仈storage_blob璁板綍id';
-
-CREATE INDEX idx_storage_attachment_on_record
- ON storage_attachment (record_type, record_id);
-
-
-CREATE TABLE storage_blob (
- id BIGINT AUTO_INCREMENT PRIMARY KEY,
- create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
- key_name VARCHAR(150) DEFAULT '' NOT NULL,
- content_type VARCHAR(100) DEFAULT '' NOT NULL,
- original_filename VARCHAR(255) DEFAULT '' NOT NULL,
- bucket_filename VARCHAR(255) DEFAULT '' NOT NULL,
- bucket_name VARCHAR(255) DEFAULT '' NOT NULL,
- byte_size BIGINT DEFAULT 0 NOT NULL,
- UNIQUE (key_name)
-) COMMENT='閫氱敤鏂囦欢涓婁紶鐨勯檮浠朵俊鎭�';
-
-ALTER TABLE storage_blob
- COMMENT '閫氱敤鏂囦欢涓婁紶鐨勯檮浠朵俊鎭�';
-
-ALTER TABLE storage_blob MODIFY key_name VARCHAR(150) COMMENT '璧勬簮id';
-ALTER TABLE storage_blob MODIFY content_type VARCHAR(100) COMMENT '璧勬簮绫诲瀷锛屼緥濡侸PG鍥剧墖鐨勮祫婧愮被鍨嬩负image/jpg';
-ALTER TABLE storage_blob MODIFY original_filename VARCHAR(255) COMMENT '鍘熸枃浠跺悕绉�';
-ALTER TABLE storage_blob MODIFY bucket_filename VARCHAR(255) COMMENT '瀛樺偍妗朵腑鏂囦欢鍚�';
-ALTER TABLE storage_blob MODIFY bucket_name VARCHAR(255) COMMENT '瀛樺偍妗跺悕';
-ALTER TABLE storage_blob MODIFY byte_size BIGINT COMMENT '璧勬簮灏哄(瀛楄妭)';
diff --git "a/$\173project.build.directory\175/classes/i18n/messages.properties" "b/$\173project.build.directory\175/classes/i18n/messages.properties"
deleted file mode 100644
index 93de005..0000000
--- "a/$\173project.build.directory\175/classes/i18n/messages.properties"
+++ /dev/null
@@ -1,38 +0,0 @@
-#閿欒娑堟伅
-not.null=* 蹇呴』濉啓
-user.jcaptcha.error=楠岃瘉鐮侀敊璇�
-user.jcaptcha.expire=楠岃瘉鐮佸凡澶辨晥
-user.not.exists=鐢ㄦ埛涓嶅瓨鍦�/瀵嗙爜閿欒
-user.password.not.match=鐢ㄦ埛涓嶅瓨鍦�/瀵嗙爜閿欒
-user.password.retry.limit.count=瀵嗙爜杈撳叆閿欒{0}娆�
-user.password.retry.limit.exceed=瀵嗙爜杈撳叆閿欒{0}娆★紝甯愭埛閿佸畾{1}鍒嗛挓
-user.password.delete=瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿宸茶鍒犻櫎
-user.blocked=鐢ㄦ埛宸插皝绂侊紝璇疯仈绯荤鐞嗗憳
-role.blocked=瑙掕壊宸插皝绂侊紝璇疯仈绯荤鐞嗗憳
-login.blocked=寰堥仐鎲撅紝璁块棶IP宸茶鍒楀叆绯荤粺榛戝悕鍗�
-user.logout.success=閫�鍑烘垚鍔�
-
-length.not.valid=闀垮害蹇呴』鍦▄min}鍒皗max}涓瓧绗︿箣闂�
-
-user.username.not.valid=* 2鍒�20涓眽瀛椼�佸瓧姣嶃�佹暟瀛楁垨涓嬪垝绾跨粍鎴愶紝涓斿繀椤讳互闈炴暟瀛楀紑澶�
-user.password.not.valid=* 5-50涓瓧绗�
-
-user.email.not.valid=閭鏍煎紡閿欒
-user.mobile.phone.number.not.valid=鎵嬫満鍙锋牸寮忛敊璇�
-user.login.success=鐧诲綍鎴愬姛
-user.register.success=娉ㄥ唽鎴愬姛
-user.notfound=璇烽噸鏂扮櫥褰�
-user.forcelogout=绠＄悊鍛樺己鍒堕��鍑猴紝璇烽噸鏂扮櫥褰�
-user.unknown.error=鏈煡閿欒锛岃閲嶆柊鐧诲綍
-
-##鏂囦欢涓婁紶娑堟伅
-upload.exceed.maxSize=涓婁紶鐨勬枃浠跺ぇ灏忚秴鍑洪檺鍒剁殑鏂囦欢澶у皬锛�<br/>鍏佽鐨勬枃浠舵渶澶уぇ灏忔槸锛歿0}MB锛�
-upload.filename.exceed.length=涓婁紶鐨勬枃浠跺悕鏈�闀縶0}涓瓧绗�
-
-##鏉冮檺
-no.permission=鎮ㄦ病鏈夋暟鎹殑鏉冮檺锛岃鑱旂郴绠＄悊鍛樻坊鍔犳潈闄� [{0}]
-no.create.permission=鎮ㄦ病鏈夊垱寤烘暟鎹殑鏉冮檺锛岃鑱旂郴绠＄悊鍛樻坊鍔犳潈闄� [{0}]
-no.update.permission=鎮ㄦ病鏈変慨鏀规暟鎹殑鏉冮檺锛岃鑱旂郴绠＄悊鍛樻坊鍔犳潈闄� [{0}]
-no.delete.permission=鎮ㄦ病鏈夊垹闄ゆ暟鎹殑鏉冮檺锛岃鑱旂郴绠＄悊鍛樻坊鍔犳潈闄� [{0}]
-no.export.permission=鎮ㄦ病鏈夊鍑烘暟鎹殑鏉冮檺锛岃鑱旂郴绠＄悊鍛樻坊鍔犳潈闄� [{0}]
-no.view.permission=鎮ㄦ病鏈夋煡鐪嬫暟鎹殑鏉冮檺锛岃鑱旂郴绠＄悊鍛樻坊鍔犳潈闄� [{0}]
diff --git "a/$\173project.build.directory\175/classes/logback.xml" "b/$\173project.build.directory\175/classes/logback.xml"
deleted file mode 100644
index a360583..0000000
--- "a/$\173project.build.directory\175/classes/logback.xml"
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
- <!-- 鏃ュ織瀛樻斁璺緞 -->
- <property name="log.path" value="/home/ruoyi/logs" />
- <!-- 鏃ュ織杈撳嚭鏍煎紡 -->
- <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
-
- <!-- 鎺у埗鍙拌緭鍑� -->
- <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- </appender>
-
- <!-- 绯荤粺鏃ュ織杈撳嚭 -->
- <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-info.log</file>
- <!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
- <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <!-- 杩囨护鐨勭骇鍒� -->
- <level>INFO</level>
- <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
- <onMatch>ACCEPT</onMatch>
- <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
- <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-error.log</file>
- <!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
- <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <!-- 杩囨护鐨勭骇鍒� -->
- <level>ERROR</level>
- <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
- <onMatch>ACCEPT</onMatch>
- <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
- <!-- 鐢ㄦ埛璁块棶鏃ュ織杈撳嚭 -->
- <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-user.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鎸夊ぉ鍥炴粴 daily -->
- <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- </appender>
-
- <!-- 绯荤粺妯″潡鏃ュ織绾у埆鎺у埗 -->
- <logger name="com.ruoyi" level="info" />
- <!-- Spring鏃ュ織绾у埆鎺у埗 -->
- <logger name="org.springframework" level="warn" />
-
- <root level="info">
- <appender-ref ref="console" />
- </root>
-
- <!--绯荤粺鎿嶄綔鏃ュ織-->
- <root level="info">
- <appender-ref ref="file_info" />
- <appender-ref ref="file_error" />
- </root>
-
- <!--绯荤粺鐢ㄦ埛鎿嶄綔鏃ュ織-->
- <logger name="sys-user" level="info">
- <appender-ref ref="sys-user"/>
- </logger>
-</configuration>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/account/AccountExpenseMapper.xml" "b/$\173project.build.directory\175/classes/mapper/account/AccountExpenseMapper.xml"
deleted file mode 100644
index fff6020..0000000
--- "a/$\173project.build.directory\175/classes/mapper/account/AccountExpenseMapper.xml"
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.account.mapper.AccountExpenseMapper">
- <select id="accountExpenseListPage" resultType="com.ruoyi.account.pojo.AccountExpense">
- SELECT
- *
- FROM account_expense
- where
- 1=1
- <if test="accountExpense.entryDateStart != null and accountExpense.entryDateStart != '' ">
- AND expense_date >= DATE_FORMAT(#{accountExpense.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="accountExpense.entryDateEnd != null and accountExpense.entryDateEnd != '' ">
- AND expense_date <= DATE_FORMAT(#{accountExpense.entryDateEnd},'%Y-%m-%d')
- </if>
- <if test="accountExpense.expenseType != null and accountExpense.expenseType != '' ">
- AND expense_type = #{accountExpense.expenseType}
- </if>
- <if test="accountExpense.expenseMethod != null and accountExpense.expenseMethod != '' ">
- AND expense_method = #{accountExpense.expenseMethod}
- </if>
- </select>
- <select id="accountExpenseExport" resultType="com.ruoyi.account.pojo.AccountExpense">
- SELECT
- *
- FROM account_expense
- where
- 1=1
- <if test="accountExpense.entryDateStart != null and accountExpense.entryDateStart != '' ">
- AND expense_date >= DATE_FORMAT(#{accountExpense.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="accountExpense.entryDateEnd != null and accountExpense.entryDateEnd != '' ">
- AND expense_date <= DATE_FORMAT(#{accountExpense.entryDateEnd},'%Y-%m-%d')
- </if>
- <if test="accountExpense.expenseType != null and accountExpense.expenseType != '' ">
- AND expense_type = #{accountExpense.expenseType}
- </if>
- <if test="accountExpense.expenseMethod != null and accountExpense.expenseMethod != '' ">
- AND expense_method = #{accountExpense.expenseMethod}
- </if>
- </select>
- <select id="report" resultType="com.ruoyi.account.dto.AccountDto2">
- SELECT
- sdd.dict_label typeName,
- sum(expense_money) account
- FROM account_expense ae
- left join sys_dict_data sdd on ae.expense_type = sdd.dict_value and sdd.dict_type='expense_types'
- where
- 1=1
- <if test="dateQueryDto.entryDateStart != null and dateQueryDto.entryDateStart != '' ">
- AND expense_date >= DATE_FORMAT(#{dateQueryDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
- AND expense_date <= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
- </if>
- group by expense_type
- </select>
-
- <select id="report1" resultType="java.math.BigDecimal">
- SELECT
- sum(expense_money) account
- FROM account_expense ai
- where
- expense_type=#{dictValue}
- <if test="dateQueryDto.entryDateStart != null and dateQueryDto.entryDateStart != '' ">
- AND expense_date >= DATE_FORMAT(#{dateQueryDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
- AND expense_date <= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/account/AccountFileMapper.xml" "b/$\173project.build.directory\175/classes/mapper/account/AccountFileMapper.xml"
deleted file mode 100644
index 86266d5..0000000
--- "a/$\173project.build.directory\175/classes/mapper/account/AccountFileMapper.xml"
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.account.mapper.AccountFileMapper">
- <select id="accountFileListPage" resultType="com.ruoyi.account.pojo.AccountFile">
- SELECT
- *
- FROM account_file
- where
- 1=1
- <if test="accountFile.accountId != null and accountFile.accountId != ''">
- AND account_id = #{accountFile.accountId}
- </if>
- <if test="accountFile.name != null and accountFile.name != '' ">
- AND name = #{accountFile.name}
- </if>
- <if test="accountFile.accountType != null and accountFile.accountType != '' ">
- AND account_type = #{accountFile.accountType}
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/account/AccountIncomeMapper.xml" "b/$\173project.build.directory\175/classes/mapper/account/AccountIncomeMapper.xml"
deleted file mode 100644
index 1cb49b9..0000000
--- "a/$\173project.build.directory\175/classes/mapper/account/AccountIncomeMapper.xml"
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.account.mapper.AccountIncomeMapper">
-
- <select id="accountIncomeListPage" resultType="com.ruoyi.account.pojo.AccountIncome">
- SELECT
- *
- FROM account_income
- where
- 1=1
- <if test="accountIncome.entryDateStart != null and accountIncome.entryDateStart != '' ">
- AND income_date >= DATE_FORMAT(#{accountIncome.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="accountIncome.entryDateEnd != null and accountIncome.entryDateEnd != '' ">
- AND income_date <= DATE_FORMAT(#{accountIncome.entryDateEnd},'%Y-%m-%d')
- </if>
- <if test="accountIncome.incomeType != null and accountIncome.incomeType != '' ">
- AND income_type = #{accountIncome.incomeType}
- </if>
- <if test="accountIncome.incomeMethod != null and accountIncome.incomeMethod != '' ">
- AND income_method = #{accountIncome.incomeMethod}
- </if>
- </select>
- <select id="accountIncomeExport" resultType="com.ruoyi.account.pojo.AccountIncome">
- SELECT
- *
- FROM account_income
- where
- 1=1
- <if test="accountIncome.entryDateStart != null and accountIncome.entryDateStart != '' ">
- AND income_date >= DATE_FORMAT(#{accountIncome.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="accountIncome.entryDateEnd != null and accountIncome.entryDateEnd != '' ">
- AND income_date <= DATE_FORMAT(#{accountIncome.entryDateEnd},'%Y-%m-%d')
- </if>
- <if test="accountIncome.incomeType != null and accountIncome.incomeType != '' ">
- AND income_type = #{accountIncome.incomeType}
- </if>
- <if test="accountIncome.incomeMethod != null and accountIncome.incomeMethod != '' ">
- AND income_method = #{accountIncome.incomeMethod}
- </if>
- </select>
- <select id="report" resultType="com.ruoyi.account.dto.AccountDto2">
- SELECT
- sdd.dict_label typeName,
- sum(income_money) account
- FROM account_income ai
- left join sys_dict_data sdd on ai.income_type = sdd.dict_value and sdd.dict_type='income_types'
- where
- 1=1
- <if test="dateQueryDto.entryDateStart != null and dateQueryDto.entryDateStart != '' ">
- AND income_date >= DATE_FORMAT(#{dateQueryDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
- AND income_date <= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
- </if>
- group by income_type
- </select>
- <select id="report1" resultType="java.math.BigDecimal">
- SELECT
- sum(income_money) account
- FROM account_income ai
- where
- income_type=#{dictValue}
- <if test="dateQueryDto.entryDateStart != null and dateQueryDto.entryDateStart != '' ">
- AND income_date >= DATE_FORMAT(#{dateQueryDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
- AND income_date <= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/aftersalesservice/AfterSalesServiceMapper.xml" "b/$\173project.build.directory\175/classes/mapper/aftersalesservice/AfterSalesServiceMapper.xml"
deleted file mode 100644
index 41cd6ca..0000000
--- "a/$\173project.build.directory\175/classes/mapper/aftersalesservice/AfterSalesServiceMapper.xml"
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.aftersalesservice.mapper.AfterSalesServiceMapper">
-
- <select id="listPage" resultType="com.ruoyi.aftersalesservice.pojo.AfterSalesService">
- select * from after_sales_service
- where 1 = 1
- <if test="req.feedbackDate != null">
- AND feedback_date BETWEEN #{req.feedbackDate} AND #{req.feedbackDate}
- </if>
- <if test="req.disDate != null">
- AND dis_date BETWEEN #{req.disDate} AND #{req.disDate}
- </if>
- <if test="req.tenantId != null and req.tenantId != ''">
- and tenant_id = #{req.tenantId}
- </if>
- <if test="req.status != null and req.status != ''">
- and status = #{req.status}
- </if>
- order by update_time desc
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/approve/AnnualLeaveSettingMapper.xml" "b/$\173project.build.directory\175/classes/mapper/approve/AnnualLeaveSettingMapper.xml"
deleted file mode 100644
index 39fcb3f..0000000
--- "a/$\173project.build.directory\175/classes/mapper/approve/AnnualLeaveSettingMapper.xml"
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.AnnualLeaveSettingMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.approve.pojo.AnnualLeaveSetting">
- select * from annual_leave_setting
- where 1=1
- <if test="annualLeaveSetting.employeeType != null">
- and employee_type = #{annualLeaveSetting.employeeType}
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/approve/ApproveLogMapper.xml" "b/$\173project.build.directory\175/classes/mapper/approve/ApproveLogMapper.xml"
deleted file mode 100644
index e47dbbc..0000000
--- "a/$\173project.build.directory\175/classes/mapper/approve/ApproveLogMapper.xml"
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.ApproveLogMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.approve.pojo.ApproveLog">
- <id property="id" column="id" />
- <result property="approveId" column="approve_id" />
- <result property="approveNodeOrder" column="approve_node_order" />
- <result property="approveUser" column="approve_user" />
- <result property="approveTime" column="approve_time" />
- <result property="approveStatus" column="approve_status" />
- <result property="approveRemark" column="approve_remark" />
- </resultMap>
-
- <sql id="Base_Column_List">
- id,approve_id,approve_node_order,approve_user,approve_time,approve_status,
- approve_remark
- </sql>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/approve/ApproveNodeMapper.xml" "b/$\173project.build.directory\175/classes/mapper/approve/ApproveNodeMapper.xml"
deleted file mode 100644
index d5863ed..0000000
--- "a/$\173project.build.directory\175/classes/mapper/approve/ApproveNodeMapper.xml"
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.ApproveNodeMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.approve.pojo.ApproveNode">
- <id property="id" column="id" />
- <result property="approveProcessId" column="approve_process_id" />
- <result property="approveNodeOrder" column="approve_node_order" />
- <result property="approveNodeUser" column="approve_node_user" />
- <result property="approveNodeTime" column="approve_node_time" />
- <result property="approveNodeStatus" column="approve_node_status" />
- <result property="tenantId" column="tenant_id" />
- <result property="deleteFlag" column="delete_flag" />
- <result property="approveNodeReason" column="approve_node_reason" />
- <result property="approveNodeRemark" column="approve_node_remark" />
- </resultMap>
-
- <sql id="Base_Column_List">
- id,approve_process_id,approve_node_order,approve_node_user,approve_node_time,approve_node_status,
- tenant_id,delete_flag,approve_node_reason,approve_node_remark
- </sql>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/approve/ApproveProcessMapper.xml" "b/$\173project.build.directory\175/classes/mapper/approve/ApproveProcessMapper.xml"
deleted file mode 100644
index 33b29a9..0000000
--- "a/$\173project.build.directory\175/classes/mapper/approve/ApproveProcessMapper.xml"
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.ApproveProcessMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.approve.pojo.ApproveProcess">
- <id property="id" column="id" />
- <result property="approveId" column="approve_id" />
- <result property="approveUser" column="approve_user" />
- <result property="approveDeptId" column="approve_dept_id" />
- <result property="approveDeptName" column="approve_dept_name" />
- <result property="approveUserIds" column="approve_user_ids" />
- <result property="approveUserNames" column="approve_user_names" />
- <result property="approveReason" column="approve_reason" />
- <result property="approveTime" column="approve_time" />
- <result property="approveOverTime" column="approve_over_time" />
- <result property="approveStatus" column="approve_status" />
- <result property="approveDelete" column="approve_delete" />
- <result property="tenantId" column="tenant_id" />
- <result property="approveType" column="approve_type" />
- <result property="approveRemark" column="approve_remark" />
- </resultMap>
-
- <sql id="Base_Column_List">
- id,approve_id,approve_user,approve_dept_id,approve_dept_name,approve_user_ids,
- approve_user_names,approve_reason,approve_time,approve_over_time,approve_status,
- approve_delete,tenant_id,approve_type,approve_remark
- </sql>
- <select id="listPage" resultType="com.ruoyi.approve.pojo.ApproveProcess">
- select * from approve_process where approve_delete = 0
- <if test="req.approveId != null and req.approveId != ''">
- and approve_id like concat('%',#{req.approveId},'%')
- </if>
- <if test="req.approveStatus != null or req.approveStatus == 0">
- and approve_status = #{req.approveStatus}
- </if>
- <if test="req.approveType != null ">
- and approve_type = #{req.approveType}
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/approve/FileSharingMapper.xml" "b/$\173project.build.directory\175/classes/mapper/approve/FileSharingMapper.xml"
deleted file mode 100644
index cd62025..0000000
--- "a/$\173project.build.directory\175/classes/mapper/approve/FileSharingMapper.xml"
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.FileSharingMapper">
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/approve/HolidaySettingsMapper.xml" "b/$\173project.build.directory\175/classes/mapper/approve/HolidaySettingsMapper.xml"
deleted file mode 100644
index ac5f19e..0000000
--- "a/$\173project.build.directory\175/classes/mapper/approve/HolidaySettingsMapper.xml"
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.HolidaySettingsMapper">
-
- <select id="listpage" resultType="com.ruoyi.approve.pojo.HolidaySettings">
- select * from holiday_settings
- where 1=1
- <if test="holidaySettings.type != null">
- and type = #{holidaySettings.type}
- </if>
- <if test="holidaySettings.name != null">
- and name like concat('%',#{holidaySettings.name},'%')
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/approve/KnowledgeBaseMapper.xml" "b/$\173project.build.directory\175/classes/mapper/approve/KnowledgeBaseMapper.xml"
deleted file mode 100644
index e4819c2..0000000
--- "a/$\173project.build.directory\175/classes/mapper/approve/KnowledgeBaseMapper.xml"
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.KnowledgeBaseMapper">
-
-
- <select id="listpage" resultType="com.ruoyi.approve.pojo.KnowledgeBase">
- select * from knowledge_base
- <where>
- 1=1
- <if test="knowledgeBase.title != null and knowledgeBase.title != ''">
- and title like concat('%',#{knowledgeBase.title},'%')
- </if>
- <if test="knowledgeBase.type != null and knowledgeBase.type != ''">
- and type = #{knowledgeBase.type}
- </if>
- </where>
-
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/approve/NotificationManagementMapper.xml" "b/$\173project.build.directory\175/classes/mapper/approve/NotificationManagementMapper.xml"
deleted file mode 100644
index a2e714f..0000000
--- "a/$\173project.build.directory\175/classes/mapper/approve/NotificationManagementMapper.xml"
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.NotificationManagementMapper">
-
- <select id="listpage" resultType="com.ruoyi.approve.pojo.NotificationManagement">
- select * from notification_management
- <where>
- 1=1
- <if test="notificationManagement.title != null and notificationManagement.title != ''">
- and title like concat('%',#{notificationManagement.title},'%')
- </if>
- <if test="notificationManagement.type != null">
- and type = #{notificationManagement.type}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/approve/OnlineMeetingMapper.xml" "b/$\173project.build.directory\175/classes/mapper/approve/OnlineMeetingMapper.xml"
deleted file mode 100644
index 5ce6d5d..0000000
--- "a/$\173project.build.directory\175/classes/mapper/approve/OnlineMeetingMapper.xml"
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.OnlineMeetingMapper">
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/approve/OvertimeSettingMapper.xml" "b/$\173project.build.directory\175/classes/mapper/approve/OvertimeSettingMapper.xml"
deleted file mode 100644
index b496353..0000000
--- "a/$\173project.build.directory\175/classes/mapper/approve/OvertimeSettingMapper.xml"
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.OvertimeSettingMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.approve.pojo.OvertimeSetting">
- select * from overtime_setting
- where 1=1
- <if test="overtimeSetting.type != null">
- and type = #{overtimeSetting.type}
- </if>
- <if test="overtimeSetting.name != null and overtimeSetting.name !=''">
- and name like concat('%',#{overtimeSetting.name},'%')
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/approve/RpaProcessAutomationMapper.xml" "b/$\173project.build.directory\175/classes/mapper/approve/RpaProcessAutomationMapper.xml"
deleted file mode 100644
index 4471d61..0000000
--- "a/$\173project.build.directory\175/classes/mapper/approve/RpaProcessAutomationMapper.xml"
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.RpaProcessAutomationMapper">
-
- <select id="listpage" resultType="com.ruoyi.approve.pojo.RpaProcessAutomation">
- select * from rpa_process_automation
- <where>
- 1=1
- <if test="rpaProcessAutomation.programName != null and rpaProcessAutomation.programName != ''">
- and program_name like concat('%',#{rpaProcessAutomation.programName},'%')
- </if>
- <if test="rpaProcessAutomation.status != null">
- and status = #{rpaProcessAutomation.status}
- </if>
- </where>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/approve/WorkingHoursSettingMapper.xml" "b/$\173project.build.directory\175/classes/mapper/approve/WorkingHoursSettingMapper.xml"
deleted file mode 100644
index 63bc1c3..0000000
--- "a/$\173project.build.directory\175/classes/mapper/approve/WorkingHoursSettingMapper.xml"
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.WorkingHoursSettingMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.approve.pojo.WorkingHoursSetting">
- select * from working_hours_setting
- where 1=1
- <if test="workingHoursSetting.name != null and workingHoursSetting.name !=''">
- and name like concat('%',#{workingHoursSetting.name},'%')
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/basic/StorageAttachmentMapper.xml" "b/$\173project.build.directory\175/classes/mapper/basic/StorageAttachmentMapper.xml"
deleted file mode 100644
index a2cc6cf..0000000
--- "a/$\173project.build.directory\175/classes/mapper/basic/StorageAttachmentMapper.xml"
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.basic.mapper.StorageAttachmentMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StorageAttachment">
- <id column="id" property="id" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="deleted" property="deleted" />
- <result column="record_type" property="recordType" />
- <result column="record_id" property="recordId" />
- <result column="name" property="name" />
- <result column="storage_blob_id" property="storageBlobId" />
- </resultMap>
-
- <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
- <sql id="Base_Column_List">
- id, create_time, update_time, deleted, record_type, record_id, name, storage_blob_id
- </sql>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/basic/StorageBlobMapper.xml" "b/$\173project.build.directory\175/classes/mapper/basic/StorageBlobMapper.xml"
deleted file mode 100644
index 84e3b00..0000000
--- "a/$\173project.build.directory\175/classes/mapper/basic/StorageBlobMapper.xml"
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.basic.mapper.StorageBlobMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StorageBlob">
- <id column="id" property="id" />
- <result column="create_time" property="createTime" />
- <result column="key" property="key" />
- <result column="content_type" property="contentType" />
- <result column="original_filename" property="originalFilename" />
- <result column="bucket_filename" property="bucketFilename" />
- <result column="bucket_name" property="bucketName" />
- <result column="byte_size" property="byteSize" />
- </resultMap>
-
- <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
- <sql id="Base_Column_List">
- id, create_time, key, content_type, original_filename,bucket_filename,bucket_name, byte_size
- </sql>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/basic/SupplierManageMapper.xml" "b/$\173project.build.directory\175/classes/mapper/basic/SupplierManageMapper.xml"
deleted file mode 100644
index 9e65903..0000000
--- "a/$\173project.build.directory\175/classes/mapper/basic/SupplierManageMapper.xml"
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.basic.mapper.SupplierManageMapper">
-
- <select id="supplierListPage" resultType="com.ruoyi.basic.dto.SupplierManageDto">
- SELECT
- T1.id,
- T1.supplier_name,
- T1.taxpayer_identification_num,
- T1.company_address,
- T1.company_phone,
- T1.bank_account_name,
- T1.bank_account_num,
- T1.contact_user_name,
- T1.contact_user_phone,
- T1.maintain_user_id,
- T1.maintain_time,
- T1.create_time,
- T1.create_user,
- T1.update_time,
- T1.update_user,
- T1.tenant_id,
- T2.nick_name AS maintainUserName
- FROM supplier_manage T1
- LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
- <where>
- <if test="supplierManageDto.supplierName != null and supplierManageDto.supplierName != '' ">
- AND T1.supplier_name LIKE CONCAT('%',#{supplierManageDto.supplierName},'%')
- </if>
- </where>
- </select>
-
- <select id="supplierExportList" resultType="com.ruoyi.basic.excel.SupplierManageExcelDto">
- SELECT
- T1.id,
- T1.supplier_name,
- T1.taxpayer_identification_num,
- T1.company_address,
- T1.company_phone,
- T1.bank_account_name,
- T1.bank_account_num,
- T1.contact_user_name,
- T1.contact_user_phone,
- T1.maintain_user_id,
- T1.maintain_time,
- T1.create_time,
- T1.create_user,
- T1.update_time,
- T1.update_user,
- T1.tenant_id,
- T2.nick_name AS maintainUserName
- FROM supplier_manage T1
- LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
- <where>
- <if test="supplierManageDto.supplierName != null and supplierManageDto.supplierName != '' ">
- AND T1.supplier_name LIKE CONCAT('%',#{supplierManageDto.supplierName},'%')
- </if>
- </where>
- </select>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/DutyPlanMapper.xml" "b/$\173project.build.directory\175/classes/mapper/collaborativeApproval/DutyPlanMapper.xml"
deleted file mode 100644
index 6c1679d..0000000
--- "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/DutyPlanMapper.xml"
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.DutyPlanMapper">
- <resultMap id="DutyPlanDTOMap" type="com.ruoyi.collaborativeApproval.dto.DutyPlanDTO">
- <result column="id" property="id"/>
- <result column="tags" property="tags" typeHandler="com.ruoyi.approve.utils.ListToStringTypeHandler"/>
- </resultMap>
-
- <select id="listPage" resultMap="DutyPlanDTOMap">
- select * from duty_plan
- <where>
- 1=1
- <if test="dutyPlan.title != null and dutyPlan.title != ''">
- and title like concat('%',#{dutyPlan.title},'%')
- </if>
- <if test="dutyPlan.level != null">
- and level = #{dutyPlan.level}
- </if>
- <if test="dutyPlan.period != null">
- and period = #{dutyPlan.period}
- </if>
- <if test="dutyPlan.queryDate != null">
- and start_date <= #{dutyPlan.queryDate}
- and end_date >= #{dutyPlan.queryDate}
- </if>
- </where>
- </select>
-
- <select id="getNum" resultType="java.util.Map">
- SELECT
- level,
- COUNT(*) AS num,
- ROUND(COUNT(*) / total.count * 100) AS completion
- FROM
- duty_plan,
- (SELECT COUNT(*) AS count FROM duty_plan) AS total
- GROUP BY
- level, total.count
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/MeetApplicationMapper.xml" "b/$\173project.build.directory\175/classes/mapper/collaborativeApproval/MeetApplicationMapper.xml"
deleted file mode 100644
index a195317..0000000
--- "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/MeetApplicationMapper.xml"
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.MeetApplicationMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.collaborativeApproval.pojo.MeetApplication">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="title" column="title" jdbcType="VARCHAR"/>
- <result property="type" column="type" jdbcType="VARCHAR"/>
- <result property="roomId" column="room_id" jdbcType="BIGINT"/>
- <result property="host" column="host" jdbcType="VARCHAR"/>
- <result property="meetingDate" column="meeting_date" jdbcType="DATE"/>
- <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
- <result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
- <result property="participants" column="participants" jdbcType="VARCHAR"/>
- <result property="description" column="description" jdbcType="VARCHAR"/>
- <result property="applicationType" column="application_type" jdbcType="VARCHAR"/>
- <result property="status" column="status" jdbcType="TINYINT"/>
- <result property="applicant" column="applicant" jdbcType="VARCHAR"/>
- <result property="createUser" column="create_user" jdbcType="BIGINT"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id,title,type,
- room_id,host,meeting_date,
- start_time,end_time,participants,
- description,application_type,status,
- applicant,create_user,create_time,
- update_user,update_time,tenant_id
- </sql>
- <select id="getMeetSummary" resultType="com.ruoyi.collaborativeApproval.dto.MeetSummaryDto">
- SELECT
- COUNT(*) AS total,
- SUM(CASE
- WHEN meeting_date = CURDATE() AND start_time <![CDATA[<=]]> NOW() AND end_time <![CDATA[>]]> NOW()
- THEN 1 ELSE 0
- END) AS underWay,
- SUM(CASE
- WHEN (meeting_date <![CDATA[<]]> CURDATE() OR (meeting_date = CURDATE() AND end_time <![CDATA[<=]]> NOW()))
- THEN 1 ELSE 0
- END) AS completed,
- SUM(CASE
- WHEN meeting_date <![CDATA[>=]]> CURDATE() AND start_time <![CDATA[>]]> NOW()
- THEN 1 ELSE 0
- END) AS toStart
- FROM meet_application as t1
- where status = 1 OR application_type='notification'
- </select>
- <select id="getMeetSummaryItems" resultType="com.ruoyi.collaborativeApproval.dto.MeetingSimpleDto">
- select t1.id as id,
- t1.title as title,
- (CASE
- WHEN t1.meeting_date = CURDATE() AND t1.start_time <![CDATA[<=]]> NOW() AND t1.end_time <![CDATA[>]]> NOW()
- THEN 2
- WHEN t1.meeting_date <![CDATA[>=]]> CURDATE() AND t1.start_time <![CDATA[>]]> NOW() then 1
- ELSE 0 end) as status,
- t1.start_time as start_time,
- t1.end_time as end_time,
- CONCAT(t2.name, '(', t2.location, ')') as location,
- t1.host as host,
- t1.participants as participants,
- t3.content as content
- from meet_application
- as t1
- left join meeting_room as t2 on t1.room_id = t2.id
- left join meeting_minutes as t3 on t1.id = t3.meeting_id
- where t1.status = 1
- OR t1.application_type = 'notification'
- order by (CASE
- WHEN t1.meeting_date = CURDATE() AND t1.start_time <![CDATA[<=]]> NOW() AND t1.end_time <![CDATA[>]]> NOW()
- THEN 2
- WHEN t1.meeting_date <![CDATA[>=]]> CURDATE() AND t1.start_time > NOW() then 1
- ELSE 0 end) desc, t1.end_time desc
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/MeetDraftMapper.xml" "b/$\173project.build.directory\175/classes/mapper/collaborativeApproval/MeetDraftMapper.xml"
deleted file mode 100644
index 3b2c86a..0000000
--- "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/MeetDraftMapper.xml"
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.MeetDraftMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.collaborativeApproval.pojo.MeetDraft">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="roomId" column="room_id" jdbcType="BIGINT"/>
- <result property="title" column="title" jdbcType="VARCHAR"/>
- <result property="host" column="host" jdbcType="VARCHAR"/>
- <result property="meetingDate" column="meeting_date" jdbcType="DATE"/>
- <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
- <result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
- <result property="participants" column="participants" jdbcType="INTEGER"/>
- <result property="participantList" column="participant_list" jdbcType="VARCHAR"/>
- <result property="description" column="description" jdbcType="VARCHAR"/>
- <result property="creator" column="creator" jdbcType="VARCHAR"/>
- <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id,room_id,title,
- host,meeting_date,start_time,
- end_time,participants,participant_list,
- description,creator,create_user,
- create_time,update_user,update_time,
- tenant_id
- </sql>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/MeetingMinutesMapper.xml" "b/$\173project.build.directory\175/classes/mapper/collaborativeApproval/MeetingMinutesMapper.xml"
deleted file mode 100644
index 5904e3a..0000000
--- "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/MeetingMinutesMapper.xml"
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.MeetingMinutesMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.collaborativeApproval.pojo.MeetingMinutes">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="meetingId" column="meeting_id" jdbcType="BIGINT"/>
- <result property="title" column="title" jdbcType="VARCHAR"/>
- <result property="content" column="content" jdbcType="VARCHAR"/>
- <result property="createUser" column="create_user" jdbcType="BIGINT"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id,meeting_id,title,
- content,create_user,create_time,
- update_user,update_time,tenant_id
- </sql>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/MeetingRoomMapper.xml" "b/$\173project.build.directory\175/classes/mapper/collaborativeApproval/MeetingRoomMapper.xml"
deleted file mode 100644
index feac888..0000000
--- "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/MeetingRoomMapper.xml"
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.MeetingRoomMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.collaborativeApproval.pojo.MeetingRoom">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="name" column="name" jdbcType="VARCHAR"/>
- <result property="location" column="location" jdbcType="VARCHAR"/>
- <result property="capacity" column="capacity" jdbcType="INTEGER"/>
- <result property="equipment" column="equipment" jdbcType="VARCHAR"/>
- <result property="status" column="status" jdbcType="TINYINT"/>
- <result property="remark" column="remark" jdbcType="VARCHAR"/>
- <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id,name,location,
- capacity,equipment,status,
- remark,create_user,create_time,
- update_user,update_time,tenant_id
- </sql>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/NoticeMapper.xml" "b/$\173project.build.directory\175/classes/mapper/collaborativeApproval/NoticeMapper.xml"
deleted file mode 100644
index 5f646ad..0000000
--- "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/NoticeMapper.xml"
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.NoticeMapper">
-
- <select id="listPage" resultType="com.ruoyi.collaborativeApproval.dto.NoticeDTO">
- select n.*, su.user_name as create_user_name
- from notice n
- left join sys_user su on n.create_user = su.user_id
- <where>
- <if test="ew.title != null and ew.title != ''">
- and n.title like concat('%',#{ew.title},'%')
- </if>
- <if test="ew.type != null">
- and n.type = #{ew.type}
- </if>
- <if test="ew.status != null">
- and n.status = #{ew.status}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/ReadingStatusMapper.xml" "b/$\173project.build.directory\175/classes/mapper/collaborativeApproval/ReadingStatusMapper.xml"
deleted file mode 100644
index c61f17d..0000000
--- "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/ReadingStatusMapper.xml"
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.ReadingStatusMapper">
-
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml" "b/$\173project.build.directory\175/classes/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml"
deleted file mode 100644
index 03dc024..0000000
--- "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml"
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.RulesRegulationsManagementMapper">
- <resultMap id="RulesRegulationsManagementDTOMap" type="com.ruoyi.collaborativeApproval.dto.RulesRegulationsManagementDTO">
- <!-- 鍏朵粬瀛楁鏄犲皠锛堜繚鎸佷笉鍙橈級 -->
- <result column="id" property="id"/>
- <result column="regulation_num" property="regulationNum"/>
- <result column="title" property="title"/>
- <!-- ... 鐪佺暐鍏朵粬瀛楁 ... -->
-
- <!-- 鍏抽敭淇锛氫负 scope 瀛楁鎸囧畾绫诲瀷澶勭悊鍣� -->
- <result column="scope" property="scope" typeHandler="com.ruoyi.approve.utils.ListToStringTypeHandler"/>
- </resultMap>
-
- <select id="listPage" resultMap="RulesRegulationsManagementDTOMap">
- select rrm.*, su.user_name as create_user_name
- from rules_regulations_management rrm
- left join sys_user su on rrm.create_user = su.user_id
- <where>
- <if test="ew.regulationNum != null and ew.regulationNum != ''">
- and rrm.regulation_num = #{ew.regulationNum}
- </if>
- <if test="ew.title != null and ew.title != ''">
- and rrm.title like concat('%',#{ew.title},'%')
- </if>
- <if test="ew.category != null">
- and rrm.category = #{ew.category}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/SealApplicationManagementMapper.xml" "b/$\173project.build.directory\175/classes/mapper/collaborativeApproval/SealApplicationManagementMapper.xml"
deleted file mode 100644
index b8ad6a7..0000000
--- "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/SealApplicationManagementMapper.xml"
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.SealApplicationManagementMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.collaborativeApproval.dto.SealApplicationManagementDTO">
- select sam.*, su.user_name as create_user_name, d.dept_name as department
- from seal_application_management sam
- left join sys_user su on sam.create_user = su.user_id
- left join sys_user_dept sud on su.user_id = sud.user_id
- left join sys_dept d on sud.dept_id = d.dept_id
- <where>
- <if test="ew.title != null and ew.title != ''">
- and sam.title like concat('%',#{ew.title},'%')
- </if>
- <if test="ew.status != null">
- and sam.status = #{ew.status}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/StaffContactsPersonalMapper.xml" "b/$\173project.build.directory\175/classes/mapper/collaborativeApproval/StaffContactsPersonalMapper.xml"
deleted file mode 100644
index 36ce60d..0000000
--- "a/$\173project.build.directory\175/classes/mapper/collaborativeApproval/StaffContactsPersonalMapper.xml"
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.StaffContactsPersonalMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.collaborativeApproval.dto.StaffContactsPersonalDTO">
- SELECT
- scp.id,
- scp.contact_id,
- sjlr.staff_no,
- sjlr.staff_name,
- sjlr.sex,
- sjlr.post_job,
- sjlr.adress,
- sjlr.profession,
- sjlr.identity_card,
- sjlr.phone,
- scp.create_time
- FROM staff_contacts_personal scp
- LEFT JOIN (select * from staff_join_leave_record WHERE staff_state = 1) sjlr ON scp.contact_id=sjlr.id
- where 1=1
- <if test="staffContactsPersonalDTO.staffName != null and staffContactsPersonalDTO.staffName != ''">
- and sjlr.staff_name like concat('%',#{staffContactsPersonalDTO.staffName},'%')
- </if>
-
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/compensationperformance/CompensationPerformanceMapper.xml" "b/$\173project.build.directory\175/classes/mapper/compensationperformance/CompensationPerformanceMapper.xml"
deleted file mode 100644
index f15dd8c..0000000
--- "a/$\173project.build.directory\175/classes/mapper/compensationperformance/CompensationPerformanceMapper.xml"
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.compensationperformance.mapper.CompensationPerformanceMapper">
-
- <select id="listPage" resultType="com.ruoyi.compensationperformance.pojo.CompensationPerformance">
- select * from compensation_performance
- <where>
- <if test="req.name != null and req.name != ''">
- and `name` like concat('%',#{req.name},'%')
- </if>
- <if test="req.payDateStr != null and req.payDateStr != ''">
- and pay_date like concat('%',#{req.payDateStr},'%')
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/customervisits/CustomerVisitsMapper.xml" "b/$\173project.build.directory\175/classes/mapper/customervisits/CustomerVisitsMapper.xml"
deleted file mode 100644
index 92d44bd..0000000
--- "a/$\173project.build.directory\175/classes/mapper/customervisits/CustomerVisitsMapper.xml"
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.customervisits.mapper.CustomerVisitsMapper">
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/device/DeviceDefectRecordMapper.xml" "b/$\173project.build.directory\175/classes/mapper/device/DeviceDefectRecordMapper.xml"
deleted file mode 100644
index bcd4bd5..0000000
--- "a/$\173project.build.directory\175/classes/mapper/device/DeviceDefectRecordMapper.xml"
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.ruoyi.device.mapper.DeviceDefectRecordMapper">
-
- <select id="listPage" resultType="com.ruoyi.device.dto.DeviceDefectRecordDto">
- select ddr.*,dl.device_name,dl.device_model
- from device_defect_record ddr
- left join device_ledger dl on ddr.device_ledger_id = dl.id
- <where>
- 1=1
- <if test="deviceDefectRecordDto.deviceLedgerId != null">
- and ddr.device_ledger_id = #{deviceDefectRecordDto.deviceLedgerId}
- </if>
- <if test="deviceDefectRecordDto.deviceName != null and deviceDefectRecordDto.deviceName != ''">
- and dl.device_name like concat('%',#{deviceDefectRecordDto.deviceName},'%')
- </if>
- <if test="deviceDefectRecordDto.status != null">
- and ddr.status = #{deviceDefectRecordDto.status}
- </if>
- </where>
-
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/device/DeviceLedgerMapper.xml" "b/$\173project.build.directory\175/classes/mapper/device/DeviceLedgerMapper.xml"
deleted file mode 100644
index 9cee459..0000000
--- "a/$\173project.build.directory\175/classes/mapper/device/DeviceLedgerMapper.xml"
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.ruoyi.device.mapper.DeviceLedgerMapper">
-
- <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceLedgerDto">
- SELECT
- dl.id,
- dl.device_name,
- dl.device_model,
- dl.supplier_name,
- dl.unit,
- dl.number,
- dl.status,
- dl.plan_runtime_time,
- dl.start_runtime_time,
- dl.end_runtime_time,
- dl.runtime_duration,
- dl.tax_including_price_unit,
- dl.tax_including_price_total,
- dl.tax_rate,
- dl.un_tax_including_price_total,
- dl.create_time,
- dl.update_time ,
- su.user_name AS createUser,
- dl.update_user,
- dl.tenant_id
- FROM device_ledger dl
- left join sys_user su on dl.create_user = su.user_id
- <where>
- <!-- 璁惧鍚嶇О -->
- <if test="deviceLedger.deviceName != null and deviceLedger.deviceName != ''">
- AND device_name LIKE CONCAT('%', #{deviceLedger.deviceName}, '%')
- </if>
-
- <!-- 瑙勬牸鍨嬪彿 -->
- <if test="deviceLedger.deviceModel != null and deviceLedger.deviceModel != ''">
- AND device_model LIKE CONCAT('%', #{deviceLedger.deviceModel}, '%')
- </if>
-
- <!-- 渚涘簲鍟嗗悕绉� -->
- <if test="deviceLedger.supplierName != null and deviceLedger.supplierName != ''">
- AND supplier_name LIKE CONCAT('%', #{deviceLedger.supplierName}, '%')
- </if>
-
- <!-- 鍗曚綅 -->
- <if test="deviceLedger.unit != null and deviceLedger.unit != ''">
- AND unit = #{deviceLedger.unit}
- </if>
-
- <!-- 褰曞叆浜� -->
- <if test="deviceLedger.createUser != null and deviceLedger.createUser != ''">
- AND create_user LIKE CONCAT('%', #{deviceLedger.createUser}, '%')
- </if>
-
- <!-- 鏇存柊浜� -->
- <if test="deviceLedger.updateUser != null and deviceLedger.updateUser != ''">
- AND update_user LIKE CONCAT('%', #{deviceLedger.updateUser}, '%')
- </if>
-
- <if test="deviceLedger.entryDateStart != null and deviceLedger.entryDateStart != '' ">
- AND dl.create_time >= DATE_FORMAT(#{deviceLedger.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="deviceLedger.entryDateEnd != null and deviceLedger.entryDateEnd != '' ">
- AND dl.create_time <= DATE_FORMAT(#{deviceLedger.entryDateEnd},'%Y-%m-%d')
- </if>
-
- <!-- 绉熸埛ID -->
- <if test="deviceLedger.tenantId != null">
- AND tenant_id = #{deviceLedger.tenantId}
- </if>
- </where>
- ORDER BY create_time DESC
- </select>
- <select id="deviceLedgerExportList" resultType="com.ruoyi.device.execl.DeviceLedgerExeclDto">
-
- </select>
- <select id="selectById1" resultType="com.ruoyi.device.pojo.DeviceLedger">
- select *
- from device_ledger
- where id = #{id}
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/device/DeviceMaintenanceMapper.xml" "b/$\173project.build.directory\175/classes/mapper/device/DeviceMaintenanceMapper.xml"
deleted file mode 100644
index 9917ce2..0000000
--- "a/$\173project.build.directory\175/classes/mapper/device/DeviceMaintenanceMapper.xml"
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.ruoyi.device.mapper.DeviceMaintenanceMapper">
-
- <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
- select dm.id,
- dm.device_ledger_id,
- dm.maintenance_plan_time,
- dm.maintenance_actually_time,
- dm.maintenance_result,
- dm.status,
- dm.create_time,
- dm.update_time,
- dm.create_user,
- dm.update_user,
- dm.tenant_id,
- dm.maintenance_actually_name,
- dl.device_name,
- dl.device_model,
- su.user_name as create_user_name
- from device_maintenance dm
- left join device_ledger dl on dm.device_ledger_id = dl.id
- left join sys_user su on dm.create_user = su.user_id
- <where>
- 1 = 1
- <if test="deviceMaintenanceDto.deviceName != null">
- and dl.device_name like concat('%',#{deviceMaintenanceDto.deviceName},'%')
- </if>
- <if test="deviceMaintenanceDto.deviceModel != null">
- and dl.device_model like concat('%',#{deviceMaintenanceDto.deviceModel},'%')
- </if>
- <if test="deviceMaintenanceDto.maintenanceActuallyName != null">
- and dm.maintenance_actually_name like concat('%',#{deviceMaintenanceDto.maintenanceActuallyName},'%')
- </if>
- <if test="deviceMaintenanceDto.maintenancePlanTimeReq != null">
- and dm.maintenance_plan_time like concat('%',#{deviceMaintenanceDto.maintenancePlanTimeReq},'%')
- </if>
- <if test="deviceMaintenanceDto.maintenanceActuallyTimeReq != null">
- and dm.maintenance_actually_time like concat('%',#{deviceMaintenanceDto.maintenanceActuallyTimeReq},'%')
- </if>
- </where>
- </select>
- <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
- select dm.id,
- dm.device_ledger_id,
- dm.maintenance_plan_time,
- dm.maintenance_actually_time,
- dm.maintenance_result,
- dm.status,
- dm.create_time,
- dm.update_time,
- dm.create_user,
- dm.update_user,
- dm.tenant_id,
- dm.maintenance_actually_name,
- dl.device_name,
- dl.device_model,
- su.user_name as create_user_name
- from device_maintenance dm
- left join device_ledger dl on dm.device_ledger_id = dl.id
- left join sys_user su on dm.create_user = su.user_id
- where dm.id = #{id}
- </select>
- <select id="list1" resultType="com.ruoyi.device.pojo.DeviceMaintenance">
- select *
- from device_maintenance
- where device_ledger_id = #{id}
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/device/DeviceRepairMapper.xml" "b/$\173project.build.directory\175/classes/mapper/device/DeviceRepairMapper.xml"
deleted file mode 100644
index e8565d6..0000000
--- "a/$\173project.build.directory\175/classes/mapper/device/DeviceRepairMapper.xml"
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.ruoyi.device.mapper.DeviceRepairMapper">
-
- <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
- select dr.id,
- dr.device_ledger_id,
- dr.repair_time,
- dr.repair_name,
- dr.remark,
- dr.maintenance_name,
- dr.maintenance_time,
- dr.maintenance_result,
- dr.status,
- dr.create_time,
- dr.update_time,
- dr.create_user,
- dr.update_user,
- dr.tenant_id,
- dl.device_name,
- dl.device_model
- from device_repair dr
- left join device_ledger dl on dr.device_ledger_id = dl.id
- <where>
- 1 = 1
- <if test="deviceRepairDto.deviceName != null">
- and dl.device_name like concat('%',#{deviceRepairDto.deviceName},'%')
- </if>
- <if test="deviceRepairDto.deviceModel != null">
- and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
- </if>
- <if test="deviceRepairDto.remark != null">
- and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
- </if>
- <if test="deviceRepairDto.maintenanceName != null">
- and dr.maintenance_name like concat('%',#{deviceRepairDto.maintenanceName},'%')
- </if>
-
- <if test="deviceRepairDto.repairTimeStr != null and deviceRepairDto.repairTimeStr != '' ">
- and dr.repair_time like concat('%',#{deviceRepairDto.repairTimeStr},'%')
- </if>
- <if test="deviceRepairDto.maintenanceTimeStr != null and deviceRepairDto.maintenanceTimeStr != '' ">
- and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
- </if>
- </where>
- </select>
- <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
- select dr.id,
- dr.device_ledger_id,
- dr.repair_time,
- dr.repair_name,
- dr.remark,
- dr.maintenance_name,
- dr.maintenance_time,
- dr.maintenance_result,
- dr.status,
- dr.create_time,
- dr.update_time,
- dr.create_user,
- dr.update_user,
- dr.tenant_id,
- dl.device_name,
- dl.device_model
- from device_repair dr
- left join device_ledger dl on dr.device_ledger_id = dl.id
- where dr.id = #{id}
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml" "b/$\173project.build.directory\175/classes/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml"
deleted file mode 100644
index c026425..0000000
--- "a/$\173project.build.directory\175/classes/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml"
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.equipmentenergyconsumption.mapper.EnergyPeriodMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.EnergyPeriod">
- select * from energy_period
- <where>
- <if test="energyPeriod.date != null">
- date = #{energyPeriod.date}
- </if>
- <if test="energyPeriod.price != null">
- and price = #{energyPeriod.price}
- </if>
- <if test="energyPeriod.peak != null">
- and peak = #{energyPeriod.peak}
- </if>
- <if test="energyPeriod.valley != null">
- and valley = #{energyPeriod.valley}
- </if>
- <if test="energyPeriod.flat != null">
- and flat = #{energyPeriod.flat}
- </if>
- <if test="energyPeriod.sharp != null">
- and sharp = #{energyPeriod.sharp}
- </if>
- </where>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml" "b/$\173project.build.directory\175/classes/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml"
deleted file mode 100644
index eda1827..0000000
--- "a/$\173project.build.directory\175/classes/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml"
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.equipmentenergyconsumption.mapper.EquipmentEnergyConsumptionMapper">
-
- <select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption">
- select * from equipment_energy_consumption
- where 1=1
- <if test="req.name != null and req.name != ''">
- and `name` like concat('%',#{req.name},'%')
- </if>
- </select>
- <select id="listPageByTrend" resultType="com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption">
- SELECT
- *,
- day_num as toDayNum
- FROM
- equipment_energy_consumption
- WHERE
- run_date = DATE_SUB(CURRENT_DATE(), INTERVAL 1 DAY)
- <if test="req.name != null and req.name != ''">
- and `name` like concat('%',#{req.name},'%')
- </if>
- GROUP BY
- `code`
- ORDER BY
- update_time DESC;
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml" "b/$\173project.build.directory\175/classes/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml"
deleted file mode 100644
index aed220c..0000000
--- "a/$\173project.build.directory\175/classes/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml"
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.equipmentenergyconsumption.mapper.ElectricityConsumptionAreaMapper">
-
- <select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea">
- select * from electricity_consumption_area
- <where>
- <if test="electricityConsumptionArea.id != null">
- id = #{electricityConsumptionArea.id}
- </if>
- <if test="electricityConsumptionArea.areaName != null and electricityConsumptionArea.areaName != ''">
- and area_name like CONCAT('%', #{electricityConsumptionArea.areaName}, '%')
- </if>
- <if test="electricityConsumptionArea.areaType != null and electricityConsumptionArea.areaType != ''">
- and area_type like CONCAT('%', #{electricityConsumptionArea.areaType}, '%')
- </if>
- <if test="electricityConsumptionArea.sort != null">
- and sort = #{electricityConsumptionArea.sort}
- </if>
- <if test="electricityConsumptionArea.fuId != null">
- and fu_id = #{electricityConsumptionArea.fuId}
- </if>
- </where>
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/inspectiontask/TimingTaskMapper.xml" "b/$\173project.build.directory\175/classes/mapper/inspectiontask/TimingTaskMapper.xml"
deleted file mode 100644
index bb74e0e..0000000
--- "a/$\173project.build.directory\175/classes/mapper/inspectiontask/TimingTaskMapper.xml"
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.inspectiontask.mapper.TimingTaskMapper">
-
- <select id="getTaskById" resultType="com.ruoyi.inspectiontask.pojo.TimingTask" useCache="false">
- SELECT * FROM timing_task WHERE id = #{id}
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/lavorissue/LavorIssueMapper.xml" "b/$\173project.build.directory\175/classes/mapper/lavorissue/LavorIssueMapper.xml"
deleted file mode 100644
index 81cf11d..0000000
--- "a/$\173project.build.directory\175/classes/mapper/lavorissue/LavorIssueMapper.xml"
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.lavorissue.mapper.LavorIssueMapper">
-
- <select id="listPage" resultType="com.ruoyi.lavorissue.pojo.LaborIssue">
- select
- t1.*,
- t2.staff_name as staffName,
- t2.staff_no as staffNo,
- t3.dict_label as dictName,
- t4.dict_label as dictTypeName
- from labor_issue t1
- left join staff_join_leave_record t2 on t1.staff_id = t2.id
- left join sys_dict_data t3 on t1.dict_id = t3.dict_value
- left join sys_dict_data t4 on t1.dict_type = t4.dict_value
- <where>
- <if test="req.season != null and req.season != ''">
- and (t1.issue_date >= #{req.startDate} and t1.issue_date <= #{req.endDate})
- </if>
- <if test="req.issueDate != null">
- and (t1.issue_date >= #{req.startDate} and t1.issue_date <= #{req.endDate})
- </if>
- <if test="req.staffName != null and req.staffName != ''">
- and t2.staff_name like concat('%',#{req.staffName},'%')
- </if>
- <if test="req.status != null and req.status == 1">
- and t1.adopted_date is not null
- </if>
- <if test="req.status != null and req.status == 2">
- and t1.adopted_date is null
- </if>
- <if test="req.status != null and req.status == 3">
- and t1.adopted_date is not null and t1.issue_date < t1.adopted_date
- </if>
- <if test="req.status != null and req.status == 4">
- and t1.adopted_date is null and t1.issue_date < current_date()
- </if>
- </where>
- </select>
- <select id="list" resultType="com.ruoyi.lavorissue.pojo.LaborIssue">
- select
- t1.*,
- t2.staff_name as staffName,
- t2.staff_no as staffNo,
- t3.dict_label as dictName,
- t4.dict_label as dictTypeName
- from labor_issue t1
- left join staff_join_leave_record t2 on t1.staff_id = t2.id
- left join sys_dict_data t3 on t1.dict_id = t3.dict_value
- left join sys_dict_data t4 on t1.dict_type = t4.dict_value
- <where>
- <if test="req.adoptedDate != null">
- and t1.adopted_date is null
- </if>
- <if test="req.issueDate != null">
- and (t1.issue_date >= #{req.startDate} and t1.issue_date <= #{req.endDate})
- </if>
- <if test="req.staffId != null">
- and t1.staff_id = #{req.staffId}
- </if>
- <if test="req.season != null and req.season != ''">
- and (t1.issue_date >= #{req.startDate} and t1.issue_date <= #{req.endDate})
- </if>
- <if test="req.status != null and req.status == 1">
- and t1.adopted_date is not null
- </if>
- <if test="req.status != null and req.status == 2">
- and t1.adopted_date is null
- </if>
- <if test="req.status != null and req.status == 3">
- and t1.adopted_date is not null and t1.issue_date < t1.adopted_date
- </if>
- <if test="req.status != null and req.status == 4">
- and t1.adopted_date is null and t1.issue_date < current_date()
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml" "b/$\173project.build.directory\175/classes/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml"
deleted file mode 100644
index fc680d0..0000000
--- "a/$\173project.build.directory\175/classes/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml"
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.measuringinstrumentledger.mapper.MeasuringInstrumentLedgerMapper">
-
- <select id="listPage" resultType="com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedger">
- SELECT
- id,
- user_id,
- user_name,
- code,
- name,
- model,
- most_date,
- valid,
- next_date,
- record_date,
- CASE
- WHEN next_date >= DATE_FORMAT(now(),'%Y-%m-%d') THEN 1
- ELSE 2
- END AS status,
- create_user,
- create_time,
- update_user,
- update_time,
- tenant_id
- FROM
- measuring_instrument_ledger
- <where>
- <!-- 鏌ヨ鏉′欢鍚屼笂 -->
- <if test="req.code != null and req.code != ''">
- AND code LIKE CONCAT('%', #{req.code}, '%')
- </if>
- <if test="req.name != null and req.name != ''">
- AND name LIKE CONCAT('%', #{req.name}, '%')
- </if>
- <if test="req.status != null">
- <choose>
- <when test="req.status == 1">
- AND next_date >= DATE_FORMAT(now(),'%Y-%m-%d')
- </when>
- <when test="req.status == 2">
- AND next_date < DATE_FORMAT(now(),'%Y-%m-%d')
- </when>
- </choose>
- </if>
- <if test="req.tenantId != null">
- AND tenant_id = #{req.tenantId}
- </if>
- <if test="req.recordDate != null">
- AND record_date = DATE_FORMAT(#{req.recordDate},'%Y-%m-%d')
- </if>
- </where>
- ORDER BY update_time DESC
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerRecordMapper.xml" "b/$\173project.build.directory\175/classes/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerRecordMapper.xml"
deleted file mode 100644
index 69446e0..0000000
--- "a/$\173project.build.directory\175/classes/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerRecordMapper.xml"
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.measuringinstrumentledger.mapper.MeasuringInstrumentLedgerRecordMapper">
-
- <select id="listPage"
- resultType="com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedgerRecord">
- SELECT
- t1.id,
- t1.user_id,
- t1.user_name,
- t2.code,
- t2.name,
- t2.model,
- t1.valid,
- t1.record_date,
- t1.entry_date
- FROM
- measuring_instrument_ledger_record t1
- left join measuring_instrument_ledger t2 on t1.measuring_instrument_ledger_id = t2.id
- <where>
- <!-- 鏌ヨ鏉′欢鍚屼笂 -->
- <if test="req.code != null and req.code != ''">
- AND t2.code LIKE CONCAT('%', #{req.code}, '%')
- </if>
- <if test="req.name != null and req.name != ''">
- AND t2.name LIKE CONCAT('%', #{req.name}, '%')
- </if>
- <if test="req.entryDate != null">
- AND t1.entry_date = DATE_FORMAT(#{req.entryDate},'%Y-%m-%d')
- </if>
- <if test="req.recordDate != null">
- AND t1.record_date = DATE_FORMAT(#{req.recordDate},'%Y-%m-%d')
- </if>
- </where>
- ORDER BY t1.update_time DESC
- </select>
- <select id="list" resultType="com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedgerRecord">
- SELECT
- t1.id,
- t1.user_id,
- t1.user_name,
- t2.code,
- t2.name,
- t2.model,
- t1.valid,
- t1.record_date,
- t1.entry_date
- FROM
- measuring_instrument_ledger_record t1
- left join measuring_instrument_ledger t2 on t1.measuring_instrument_ledger_id = t2.id
- <where>
- <!-- 鏌ヨ鏉′欢鍚屼笂 -->
- <if test="req.code != null and req.code != ''">
- AND t2.code LIKE CONCAT('%', #{req.code}, '%')
- </if>
- <if test="req.name != null and req.name != ''">
- AND t2.name LIKE CONCAT('%', #{req.name}, '%')
- </if>
- <if test="req.entryDate != null">
- AND t1.entry_date = DATE_FORMAT(#{req.entryDate},'%Y-%m-%d')
- </if>
- <if test="req.recordDate != null">
- AND t1.record_date = DATE_FORMAT(#{req.recordDate},'%Y-%m-%d')
- </if>
- </where>
- ORDER BY t1.update_time DESC
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/measuringinstrumentledger/SparePartsMapper.xml" "b/$\173project.build.directory\175/classes/mapper/measuringinstrumentledger/SparePartsMapper.xml"
deleted file mode 100644
index 611d51e..0000000
--- "a/$\173project.build.directory\175/classes/mapper/measuringinstrumentledger/SparePartsMapper.xml"
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper">
- <select id="listPage" resultType="com.ruoyi.measuringinstrumentledger.dto.SparePartsDto">
- select sp.*,sp1.name as parentName
- from spare_parts sp
- left join spare_parts sp1 on sp1.id = sp.parent_id
- <where>
- <if test="spareParts.name != null and spareParts.name != ''">
- and sp.name like concat('%',#{spareParts.name},'%')
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/monitor/SysLogininforMapper.xml" "b/$\173project.build.directory\175/classes/mapper/monitor/SysLogininforMapper.xml"
deleted file mode 100644
index 98afbb5..0000000
--- "a/$\173project.build.directory\175/classes/mapper/monitor/SysLogininforMapper.xml"
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.monitor.mapper.SysLogininforMapper">
-
- <resultMap type="com.ruoyi.project.monitor.domain.SysLogininfor" id="SysLogininforResult">
- <id property="infoId" column="info_id" />
- <result property="userName" column="user_name" />
- <result property="status" column="status" />
- <result property="ipaddr" column="ipaddr" />
- <result property="loginLocation" column="login_location" />
- <result property="browser" column="browser" />
- <result property="os" column="os" />
- <result property="msg" column="msg" />
- <result property="loginTime" column="login_time" />
- </resultMap>
-
- <insert id="insertLogininfor" parameterType="com.ruoyi.project.monitor.domain.SysLogininfor">
- insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
- values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
- </insert>
-
- <select id="selectLogininforList" parameterType="com.ruoyi.project.monitor.domain.SysLogininfor" resultMap="SysLogininforResult">
- select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
- <where>
- <if test="ipaddr != null and ipaddr != ''">
- AND ipaddr like concat('%', #{ipaddr}, '%')
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <if test="userName != null and userName != ''">
- AND user_name like concat('%', #{userName}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- AND login_time >= #{params.beginTime}
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- AND login_time <= #{params.endTime}
- </if>
- </where>
- order by info_id desc
- </select>
-
- <delete id="deleteLogininforByIds" parameterType="Long">
- delete from sys_logininfor where info_id in
- <foreach collection="array" item="infoId" open="(" separator="," close=")">
- #{infoId}
- </foreach>
- </delete>
-
- <update id="cleanLogininfor">
- truncate table sys_logininfor
- </update>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/monitor/SysOperLogMapper.xml" "b/$\173project.build.directory\175/classes/mapper/monitor/SysOperLogMapper.xml"
deleted file mode 100644
index 6bb7e8f..0000000
--- "a/$\173project.build.directory\175/classes/mapper/monitor/SysOperLogMapper.xml"
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.monitor.mapper.SysOperLogMapper">
-
- <resultMap type="com.ruoyi.project.monitor.domain.SysOperLog" id="SysOperLogResult">
- <id property="operId" column="oper_id" />
- <result property="title" column="title" />
- <result property="businessType" column="business_type" />
- <result property="method" column="method" />
- <result property="requestMethod" column="request_method" />
- <result property="operatorType" column="operator_type" />
- <result property="operName" column="oper_name" />
- <result property="deptName" column="dept_name" />
- <result property="operUrl" column="oper_url" />
- <result property="operIp" column="oper_ip" />
- <result property="operLocation" column="oper_location" />
- <result property="operParam" column="oper_param" />
- <result property="jsonResult" column="json_result" />
- <result property="status" column="status" />
- <result property="errorMsg" column="error_msg" />
- <result property="operTime" column="oper_time" />
- <result property="costTime" column="cost_time" />
- </resultMap>
-
- <sql id="selectOperLogVo">
- select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time
- from sys_oper_log
- </sql>
-
- <insert id="insertOperlog" parameterType="com.ruoyi.project.monitor.domain.SysOperLog">
- insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time)
- values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate())
- </insert>
-
- <select id="selectOperLogList" parameterType="com.ruoyi.project.monitor.domain.SysOperLog" resultMap="SysOperLogResult">
- <include refid="selectOperLogVo"/>
- <where>
- <if test="operIp != null and operIp != ''">
- AND oper_ip like concat('%', #{operIp}, '%')
- </if>
- <if test="title != null and title != ''">
- AND title like concat('%', #{title}, '%')
- </if>
- <if test="businessType != null">
- AND business_type = #{businessType}
- </if>
- <if test="businessTypes != null and businessTypes.length > 0">
- AND business_type in
- <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
- #{businessType}
- </foreach>
- </if>
- <if test="status != null">
- AND status = #{status}
- </if>
- <if test="operName != null and operName != ''">
- AND oper_name like concat('%', #{operName}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- AND oper_time >= #{params.beginTime}
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- AND oper_time <= #{params.endTime}
- </if>
- </where>
- order by oper_id desc
- </select>
-
- <delete id="deleteOperLogByIds" parameterType="Long">
- delete from sys_oper_log where oper_id in
- <foreach collection="array" item="operId" open="(" separator="," close=")">
- #{operId}
- </foreach>
- </delete>
-
- <select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
- <include refid="selectOperLogVo"/>
- where oper_id = #{operId}
- </select>
-
- <update id="cleanOperLog">
- truncate table sys_oper_log
- </update>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/oA/OaProjectMapper.xml" "b/$\173project.build.directory\175/classes/mapper/oA/OaProjectMapper.xml"
deleted file mode 100644
index c245a39..0000000
--- "a/$\173project.build.directory\175/classes/mapper/oA/OaProjectMapper.xml"
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.oA.mapper.OaProjectMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.oA.dto.OaProjectDto">
- select op.*,su.nick_name as managerName from oa_project op
- LEFT JOIN sys_user su ON op.manager_id=su.user_id
- <where>
- 1=1
- <if test="req.projectName != null and req.projectName != ''">
- and op.project_name like concat('%',#{req.projectName},'%')
- </if>
- <if test="req.managerName != null and req.managerName != ''">
- and su.nick_name like concat('%',#{req.managerName},'%')
- </if>
- <if test="req.status != null and req.status != ''">
- and op.status = #{req.status}
- </if>
- </where>
- </select>
- <select id="selectByIds" resultType="com.ruoyi.oA.dto.OaProjectDto">
- select op.*,su.nick_name as managerName from oa_project op
- LEFT JOIN sys_user su ON op.manager_id=su.user_id
- where op.project_id in
- <foreach collection="ids" item="id" open="(" close=")" separator=",">
- #{id}
- </foreach>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/oA/OaProjectPhaseMapper.xml" "b/$\173project.build.directory\175/classes/mapper/oA/OaProjectPhaseMapper.xml"
deleted file mode 100644
index 2f52fe9..0000000
--- "a/$\173project.build.directory\175/classes/mapper/oA/OaProjectPhaseMapper.xml"
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.oA.mapper.OaProjectPhaseMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.oA.pojo.OaProjectPhase">
- <id property="phaseId" column="phase_id" jdbcType="INTEGER"/>
- <result property="phaseName" column="phase_name" jdbcType="VARCHAR"/>
- <result property="oaProjectId" column="oa_project_id" jdbcType="INTEGER"/>
- <result property="startDate" column="start_date" jdbcType="TIMESTAMP"/>
- <result property="endDate" column="end_date" jdbcType="TIMESTAMP"/>
- <result property="status" column="status" jdbcType="VARCHAR"/>
- <result property="createUser" column="create_user" jdbcType="BIGINT"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- phase_id,phase_name,oa_project_id,
- start_date,end_date,status,
- create_user,create_time,update_user,
- update_time,tenant_id
- </sql>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/oA/OaProjectPhaseTaskMapper.xml" "b/$\173project.build.directory\175/classes/mapper/oA/OaProjectPhaseTaskMapper.xml"
deleted file mode 100644
index cc029d9..0000000
--- "a/$\173project.build.directory\175/classes/mapper/oA/OaProjectPhaseTaskMapper.xml"
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.oA.mapper.OaProjectPhaseTaskMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.oA.pojo.OaProjectPhaseTask">
- <id property="taskId" column="task_id" jdbcType="INTEGER"/>
- <result property="taskName" column="task_name" jdbcType="VARCHAR"/>
- <result property="phaseId" column="phase_id" jdbcType="INTEGER"/>
- <result property="startDate" column="start_date" jdbcType="TIMESTAMP"/>
- <result property="endDate" column="end_date" jdbcType="TIMESTAMP"/>
- <result property="targetDate" column="target_date" jdbcType="TIMESTAMP"/>
- <result property="targetValue" column="target_value" jdbcType="INTEGER"/>
- <result property="currentValue" column="current_value" jdbcType="INTEGER"/>
- <result property="unit" column="unit" jdbcType="VARCHAR"/>
- <result property="status" column="status" jdbcType="VARCHAR"/>
- <result property="completionRate" column="completion_rate" jdbcType="INTEGER"/>
- <result property="createUser" column="create_user" jdbcType="BIGINT"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- task_id,task_name,phase_id,
- start_date,end_date,target_date,
- target_value,current_value,unit,
- status,completion_rate,create_user,
- create_time,update_user,update_time,
- tenant_id
- </sql>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/officesupplies/OfficeSuppliesMapper.xml" "b/$\173project.build.directory\175/classes/mapper/officesupplies/OfficeSuppliesMapper.xml"
deleted file mode 100644
index 7191aa9..0000000
--- "a/$\173project.build.directory\175/classes/mapper/officesupplies/OfficeSuppliesMapper.xml"
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.officesupplies.mapper.OfficeSuppliesMapper">
-
- <select id="listPage" resultType="com.ruoyi.officesupplies.pojo.OfficeSupplies">
- select * from office_supplies
- <where>
- <if test="req.code != null and req.code != ''">
- and code like concat('%',#{req.code},'%')
- </if>
- <if test="req.applicant != null and req.applicant != ''">
- and applicant like concat('%',#{req.applicant},'%')
- </if>
- <if test="req.status != null and req.status != ''">
- and status = #{req.status}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/procurementrecord/GasTankWarningMapper.xml" "b/$\173project.build.directory\175/classes/mapper/procurementrecord/GasTankWarningMapper.xml"
deleted file mode 100644
index 9f06e2c..0000000
--- "a/$\173project.build.directory\175/classes/mapper/procurementrecord/GasTankWarningMapper.xml"
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.procurementrecord.mapper.GasTankWarningMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.procurementrecord.pojo.GasTankWarning">
- select * from gas_tank_warning
- where 1=1
- <if test="gasTankWarning.tankName != null and gasTankWarning.tankName != ''">
- and tank_name like concat('%', #{gasTankWarning.tankName}, '%')
- </if>
- <if test="gasTankWarning.tankType != null">
- and tank_type = #{gasTankWarning.tankType}
- </if>
- <if test="gasTankWarning.warningType != null">
- and warning_type = #{gasTankWarning.warningType}
- </if>
- <if test="gasTankWarning.warningLevel != null">
- and warning_level = #{gasTankWarning.warningLevel}
- </if>
-
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/procurementrecord/InboundManagementMapper.xml" "b/$\173project.build.directory\175/classes/mapper/procurementrecord/InboundManagementMapper.xml"
deleted file mode 100644
index fbaa3e3..0000000
--- "a/$\173project.build.directory\175/classes/mapper/procurementrecord/InboundManagementMapper.xml"
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.procurementrecord.mapper.InboundManagementMapper">
-
- <select id="listPage" resultType="com.ruoyi.procurementrecord.pojo.InboundManagement">
- select * from inbound_management
- <where>
- <if test="req.orderNo != null and req.orderNo != ''">
- and order_no like concat('%',#{req.orderNo},'%')
- </if>
- <if test="req.supplierName != null and req.supplierName != ''">
- and supplier_name like concat('%',#{req.supplierName},'%')
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/procurementrecord/ProcurementPlanMapper.xml" "b/$\173project.build.directory\175/classes/mapper/procurementrecord/ProcurementPlanMapper.xml"
deleted file mode 100644
index 2403bf2..0000000
--- "a/$\173project.build.directory\175/classes/mapper/procurementrecord/ProcurementPlanMapper.xml"
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.procurementrecord.mapper.ProcurementPlanMapper">
-
- <select id="listPage" resultType="com.ruoyi.procurementrecord.pojo.ProcurementPlan">
- SELECT * FROM procurement_plan
- <where>
- <if test="req.status != null and req.status != ''">
- AND status = #{req.status}
- </if>
- <if test="req.planName != null and req.planName != ''">
- AND plan_name LIKE CONCAT('%',#{req.planName},'%')
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/procurementrecord/ProcurementPriceManagementMapper.xml" "b/$\173project.build.directory\175/classes/mapper/procurementrecord/ProcurementPriceManagementMapper.xml"
deleted file mode 100644
index 196adfa..0000000
--- "a/$\173project.build.directory\175/classes/mapper/procurementrecord/ProcurementPriceManagementMapper.xml"
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.procurementrecord.mapper.ProcurementPriceManagementMapper">
-
- <select id="listPage" resultType="com.ruoyi.procurementrecord.pojo.ProcurementPriceManagement">
- SELECT * FROM procurement_price_management
- <where>
- <if test="req.productName != null and req.productName != ''">
- AND product_name like concat('%',#{req.productName},'%')
- </if>
- <if test="req.supplierName != null and req.supplierName != ''">
- AND supplier_name = #{req.supplierName}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/procurementrecord/ProcurementRecordMapper.xml" "b/$\173project.build.directory\175/classes/mapper/procurementrecord/ProcurementRecordMapper.xml"
deleted file mode 100644
index e2c9c8f..0000000
--- "a/$\173project.build.directory\175/classes/mapper/procurementrecord/ProcurementRecordMapper.xml"
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper">
-
- <select id="listProcurementBySalesLedgerId" resultType="com.ruoyi.procurementrecord.dto.ProcurementDto">
- select
- t1.supplier_name,
- t2.product_category,
- t2.id,
- t3.id as recordId,
- t2.specification_model,
- t2.unit,
- t2.quantity,
- t2.min_stock,
- t2.warn_num,
- t2.quantity as quantity0,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t3.inbound_num as quantityStock
- from purchase_ledger t1
- left join sales_ledger_product t2 on t1.id = t2.sales_ledger_id
- left join procurement_record_storage t3 on t2.id = t3.sales_ledger_product_id
- where t1.purchase_contract_number = #{req.purchaseContractNumber}
- <if test="req.id != null and req.id != ''">
- and t3.id = #{req.id}
- </if>
- group by t2.id
- </select>
- <select id="listPage" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
- select
- t3.supplier_name,
- t3.purchase_contract_number,
- t2.product_category,
- t1.id,
- t1.sales_ledger_product_id,
- t1.create_user,
- t2.specification_model,
- t2.unit,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- (t1.inbound_num * t2.tax_inclusive_unit_price) as taxInclusiveTotalPrice,
- (t1.inbound_num * t2.tax_inclusive_unit_price - t1.inbound_num * t2.tax_inclusive_unit_price * t2.tax_rate / 100) as taxExclusiveTotalPrice,
- t1.inbound_batches,
- t1.inbound_num,
- t1.inbound_num as inboundNum0,
- t1.create_time,
- t1.update_time,
- t1.create_by,
- ifnull(t1.warn_num, t2.warn_num) as warnNum
- from procurement_record_storage t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
- left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
- <where>
- 1 = 1
- <if test="req.supplierName != null and req.supplierName != ''">
- and t3.supplier_name like concat('%',#{req.supplierName},'%')
- </if>
- <if test="req.timeStr != null and req.timeStr != ''">
- and t1.create_time like concat('%',#{req.timeStr},'%')
- </if>
- </where>
- </select>
- <select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
- select
- t3.supplier_name,
- t3.purchase_contract_number,
- t2.product_category,
- t1.id,
- t2.specification_model,
- t2.unit,
- t2.quantity,
- t2.quantity as quantity0,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t1.inbound_batches,
- t1.inbound_num,
- t1.create_time,
- t1.create_time as time,
- t1.create_by
- from procurement_record_storage t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
- left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
- </select>
- <select id="listPageCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
- select
- t3.supplier_name,
- t3.purchase_contract_number,
- t2.product_category,
- t1.id,
- t1.sales_ledger_product_id,
- t1.create_user,
- t2.specification_model,
- t2.unit,
- t2.min_stock,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t1.inbound_batches,
- sum(t1.inbound_num) as inboundNum,
- sum(t1.inbound_num) as inboundNum0,
- t1.inbound_num as totalInboundNum,
- t1.create_time,
- t1.update_time,
- t1.create_by,
- ifnull(t1.warn_num, t2.warn_num) as warnNum
- from procurement_record_storage t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
- left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
- <where>
- 1 = 1
- <if test="req.supplierName != null and req.supplierName != ''">
- and t3.supplier_name like concat('%',#{req.supplierName},'%')
- </if>
- <if test="req.timeStr != null and req.timeStr != ''">
- and t1.create_time like concat('%',#{req.timeStr},'%')
- </if>
- <if test="req.reportDate != null">
- and t1.create_time >= #{req.reportDate} and t1.create_time < DATE_ADD(#{req.reportDate}, INTERVAL 1 DAY)
- </if>
- <if test="req.startMonth != null">
- and t1.create_time >= #{req.startMonth}
- </if>
- <if test="req.endMonth != null">
- and t1.create_time <= #{req.endMonth}
- </if>
- <if test="req.startDate != null">
- and t1.create_time >= #{req.startDate}
- </if>
- <if test="req.endDate != null">
- and t1.create_time <= #{req.endDate}
- </if>
- </where>
- group by t3.supplier_name,t2.product_category,t2.specification_model
- </select>
- <select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
- select
- t3.supplier_name,
- t3.purchase_contract_number,
- t2.product_category,
- t1.id,
- t1.sales_ledger_product_id,
- t1.create_user,
- t2.specification_model,
- t2.unit,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t1.inbound_batches,
- t1.inbound_num,
- t1.inbound_num as inboundNum0,
- t1.create_time,
- t1.update_time,
- t1.create_time as cTime,
- t1.update_time as uTime,
- t1.create_by
- from procurement_record_storage t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
- left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/procurementrecord/ProcurementRecordOutMapper.xml" "b/$\173project.build.directory\175/classes/mapper/procurementrecord/ProcurementRecordOutMapper.xml"
deleted file mode 100644
index ec91c53..0000000
--- "a/$\173project.build.directory\175/classes/mapper/procurementrecord/ProcurementRecordOutMapper.xml"
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper">
-
- <select id="listPage" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
- select
- t3.supplier_name,
- t2.product_category,
- t1.id,
- t1.code,
- t2.specification_model,
- t2.unit,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t1.inbound_num,
- t1.create_time,
- t1.create_by,
- t2.warn_num
- from procurement_record_out t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
- left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
- <where>
- 1 = 1
- <if test="req.supplierName != null and req.supplierName != ''">
- and t3.supplier_name like concat('%',#{req.supplierName},'%')
- </if>
- <if test="req.timeStr != null and req.timeStr != ''">
- and t1.create_time like concat('%',#{req.timeStr},'%')
- </if>
- </where>
- </select>
- <select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
- select
- t3.supplier_name,
- t2.product_category,
- t1.id,
- t2.specification_model,
- t2.unit,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t1.inbound_num,
- t1.create_time,
- t1.create_time as time,
- t1.create_by
- from procurement_record_out t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
- left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/procurementrecord/ReturnManagementMapper.xml" "b/$\173project.build.directory\175/classes/mapper/procurementrecord/ReturnManagementMapper.xml"
deleted file mode 100644
index ce8eb39..0000000
--- "a/$\173project.build.directory\175/classes/mapper/procurementrecord/ReturnManagementMapper.xml"
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.procurementrecord.mapper.ReturnManagementMapper">
-
- <select id="listPage" resultType="com.ruoyi.procurementrecord.pojo.ReturnManagement">
- select * from return_management
- <where>
- <if test="req.returnNo != null and req.returnNo != ''">
- and return_no like concat('%',#{req.returnNo},'%')
- </if>
- <if test="req.returnType != null and req.returnType != ''">
- and return_type = #{req.returnType}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/production/SalesLedgerProductionAccountingMapper.xml" "b/$\173project.build.directory\175/classes/mapper/production/SalesLedgerProductionAccountingMapper.xml"
deleted file mode 100644
index 29b88f2..0000000
--- "a/$\173project.build.directory\175/classes/mapper/production/SalesLedgerProductionAccountingMapper.xml"
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.production.mapper.SalesLedgerProductionAccountingMapper">
-
- <select id="listPage" resultType="com.ruoyi.production.dto.SalesLedgerProductionAccountingDto">
- SELECT
- t4.id,
- t4.finished_num * t4.work_hours as wages,
- t4.scheduling_user_id,
- t4.scheduling_user_name,
- t4.scheduling_date,
- t4.finished_num,
- t4.work_hours,
- t4.process,
- T1.sales_contract_no,
- T1.customer_contract_no,
- T1.project_name,
- T1.customer_name,
- t3.product_category,
- t3.specification_model,
- t3.unit
- FROM
- sales_ledger_production_accounting t4
- LEFT JOIN sales_ledger T1 ON T1.id = t4.sales_ledger_id
- left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id
- <where>
- t3.type = 1
- <if test="salesLedgerDto.schedulingUserName != null and salesLedgerDto.schedulingUserName != '' ">
- AND t4.scheduling_user_name LIKE CONCAT('%',#{salesLedgerDto.schedulingUserName},'%')
- </if>
- <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
- </if>
- <if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
- AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
- </if>
- <if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
- AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
- </if>
- <if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
- AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
- </if>
- <if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
- AND t4.scheduling_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
- AND t4.scheduling_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
- </if>
- </where>
- group by t4.id
- order by t4.update_time desc
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/production/SalesLedgerSchedulingMapper.xml" "b/$\173project.build.directory\175/classes/mapper/production/SalesLedgerSchedulingMapper.xml"
deleted file mode 100644
index e7e882c..0000000
--- "a/$\173project.build.directory\175/classes/mapper/production/SalesLedgerSchedulingMapper.xml"
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.production.mapper.SalesLedgerSchedulingMapper">
-
- <select id="listPage" resultType="com.ruoyi.production.dto.SalesLedgerSchedulingDto">
- SELECT
- T2.id as salesLedgerProductId,
- T1.id as salesLedgerId,
- ifNull(sum(t3.scheduling_num),0) AS schedulingNum,
- T1.sales_contract_no,
- T1.customer_contract_no,
- T1.project_name,
- T1.entry_date,
- T1.customer_name,
- T2.quantity,
- T2.product_category,
- T2.specification_model,
- T2.unit
- FROM
- sales_ledger_product T2
- LEFT join sales_ledger_scheduling t3 on T2.id = t3.sales_ledger_product_id
- LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
- <where>
- T1.id is not null and T2.type = 1
- <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
- </if>
- <if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
- AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
- </if>
- <if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
- AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
- </if>
- <if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
- AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
- </if>
- <if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
- AND T1.entry_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
- AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
- </if>
- </where>
- GROUP BY T2.id
- </select>
- <select id="list" resultType="com.ruoyi.production.dto.SalesLedgerSchedulingDto">
- SELECT
- T2.id,
- ifNull(sum(t3.scheduling_num),0) AS schedulingNum,
- T1.sales_contract_no,
- T1.customer_contract_no,
- T1.project_name,
- T1.entry_date,
- T1.customer_name,
- T2.quantity,
- T2.product_category,
- T2.specification_model,
- T2.unit
- FROM
- sales_ledger_product T2
- LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
- LEFT join sales_ledger_scheduling t3 on T1.id = t3.sales_ledger_id
- where T1.id is not null and T2.type = 1
- GROUP BY T2.id
- </select>
- <select id="listPageProcess" resultType="com.ruoyi.production.dto.SalesLedgerSchedulingProcessDto">
- SELECT
- t3.id as salesLedgerProductId,
- T1.id as salesLedgerId,
- T2.id,
- T2.status,
- T2.scheduling_user_id,
- T2.scheduling_user_name,
- T2.scheduling_date,
- ifNull(T2.scheduling_num,0) AS schedulingNum,
- ifNull(T2.finished_num,0) AS successNum,
- T1.sales_contract_no,
- T1.customer_contract_no,
- T1.project_name,
- T1.customer_name,
- t3.product_category,
- t3.specification_model,
- t3.unit
- FROM
- sales_ledger_scheduling T2
- LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
- left join sales_ledger_product t3 on T2.sales_ledger_product_id = t3.id
- <where>
- t3.type = 1
- <if test="salesLedgerDto.status != null and salesLedgerDto.status != '' ">
- AND T2.status = #{salesLedgerDto.status}
- </if>
- <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
- </if>
- <if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
- AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
- </if>
- <if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
- AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
- </if>
- <if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
- AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
- </if>
- <if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
- AND T2.scheduling_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
- AND T2.scheduling_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
- </if>
- </where>
- order by T2.status asc
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/production/SalesLedgerWorkMapper.xml" "b/$\173project.build.directory\175/classes/mapper/production/SalesLedgerWorkMapper.xml"
deleted file mode 100644
index 41cbe07..0000000
--- "a/$\173project.build.directory\175/classes/mapper/production/SalesLedgerWorkMapper.xml"
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.production.mapper.SalesLedgerWorkMapper">
-
- <select id="listPage" resultType="com.ruoyi.production.dto.SalesLedgerWorkDto">
- SELECT
- t4.id,
- t4.status,
- t4.scheduling_user_id,
- t4.scheduling_user_name,
- t4.scheduling_date,
- t4.scheduling_num,
- t4.finished_num,
- t4.work_hours,
- t4.process,
- T1.sales_contract_no,
- T1.customer_contract_no,
- T1.project_name,
- T1.customer_name,
- t3.product_category,
- t3.specification_model,
- t3.unit
- FROM
- sales_ledger_work t4
- LEFT JOIN sales_ledger T1 ON T1.id = t4.sales_ledger_id
- left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id
- <where>
- t3.type = 1
- <if test="salesLedgerDto.status != null and salesLedgerDto.status != '' ">
- AND t4.status = #{salesLedgerDto.status}
- </if>
- <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
- </if>
- <if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
- AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
- </if>
- <if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
- AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
- </if>
- <if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
- AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
- </if>
- <if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
- AND t4.scheduling_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
- AND t4.scheduling_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
- </if>
- </where>
- order by t4.update_time desc
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/purchase/InvoicePurchaseMapper.xml" "b/$\173project.build.directory\175/classes/mapper/purchase/InvoicePurchaseMapper.xml"
deleted file mode 100644
index 96e0388..0000000
--- "a/$\173project.build.directory\175/classes/mapper/purchase/InvoicePurchaseMapper.xml"
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.purchase.mapper.InvoicePurchaseMapper">
-
-
- <select id="selectPurchaseReport" resultType="com.ruoyi.purchase.dto.InvoicePurchaseReportDto">
- SELECT
- sl.sales_contract_no AS customerContractNo,
- sl.customer_name,
- sl.contract_amount AS contract_amount,
- sl.project_name,
- SUM( pl.contract_amount ) AS purchase_amount,
- (
- sl.contract_amount - SUM( pl.contract_amount )) AS balance,
- CONCAT( ROUND( ( sl.contract_amount - SUM( pl.contract_amount )) / sl.contract_amount * 100, 1 ), '%' ) AS balance_ratio
- FROM
- sales_ledger sl
- INNER JOIN purchase_ledger pl ON sl.sales_contract_no = pl.sales_contract_no
- <where>
- <if test="c.customerName != null and c.customerName != ''">
- AND sl.customer_name LIKE CONCAT('%', #{c.customerName}, '%')
- </if>
- </where>
- GROUP BY
- sl.sales_contract_no,
- sl.customer_name,
- sl.contract_amount
- ORDER BY
- sl.sales_contract_no
- </select>
- <select id="listVat" resultType="com.ruoyi.purchase.dto.VatDto">
- select *
- from (SELECT
- COALESCE(a1.month, a2.month) AS month,
- IFNULL(a1.tax_amount, 0) AS j_tax_amount,
- IFNULL(a2.x_tax_amount, 0) AS x_tax_amount
- FROM (
- -- 绗竴涓煡璇細鏉ヨ嚜 invoice_ledger 鐨勭◣棰�
- SELECT
- DATE_FORMAT(il.invoice_date, '%Y-%m') AS month,
- ROUND(SUM(pr.invoice_amount - pr.invoice_amount / (1 + pr.tax_rate / 100)), 2) AS tax_amount
- FROM invoice_ledger il
- LEFT JOIN invoice_registration_product pr ON pr.id = il.invoice_registration_product_id
- WHERE il.invoice_no IS NOT NULL
- AND invoice_type = '澧炰笓绁�'
- GROUP BY DATE_FORMAT(il.invoice_date, '%Y-%m')
- ) a1
- LEFT JOIN (
- -- 绗簩涓煡璇細鏉ヨ嚜 ticket_registration 鐨勭◣棰�
- SELECT
- DATE_FORMAT(a.issue_date, '%Y-%m') AS month,
- SUM(a.invoice_amount) AS x_tax_amount
- FROM (
- SELECT DISTINCT pr.id,
- tr.issue_date,
- ROUND(pr.tickets_amount / (1 + pr.tax_rate / 100), 2) AS un_tickets_price,
- ROUND(pr.tickets_amount - pr.tickets_amount / (1 + pr.tax_rate / 100), 2) AS invoice_amount
- FROM product_record pr
- LEFT JOIN purchase_ledger pl ON pl.id = pr.purchase_ledger_id
- LEFT JOIN sales_ledger sl ON sl.id = pl.sales_ledger_id
- LEFT JOIN ticket_registration tr ON tr.purchase_ledger_id = pl.id
- LEFT JOIN product_model pm ON pm.id = pr.product_model_id
- WHERE type = 2
- AND tr.invoice_number IS NOT NULL
- ) a
- GROUP BY DATE_FORMAT(a.issue_date, '%Y-%m')
- ) a2 ON a1.month = a2.month
-
- UNION ALL
-
- SELECT
- COALESCE(a1.month, a2.month) AS month,
- IFNULL(a1.tax_amount, 0) AS tax_amount,
- IFNULL(a2.x_tax_amount, 0) AS x_tax_amount
- FROM (
- -- 绗簩涓煡璇細鏉ヨ嚜 ticket_registration 鐨勭◣棰濓紙鍙嶈繃鏉ヨˉ鍏ㄦ病鏈夊尮閰嶅埌鐨勶級
- SELECT
- DATE_FORMAT(a.issue_date, '%Y-%m') AS month,
- SUM(a.invoice_amount) AS x_tax_amount
- FROM (
- SELECT DISTINCT pr.id,
- tr.issue_date,
- ROUND(pr.tickets_amount / (1 + pr.tax_rate / 100), 2) AS un_tickets_price,
- ROUND(pr.tickets_amount - pr.tickets_amount / (1 + pr.tax_rate / 100), 2) AS invoice_amount
- FROM product_record pr
- LEFT JOIN purchase_ledger pl ON pl.id = pr.purchase_ledger_id
- LEFT JOIN sales_ledger sl ON sl.id = pl.sales_ledger_id
- LEFT JOIN ticket_registration tr ON tr.purchase_ledger_id = pl.id
- LEFT JOIN product_model pm ON pm.id = pr.product_model_id
- WHERE type = 2
- AND tr.invoice_number IS NOT NULL
- ) a
- GROUP BY DATE_FORMAT(a.issue_date, '%Y-%m')
- ) a2
- LEFT JOIN (
- -- 绗竴涓煡璇細鏉ヨ嚜 invoice_ledger 鐨勭◣棰�
- SELECT
- DATE_FORMAT(il.invoice_date, '%Y-%m') AS month,
- ROUND(SUM(pr.invoice_amount - pr.invoice_amount / (1 + pr.tax_rate / 100)), 2) AS tax_amount
- FROM invoice_ledger il
- LEFT JOIN invoice_registration_product pr ON pr.id = il.invoice_registration_product_id
- WHERE il.invoice_no IS NOT NULL
- AND invoice_type = '澧炰笓绁�'
- GROUP BY DATE_FORMAT(il.invoice_date, '%Y-%m')
- ) a1 ON a1.month = a2.month
- WHERE a1.month IS NULL
- ORDER BY month
- )as a
- <where>
- <if test="month != null">
- and a.month = #{month}
- </if>
- </where>
-
- </select>
- <select id="listVat1" resultType="com.ruoyi.purchase.dto.VatDto">
- # SELECT
-# DATE_FORMAT(il.invoice_date, '%Y-%m') AS month,
-# ROUND(SUM(pr.invoice_amount - pr.invoice_amount / (1 + pr.tax_rate / 100)), 2) AS tax_amount
-# FROM invoice_ledger il
-# LEFT JOIN invoice_registration_product pr ON pr.id = il.invoice_registration_product_id
-# WHERE il.invoice_no IS NOT NULL
-# AND invoice_type = '澧炰笓绁�'
-# GROUP BY DATE_FORMAT(il.invoice_date, '%Y-%m')
-# ORDER BY month;
-# select DATE_FORMAT(a.issue_date, '%Y-%m'), sum(a.invoice_amount) as xTaxAmount
-# from (SELECT distinct pr.id,
-# tr.issue_date,
-# ROUND(pr.tickets_amount / (1 + pr.tax_rate / 100), 2) AS un_tickets_price,
-# ROUND(pr.tickets_amount - pr.tickets_amount / (1 + pr.tax_rate / 100),
-# 2) AS invoice_amount
-# FROM product_record pr
-# LEFT JOIN purchase_ledger pl ON pl.id = pr.purchase_ledger_id
-# LEFT JOIN sales_ledger sl ON sl.id = pl.sales_ledger_id
-# LEFT JOIN ticket_registration tr ON tr.purchase_ledger_id = pl.id
-# LEFT JOIN product_model pm ON pm.id = pr.product_model_id
-# WHERE type = 2
-# and tr.invoice_number is not null) a
-# GROUP BY DATE_FORMAT(a.issue_date, '%Y-%m')
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/purchase/PaymentRegistrationMapper.xml" "b/$\173project.build.directory\175/classes/mapper/purchase/PaymentRegistrationMapper.xml"
deleted file mode 100644
index 8e8cf1c..0000000
--- "a/$\173project.build.directory\175/classes/mapper/purchase/PaymentRegistrationMapper.xml"
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.purchase.mapper.PaymentRegistrationMapper">
-
- <resultMap type="PaymentRegistration" id="PaymentRegistrationResult">
- <result property="id" column="id"/>
- <result property="saleLedgerId" column="sale_ledger_id"/>
- <result property="purchaseLedgerId" column="purchase_ledger_id"/>
- <result property="supplierId" column="supplier_id"/>
- <result property="ticketRegistrationId" column="ticket_registration_id"/>
- <result property="currentPaymentAmount" column="current_payment_amount"/>
- <result property="paymentMethod" column="payment_method"/>
- <result property="registrantId" column="registrant_id"/>
- <result property="paymentDate" column="payment_date"/>
- <result property="createTime" column="create_time"/>
- <result property="updateTime" column="update_time"/>
- <result property="tenantId" column="tenant_id"/>
- <result property="registrationtDate" column="registrationt_date"/>
- </resultMap>
-
- <resultMap type="com.ruoyi.purchase.dto.PaymentRegistrationDto" id="PaymentRegistrationDtoResult">
- <result property="id" column="id"/>
- <result property="saleLedgerId" column="sale_ledger_id"/>
- <result property="purchaseLedgerId" column="purchase_ledger_id"/>
- <result property="supplierId" column="supplier_id"/>
- <result property="ticketRegistrationId" column="ticket_registration_id"/>
- <result property="currentPaymentAmount" column="current_payment_amount"/>
- <result property="paymentMethod" column="payment_method"/>
- <result property="registrantId" column="registrant_id"/>
- <result property="paymentDate" column="payment_date"/>
- <result property="createTime" column="create_time"/>
- <result property="updateTime" column="update_time"/>
- <result property="salesContractNo" column="sales_contract_no"/>
- <result property="purchaseContractNumber" column="purchase_contract_number"/>
- <result property="supplierName" column="supplier_name"/>
- <result property="invoiceNumber" column="invoice_number"/>
- <result property="taxRate" column="tax_rate"/>
- <result property="invoiceAmount" column="invoice_amount"/>
- <result property="tenantId" column="tenant_id"/>
- <result property="registrationtDate" column="registrationt_date"/>
- </resultMap>
-
- <sql id="selectPaymentRegistrationVo">
- select pr.id,
- pr.sale_ledger_id,
- pr.purchase_ledger_id,
- pr.supplier_id,
- pr.ticket_registration_id,
- pr.current_payment_amount,
- pr.payment_method,
- pr.registrant_id,
- pr.payment_date,
- pr.create_time,
- pr.update_time,
- pr.tenant_id,
- sl.sales_contract_no as sales_contract_no,
- pl.purchase_contract_number as purchase_contract_number,
- sm.supplier_name as supplier_name,
- ip.invoice_number as invoice_number,
- ip.invoice_amount as invoice_amount,
- pr.tax_rate,
- pr.registrationt_date,
- su.nick_name as registrant
- from payment_registration pr
- left join sales_ledger sl on pr.sale_ledger_id = sl.id
- left join purchase_ledger pl on pr.purchase_ledger_id = pl.id
- left join supplier_manage sm on pr.supplier_id = sm.id
- left join ticket_registration ip on pr.ticket_registration_id = ip.id
- left join sys_user su on pr.registrant_id = su.user_id
- </sql>
-
- <select id="selectPaymentRegistrationList" parameterType="com.ruoyi.purchase.dto.PaymentRegistrationDto"
- resultMap="PaymentRegistrationDtoResult">
- <include refid="selectPaymentRegistrationVo"/>
- <where>
- <if test="supplierNameOrContractNo != null and supplierNameOrContractNo != ''">
- and sm.supplier_name LIKE CONCAT('%', #{supplierNameOrContractNo}, '%') or sl.sales_contract_no LIKE
- CONCAT('%', #{supplierNameOrContractNo}, '%')
- or pl.purchase_contract_number LIKE CONCAT('%', #{supplierNameOrContractNo}, '%')
- </if>
- </where>
- </select>
-
- <select id="selectPaymentRegistrationById" parameterType="Long" resultMap="PaymentRegistrationDtoResult">
- <include refid="selectPaymentRegistrationVo"/>
- where pr.id = #{id}
- </select>
-
- <select id="paymentHistoryList" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
- SELECT
- T1.payment_date,
- T2.supplier_name,
- T1.current_payment_amount,
- T1.payment_method,
- T3.nick_name AS registrant,
- T1.registrationt_date
- FROM
- payment_registration T1
- LEFT JOIN
- supplier_manage T2 ON T1.supplier_id = T2.id
- LEFT JOIN
- sys_user T3 ON T3.user_id = T1.registrant_id
- <where>
- <if test="params.searchText != null and params.searchText != '' ">
- AND T2.supplier_name LIKE CONCAT('%',#{params.searchText},'%')
- </if>
- </where>
- ORDER BY T1.payment_date,T1.create_time DESC
- </select>
-
- <select id="countPaymentTotalByTicketRegId" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
- SELECT
- IFNULL(SUM(current_payment_amount),0) AS paymentAmountTotal,
- ticket_registration_id
- FROM
- payment_registration
- <where>
- ticket_registration_id IN
- <foreach collection="ticketRegistrationIds" separator="," open="(" close=")" item="item">
- #{item}
- </foreach>
- </where>
- GROUP BY ticket_registration_id
- </select>
-
- <select id="getPaymentRecordList" resultType="com.ruoyi.purchase.dto.PaymentHistoryRecordVo">
- SELECT * FROM(
- SELECT
- T1.issue_date AS happenTime,
- IFNULL(T1.invoice_amount,0) AS invoiceAmount,
- '1' AS type,
- 0 AS currentPaymentAmount
- FROM
- ticket_registration T1
- LEFT JOIN purchase_ledger T2 ON T1.purchase_ledger_id = T2.id
- WHERE T2.supplier_id = #{supplierId}
- UNION
- SELECT
- payment_date AS happenTime,
- 0 AS invoiceAmount,
- '0' AS type,
- current_payment_amount AS currentPaymentAmount
- FROM payment_registration
- WHERE supplier_id = #{supplierId}
- ) T1
- ORDER BY T1.happenTime ASC
-
- </select>
-
- <select id="paymentHistoryListPage" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
- SELECT
- T1.id,
- T1.payment_date,
- T2.supplier_name,
- T1.current_payment_amount,
- T1.payment_method,
- T3.nick_name AS registrant,
- T1.registrationt_date,
- t4.purchase_contract_number,
- t5.invoice_amount,
- t5.invoice_number
- FROM
- payment_registration T1
- LEFT JOIN purchase_ledger t4 ON t4.id = T1.purchase_ledger_id
- LEFT JOIN
- supplier_manage T2 ON T1.supplier_id = T2.id
- LEFT JOIN
- sys_user T3 ON T3.user_id = T1.registrant_id
- left join ticket_registration t5 on t5.purchase_ledger_id = T1.purchase_ledger_id
- <where>
- <if test="params.searchText != null and params.searchText != '' ">
- AND T2.supplier_name LIKE CONCAT('%',#{params.searchText},'%')
- </if>
- <if test="params.paymentDateStart != null and params.paymentDateStart !='' ">
- AND T1.payment_date >= date_format(#{params.paymentDateStart},'%Y-%m-%d')
- </if>
- <if test="params.paymentDateEnd != null and params.paymentDateEnd !='' ">
- AND T1.payment_date <= date_format(#{params.paymentDateEnd},'%Y-%m-%d')
- </if>
- <if test="params.purchaseContractNumber != null and params.purchaseContractNumber !='' ">
- AND t4.purchase_contract_number LIKE CONCAT('%',#{params.purchaseContractNumber},'%')
- </if>
- </where>
- ORDER BY T1.payment_date,T1.create_time DESC
- </select>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/purchase/ProductRecordMapper.xml" "b/$\173project.build.directory\175/classes/mapper/purchase/ProductRecordMapper.xml"
deleted file mode 100644
index 5c338d7..0000000
--- "a/$\173project.build.directory\175/classes/mapper/purchase/ProductRecordMapper.xml"
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.purchase.mapper.ProductRecordMapper">
-
-
- <select id="productRecordPage" resultType="com.ruoyi.purchase.dto.ProductRecordDto">
- SELECT
- sl.sales_contract_no,
- sl.customer_contract_no,
- sl.customer_name,
- pm.model AS product_model,
- pl.purchase_contract_number,
- pl.supplier_name,
- pl.project_name,
- pr.*,
- tr.invoice_number,
- tr.iss_uer_id,
- tr.iss_uer,
- tr.id as ticketRegistrationId,
- ROUND(pr.tickets_amount/(1+pr.tax_rate/100),2 ) as un_tickets_price,
- ROUND(pr.tickets_amount-pr.tickets_amount/(1+pr.tax_rate/100),2 )as invoice_amount
- FROM product_record pr
- left join purchase_ledger pl on pl.id = pr.purchase_ledger_id
- left join sales_ledger sl on sl.id = pl.sales_ledger_id
- left join ticket_registration tr on tr.id = pr.ticket_registration_id
- left join product_model pm on pm.id = pr.product_model_id
- WHERE type = 2
- <if test="c.salesContractNo != null and c.salesContractNo != ''">
- and sl.sales_contract_no = #{c.salesContractNo}
- </if>
- <if test="c.supplierName != null and c.supplierName != ''">
- and pl.supplier_name = #{c.supplierName}
- </if>
- <if test="c.createdAtStart != null and c.createdAtStart != ''">
- and pr.created_at >= date_format(#{c.createdAtStart},'%Y-%m-%d hh:mm:ss')
- </if>
- <if test="c.createdAtEnd != null and c.createdAtEnd != ''">
- and pr.created_at <= date_format(#{c.createdAtEnd},'%Y-%m-%d hh:mm:ss')
- </if>
- <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
- and tr.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
- </if>
- </select>
- <select id="getProductRecordById" resultType="com.ruoyi.purchase.dto.ProductRecordDto">
- SELECT
- sl.sales_contract_no,
- sl.customer_contract_no,
- sl.customer_name,
- pm.model AS product_model,
- pl.purchase_contract_number,
- pl.supplier_name,
- pr.*,
- tr.invoice_number,
- ROUND(pr.tickets_amount/(1+pr.tax_rate/100),2 ) as un_tickets_price,
- ROUND(pr.tickets_amount-pr.tickets_amount/(1+pr.tax_rate/100),2 )as invoice_amount
- FROM product_record pr
- left join purchase_ledger pl on pl.id = pr.purchase_ledger_id
- left join sales_ledger sl on sl.id = pl.sales_ledger_id
- left join ticket_registration tr on tr.id = pr.ticket_registration_id
- left join product_model pm on pm.id = pr.product_model_id
-
- WHERE type = 2 and pr.id = #{id}
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/purchase/PurchaseLedgerMapper.xml" "b/$\173project.build.directory\175/classes/mapper/purchase/PurchaseLedgerMapper.xml"
deleted file mode 100644
index 4b617d1..0000000
--- "a/$\173project.build.directory\175/classes/mapper/purchase/PurchaseLedgerMapper.xml"
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.purchase.mapper.PurchaseLedgerMapper">
-
- <update id="updateContractAmountById">
- UPDATE purchase_ledger
- SET contract_amount = #{totalTaxInclusiveAmount}
- WHERE id = #{id}
- </update>
- <select id="selectPurchaseLedgerListPage" resultType="com.ruoyi.purchase.dto.PurchaseLedgerDto">
- select
- pl.id,
- pl.purchase_contract_number ,
- pl.sales_contract_no,
- pl.supplier_name,
- pl.project_name,
- pl.contract_amount,
- sum(pr.tickets_amount)as receipt_payment_amount,
- pl.contract_amount-sum(pr.tickets_amount) AS unReceipt_payment_amount,
- pl.entry_date,
- pl.recorder_name,
- pl.approval_status,
- pl.payment_method
- from purchase_ledger pl
- left join product_record pr on pl.id = pr.purchase_ledger_id
- <where>
- 1 = 1
- <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
- and pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
- </if>
- <if test="c.supplierName != null and c.supplierName != ''">
- and pl.supplier_name like concat('%',#{c.supplierName},'%')
- </if>
- <if test="c.salesContractNo != null and c.salesContractNo != ''">
- and pl.sales_contract_no like concat('%',#{c.salesContractNo},'%')
- </if>
- <if test="c.projectName != null and c.projectName != ''">
- and pl.project_name like concat('%',#{c.projectName},'%')
- </if>
- <if test="c.entryDateStart != null and c.entryDateStart != '' ">
- AND pl.entry_date >= DATE_FORMAT(#{c.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="c.entryDateEnd != null and c.entryDateEnd != '' ">
- AND pl.entry_date <= DATE_FORMAT(#{c.entryDateEnd},'%Y-%m-%d')
- </if>
- <if test="c.approvalStatus != null">
- and pl.approval_status =#{c.approvalStatus}
- </if>
- </where>
- group by pl.id, pl.purchase_contract_number, pl.sales_contract_no, pl.supplier_name,
- pl.project_name,pl.entry_date,
- pl.recorder_name,
- pl.contract_amount
-
- </select>
- <select id="getPaymentRegistrationDtoById" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
- SELECT
- T1.id,
- T1.payment_date,
- T2.supplier_name,
- T1.current_payment_amount,
- T1.payment_method,
- T3.nick_name AS registrant,
- T1.registrationt_date
- FROM
- payment_registration T1
- LEFT JOIN
- supplier_manage T2 ON T1.supplier_id = T2.id
- LEFT JOIN
- sys_user T3 ON T3.user_id = T1.registrant_id
- left join ticket_registration T4 on T1.ticket_registration_id = T4.id
- WHERE
- T4.id = #{id}
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/quality/QualityInspectFileMapper.xml" "b/$\173project.build.directory\175/classes/mapper/quality/QualityInspectFileMapper.xml"
deleted file mode 100644
index 6f4f68e..0000000
--- "a/$\173project.build.directory\175/classes/mapper/quality/QualityInspectFileMapper.xml"
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.quality.mapper.QualityInspectFileMapper">
- <select id="qualityInspectFileListPage" resultType="com.ruoyi.quality.pojo.QualityInspectFile">
- select *
- from quality_inspect_file
- where inspect_id = #{qualityInspectFile.inspectId}
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/quality/QualityInspectMapper.xml" "b/$\173project.build.directory\175/classes/mapper/quality/QualityInspectMapper.xml"
deleted file mode 100644
index 1c75087..0000000
--- "a/$\173project.build.directory\175/classes/mapper/quality/QualityInspectMapper.xml"
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.quality.mapper.QualityInspectMapper">
- <select id="qualityInspectListPage" resultType="com.ruoyi.quality.pojo.QualityInspect">
- SELECT
- *
- FROM quality_inspect
- where
- inspect_type=#{qualityInspect.inspectType}
- <if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">
- AND supplier = #{qualityInspect.supplier}
- </if>
- <if test="qualityInspect.customer != null and qualityInspect.customer != '' ">
- AND customer = #{qualityInspect.customer}
- </if>
- <if test="qualityInspect.process != null and qualityInspect.process != '' ">
- AND process = #{qualityInspect.process}
- </if>
- <if test="qualityInspect.productName != null and qualityInspect.productName != '' ">
- AND product_name = #{qualityInspect.productName}
- </if>
- <if test="qualityInspect.entryDateStart != null and qualityInspect.entryDateStart != '' ">
- AND check_time >= DATE_FORMAT(#{qualityInspect.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
- AND check_time <= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
- <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
- SELECT
- *
- FROM quality_inspect
- where
- inspect_type=#{qualityInspect.inspectType}
- <if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">
- AND supplier = #{qualityInspect.supplier}
- </if>
- <if test="qualityInspect.customer != null and qualityInspect.customer != '' ">
- AND customer = #{qualityInspect.customer}
- </if>
- <if test="qualityInspect.process != null and qualityInspect.process != '' ">
- AND process = #{qualityInspect.process}
- </if>
- <if test="qualityInspect.productName != null and qualityInspect.productName != '' ">
- AND product_name = #{qualityInspect.productName}
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/quality/QualityInspectParamMapper.xml" "b/$\173project.build.directory\175/classes/mapper/quality/QualityInspectParamMapper.xml"
deleted file mode 100644
index 47cb5ff..0000000
--- "a/$\173project.build.directory\175/classes/mapper/quality/QualityInspectParamMapper.xml"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.quality.mapper.QualityInspectParamMapper">
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/quality/QualityTestStandardMapper.xml" "b/$\173project.build.directory\175/classes/mapper/quality/QualityTestStandardMapper.xml"
deleted file mode 100644
index 96448f5..0000000
--- "a/$\173project.build.directory\175/classes/mapper/quality/QualityTestStandardMapper.xml"
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.quality.mapper.QualityTestStandardMapper">
- <select id="qualityTestStandardListPage" resultType="com.ruoyi.quality.pojo.QualityTestStandard">
- SELECT
- *
- FROM quality_test_standard
- where
- 1=1
- <if test="qualityTestStandard.productId != null and qualityTestStandard.productId != '' ">
- AND product_id = #{qualityTestStandard.productId}
- </if>
- </select>
- <select id="qualityTestStandardList" resultType="com.ruoyi.quality.pojo.QualityTestStandard">
- SELECT
- *
- FROM quality_test_standard
- where
- 1=1
- <if test="qualityTestStandard.productId != null and qualityTestStandard.productId != '' ">
- AND product_id = #{qualityTestStandard.productId}
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/quality/QualityUnqualifiedMapper.xml" "b/$\173project.build.directory\175/classes/mapper/quality/QualityUnqualifiedMapper.xml"
deleted file mode 100644
index b15e3f9..0000000
--- "a/$\173project.build.directory\175/classes/mapper/quality/QualityUnqualifiedMapper.xml"
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.quality.mapper.QualityUnqualifiedMapper">
- <select id="qualityUnqualifiedListPage" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
- SELECT
- *
- FROM quality_unqualified
- where
- 1=1
- <if test="qualityUnqualified.inspectType != null ">
- AND inspect_type = #{qualityUnqualified.inspectType}
- </if>
- <if test="qualityUnqualified.inspectState != null ">
- AND inspect_state = #{qualityUnqualified.inspectState}
- </if>
- <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
- AND product_name = #{qualityUnqualified.productName}
- </if>
- <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' ">
- AND check_time >= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
- AND check_time <= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
- <select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
- SELECT
- *
- FROM quality_unqualified
- where
- 1=1
- <if test="qualityUnqualified.inspectType != null">
- AND inspect_type = #{qualityUnqualified.inspectType}
- </if>
- <if test="qualityUnqualified.inspectState != null">
- AND inspect_state = #{qualityUnqualified.inspectState}
- </if>
- <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
- AND product_name = #{qualityUnqualified.productName}
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/sales/InvoiceLedgerMapper.xml" "b/$\173project.build.directory\175/classes/mapper/sales/InvoiceLedgerMapper.xml"
deleted file mode 100644
index 0c93e4d..0000000
--- "a/$\173project.build.directory\175/classes/mapper/sales/InvoiceLedgerMapper.xml"
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.InvoiceLedgerMapper">
- <select id="invoiceLedgerPage" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_contract_no ,
- T1.customer_id ,
- T1.invoice_no ,
- T1.invoice_amount ,
- T1.tax_rate ,
- T1.invoice_person ,
- T1.invoice_date ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id ,
- T2.customer_name,
- T3.customer_contract_no,
- T3.salesman,
- T4.invoiceFileName
- FROM invoice_ledger T1
- LEFT JOIN customer T2 ON T1.customer_id = T2.id
- LEFT JOIN sales_ledger T3 ON T1.sales_ledger_id = T3.id
- LEFT JOIN (
- SELECT
- invoice_ledger_id,
- GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
- FROM invoice_ledger_file GROUP BY invoice_ledger_id
- ) T4 ON T4.invoice_ledger_id = T1.id
- <where>
- <if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != ''">
- AND (
- T2.customer_name LIKE CONCAT('%',#{invoiceLedgerDto.searchText},'%')
- OR T1.sales_contract_no LIKE CONCAT('%',#{invoiceLedgerDto.searchText},'%')
- )
- </if>
- <if test="invoiceLedgerDto.invoiceDate != null">
- AND DATE_FORMAT(T1.invoice_date,'%Y-%m-%d') = DATE_FORMAT(#{invoiceLedgerDto.invoiceDate},'%Y-%m-%d')
- </if>
- </where>
- </select>
-
- <select id="invoiceLedgerList" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_contract_no ,
- T1.customer_id ,
- T1.invoice_no ,
- T1.invoice_amount ,
- T1.tax_rate ,
- T1.invoice_person ,
- T1.invoice_date ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id ,
- T2.customer_name,
- T3.salesman,
- T3.customer_contract_no,
- T4.invoiceFileName
- FROM invoice_ledger T1
- LEFT JOIN customer T2 ON T1.customer_id = T2.id
- LEFT JOIN sales_ledger T3 ON T1.sales_ledger_id = T3.id
- LEFT JOIN (
- SELECT
- invoice_ledger_id,
- GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
- FROM invoice_ledger_file GROUP BY invoice_ledger_id
- ) T4 ON T4.invoice_ledger_id = T1.id
- <where>
- <if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != ''">
- AND (
- T2.customer_name LIKE CONCAT('%',#{invoiceLedgerDto.searchText},'%')
- OR T1.sales_contract_no LIKE CONCAT('%',#{invoiceLedgerDto.searchText},'%')
- )
- </if>
- <if test="invoiceLedgerDto.invoiceDate != null">
- AND DATE_FORMAT(T1.invoice_date,'%Y-%m-%d') = DATE_FORMAT(#{invoiceLedgerDto.invoiceDate},'%Y-%m-%d')
- </if>
- </where>
- </select>
-
- <select id="invoiceLedgerInfo" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_contract_no ,
- T1.customer_id ,
- T1.invoice_no ,
- T1.invoice_amount ,
- T1.tax_rate ,
- T1.invoice_person ,
- T1.invoice_date ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id ,
- T2.customer_name
- FROM invoice_ledger T1
- LEFT JOIN customer T2 ON T1.customer_id = T2.id
- WHERE T1.id = #{id}
- </select>
-
- <select id="invoiceLedgerSalesAccount" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
- SELECT
- T4.id,T4.customer_name ,
- SUM(invoice_total) AS invoice_total,
- IFNULL( SUM(T5.receipt_payment_amount) , 0 ) AS receipt_payment_amount,
- IFNULL((IFNULL(SUM(invoice_total),0) - IFNULL(SUM(T5.receipt_payment_amount),0)),0) AS unReceipt_payment_amount
- FROM
- invoice_ledger T1
- LEFT JOIN invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- LEFT JOIN customer T4 ON T4.id = T3.customer_id
- LEFT JOIN ( SELECT invoice_ledger_id, SUM( receipt_payment_amount ) AS receipt_payment_amount FROM receipt_payment GROUP BY invoice_ledger_id ) T5 ON T5.invoice_ledger_id = T1.id
- <where>
- <if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != '' ">
- T4.customer_name LIKE CONCAT ('%',#{invoiceLedgerDto.searchText},'%')
- </if>
- </where>
- GROUP BY T4.id,T4.customer_name
- </select>
-
- <select id="invoiceLedgerProductInfo" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_ledger_product_id ,
- T1.invoice_registration_id ,
- T1.product_category ,
- T1.specification_model ,
- T1.unit ,
- T1.quantity ,
- T1.tax_rate ,
- T1.tax_inclusive_unit_price ,
- T1.tax_inclusive_total_price ,
- T1.tax_exclusive_total_price ,
- T1.invoice_type ,
- T1.invoice_num ,
- T1.invoice_amount ,
- T1.no_invoice_num ,
- T1.no_invoice_amount ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id,
- T2.sales_contract_no,
- T2.customer_contract_no,
- T2.customer_name,
- T3.invoice_no,
- T3.invoice_total,
- T3.invoice_person,
- T3.invoice_date,
- T3.id AS invoice_ledger_id
- FROM invoice_registration_product T1
- LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
- LEFT JOIN invoice_ledger T3 ON T1.id = T3.invoice_registration_product_id
- WHERE T1.id = #{id}
- </select>
-
- <select id="invoicedTotal" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
- SELECT
- IFNULL(SUM(T1.invoice_total),0) AS invoice_total,
- T2.sales_ledger_id
- FROM
- invoice_ledger T1
- LEFT JOIN invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
- <where>
- AND T2.sales_ledger_id IN
- <foreach collection="salesLedgerIds" item="item" open="(" close=")" separator=",">
- #{item}
- </foreach>
- </where>
- GROUP BY
- T2.sales_ledger_id
- </select>
-
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/sales/InvoiceRegistrationMapper.xml" "b/$\173project.build.directory\175/classes/mapper/sales/InvoiceRegistrationMapper.xml"
deleted file mode 100644
index 9edbea4..0000000
--- "a/$\173project.build.directory\175/classes/mapper/sales/InvoiceRegistrationMapper.xml"
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.InvoiceRegistrationMapper">
- <select id="invoiceRegistrationListPage" resultType="com.ruoyi.sales.dto.InvoiceRegistrationDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_contract_no ,
- T1.customer_id ,
- T1.salesman ,
- T1.project_name ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id,
- T2.customer_contract_no,
- T3.customer_name,
- T2.contract_amount,
- CASE WHEN T4.noInvoiceAmountTotal IS NULL THEN 0 ELSE T4.noInvoiceAmountTotal END AS noInvoiceAmountTotal
- FROM invoice_registration T1
- LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
- LEFT JOIN customer T3 ON T1.customer_id = T3.id
- LEFT JOIN (
- SELECT
- SUM( no_invoice_amount ) AS noInvoiceAmountTotal ,
- invoice_registration_id
- FROM
- invoice_registration_product
- GROUP BY
- invoice_registration_id
- ) T4 ON T1.id = T4.invoice_registration_id
- </select>
-
- <select id="invoiceRegisAndProductExcelDtoList" resultType="com.ruoyi.sales.excel.InvoiceRegisAndProductExcelDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_contract_no ,
- T1.customer_id ,
- T1.salesman ,
- T1.project_name ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id,
- T2.customer_contract_no,
- T3.customer_name,
- T2.contract_amount,
- T4.product_category,
- T4.specification_model,
- T4.unit,
- T4.quantity,
- T4.tax_rate,
- T4.tax_inclusive_unit_price,
- T4.tax_inclusive_total_price,
- T4.tax_exclusive_total_price,
- T4.invoice_type,
- T4.invoice_num,
- T4.invoice_amount,
- T4.no_invoice_num,
- T4.no_invoice_amount
- FROM invoice_registration T1
- JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
- JOIN customer T3 ON T1.customer_id = T3.id
- JOIN invoice_registration_product T4 ON T1.id = T4.invoice_registration_id
- ORDER BY T1.id ASC
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/sales/InvoiceRegistrationProductMapper.xml" "b/$\173project.build.directory\175/classes/mapper/sales/InvoiceRegistrationProductMapper.xml"
deleted file mode 100644
index 3178871..0000000
--- "a/$\173project.build.directory\175/classes/mapper/sales/InvoiceRegistrationProductMapper.xml"
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper">
-
- <select id="invoiceRegistrationProductList" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_ledger_product_id ,
- T1.invoice_registration_id ,
- T1.product_category ,
- T1.specification_model ,
- T1.unit ,
- T1.quantity ,
- T1.tax_rate ,
- T1.tax_inclusive_unit_price ,
- T1.tax_inclusive_total_price ,
- T1.tax_exclusive_total_price ,
- T1.invoice_type ,
- T1.invoice_num ,
- T1.invoice_amount ,
- T1.no_invoice_num ,
- T1.no_invoice_amount ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id,
- T2.sales_contract_no,
- T2.customer_contract_no,
- T2.customer_name,
- T3.invoice_no,
- T3.invoice_total,
- T3.invoice_person,
- T3.invoice_date,
- T4.invoiceFileName
- FROM invoice_registration_product T1
- LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
- LEFT JOIN invoice_ledger T3 ON T1.id = T3.invoice_registration_product_id
- LEFT JOIN (
- SELECT
- invoice_ledger_id,
- GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
- FROM invoice_ledger_file GROUP BY invoice_ledger_id
- ) T4 ON T4.invoice_ledger_id = T3.id
- <where>
- <if test="invoiceRegistrationProductDto.searchText != null and invoiceRegistrationProductDto.searchText != '' ">
- AND (T2.sales_contract_no LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
- OR
- T2.customer_name LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
- )
- </if>
- <if test="invoiceRegistrationProductDto.invoiceDate != null">
- AND T3.invoice_date = #{invoiceRegistrationProductDto.invoiceDate}
- </if>
- </where>
- ORDER BY T1.create_time DESC
- </select>
-
- <select id="invoiceRegistrationProductPage" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_ledger_product_id ,
- T1.invoice_registration_id ,
- T1.product_category ,
- T1.specification_model ,
- T1.unit ,
- T1.quantity ,
- T1.tax_rate ,
- T1.tax_inclusive_unit_price ,
- T1.tax_inclusive_total_price ,
- T1.tax_exclusive_total_price ,
- T1.invoice_type ,
- T1.invoice_num ,
- T1.invoice_amount ,
- T1.no_invoice_num ,
- T1.no_invoice_amount ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id,
- T2.sales_contract_no,
- T2.customer_contract_no,
- T2.customer_name,
- T3.invoice_no,
- T3.id as invoice_ledger_id,
- IFNULL(T3.invoice_total,0) AS invoice_total,
- T3.invoice_person,
- T3.invoice_date,
- T4.invoiceFileName,
- T2.project_name
- FROM invoice_registration_product T1
- LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
- RIGHT JOIN invoice_ledger T3 ON T1.id = T3.invoice_registration_product_id
- LEFT JOIN (
- SELECT
- invoice_ledger_id,
- GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
- FROM invoice_ledger_file GROUP BY invoice_ledger_id
- ) T4 ON T4.invoice_ledger_id = T3.id
- <where>
- <if test="invoiceRegistrationProductDto.searchText != null and invoiceRegistrationProductDto.searchText != '' ">
- AND (T2.sales_contract_no LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
- OR
- T2.customer_name LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
- )
- </if>
- <if test="invoiceRegistrationProductDto.invoiceDateStart != null and invoiceRegistrationProductDto.invoiceDateStart != ''">
- AND T3.invoice_date >= date_format(#{invoiceRegistrationProductDto.invoiceDateStart}, '%Y-%m-%d')
- </if>
- <if test="invoiceRegistrationProductDto.invoiceDateEnd != null and invoiceRegistrationProductDto.invoiceDateEnd != ''">
- AND T3.invoice_date <= date_format(#{invoiceRegistrationProductDto.invoiceDateEnd}, '%Y-%m-%d')
- </if>
- <if test="invoiceRegistrationProductDto.createTimeStart != null ">
- AND T1.create_time >= date_format(#{invoiceRegistrationProductDto.createTimeStart}, '%Y-%m-%d %H:%i:%s')
- </if>
- <if test="invoiceRegistrationProductDto.createTimeEnd != null ">
- AND T1.create_time <= date_format(#{invoiceRegistrationProductDto.createTimeStart}, '%Y-%m-%d %H:%i:%s')+interval 1 day
- </if>
- </where>
- ORDER BY T1.create_time DESC
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/sales/PaymentShippingMapper.xml" "b/$\173project.build.directory\175/classes/mapper/sales/PaymentShippingMapper.xml"
deleted file mode 100644
index 749c8ba..0000000
--- "a/$\173project.build.directory\175/classes/mapper/sales/PaymentShippingMapper.xml"
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.PaymentShippingMapper">
-
- <select id="listPage" resultType="com.ruoyi.sales.pojo.PaymentShipping">
- select * from payment_shipping
- <where>
- <if test="req.orderNo != null and req.orderNo != ''">
- and order_no like concat('%',#{req.orderNo},'%')
- </if>
- <if test="req.paymentStatus != null and req.paymentStatus != ''">
- and payment_status = #{req.paymentStatus}
- </if>
- <if test="req.shippingStatus != null and req.shippingStatus != ''">
- and shipping_status = #{req.shippingStatus}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/sales/ReceiptPaymentMapper.xml" "b/$\173project.build.directory\175/classes/mapper/sales/ReceiptPaymentMapper.xml"
deleted file mode 100644
index a52038b..0000000
--- "a/$\173project.build.directory\175/classes/mapper/sales/ReceiptPaymentMapper.xml"
+++ /dev/null
@@ -1,430 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.ReceiptPaymentMapper">
- <select id="receiptPaymentListPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
- SELECT
- T4.customer_id,
- IFNULL(T5.invoice_total,0) AS invoice_total,
- T1.receipt_payment_amount,
- T1.receipt_payment_date
- FROM
- receipt_payment T1
- LEFT JOIN invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
- LEFT JOIN invoice_registration_product T3 ON T2.invoice_registration_product_id = T3.id
- LEFT JOIN sales_ledger T4 ON T4.id = T3.sales_ledger_id
- LEFT JOIN (
- SELECT
- T3.customer_id,
- SUM( invoice_total ) AS invoice_total
- FROM
- invoice_ledger T1
- LEFT JOIN invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- GROUP BY T3.customer_id
- ) T5 ON T5.customer_id = T4.customer_id
- <where>
- <if test="receiptPaymentDto.customerId != null">
- AND T4.customer_id = #{receiptPaymentDto.customerId}
- </if>
- </where>
- ORDER BY T1.create_time ASC
- </select>
-
- <select id="receiptPaymentInfo" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_contract_no ,
- T1.customer_id ,
- T1.invoice_no ,
- T1.invoice_amount ,
- T1.tax_rate ,
- T1.receipt_payment_type ,
- T1.receipt_payment_amount ,
- T1.registrant ,
- T1.receipt_payment_date ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id,
- T1.invoice_ledger_id,
- T3.customer_contract_no,
- T2.customer_name
- FROM receipt_payment T1
- LEFT JOIN customer T2 ON T1.customer_id = T2.id
- LEFT JOIN sales_ledger T3 ON T1.sales_ledger_id = T3.id
- WHERE T1.id = #{id}
- </select>
-
- <select id="bindInvoiceNoRegPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
- SELECT
- T1.id ,
- T1.invoice_no ,
- T1.invoice_total ,
- T3.project_name,
- T1.invoice_person ,
- T1.invoice_date ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id ,
- T2.tax_rate,
- T3.sales_contract_no,
- T3.customer_contract_no,
- T3.customer_name,
- T4.invoiceFileName,
- T5.product_category,
- IFNULL(T6.receipt_payment_amount_total ,0) AS receipt_payment_amount_total,
- (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total ,0)) AS no_receipt_amount
- FROM invoice_ledger T1
- LEFT JOIN invoice_registration_product T2 ON T2.id = T1.invoice_registration_product_id
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- LEFT JOIN (
- SELECT
- invoice_ledger_id,
- GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
- FROM invoice_ledger_file GROUP BY invoice_ledger_id
- ) T4 ON T4.invoice_ledger_id = T1.id
- LEFT JOIN sales_ledger_product T5 ON T2.sales_ledger_product_id = T5.id
- LEFT JOIN (
- SELECT SUM(receipt_payment_amount) AS receipt_payment_amount_total,invoice_ledger_id FROM receipt_payment GROUP
- BY invoice_ledger_id
- ) T6 ON T1.id = T6.invoice_ledger_id
- <where>
- <if test="req.customerName != null and req.customerName !=''">
- AND T3.customer_name LIKE CONCAT('%',#{req.customerName},'%')
- </if>
- <if test="req.invoiceLedgerId != null">
- AND T1.id = #{req.invoiceLedgerId}
- </if>
- <if test="req.customerContractNo != null and req.customerContractNo !=''">
- AND T3.customer_contract_no LIKE CONCAT('%',#{req.customerContractNo},'%')
- </if>
- <if test="req.projectName != null and req.projectName !=''">
- AND T3.project_name LIKE CONCAT('%',#{req.projectName},'%')
- </if>
- <if test="req.invoiceDateStart != null and req.invoiceDateStart != '' ">
- AND T1.invoice_date >= DATE_FORMAT(#{req.invoiceDateStart},'%Y-%m-%d')
- </if>
- <if test="req.invoiceDateEnd != null and req.invoiceDateEnd != '' ">
- AND T1.invoice_date <= DATE_FORMAT(#{req.invoiceDateEnd},'%Y-%m-%d')
- </if>
- </where>
- ORDER BY T2.create_time DESC
- </select>
-
- <select id="invoiceInfo" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
- SELECT
- T1.id,
- T1.invoice_no,
- T1.invoice_total ,
- T2.tax_rate,
- T3.customer_name,
- T3.sales_contract_no
- FROM
- invoice_ledger T1
- LEFT JOIN
- invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- WHERE T1.id = #{id}
- </select>
-
- <select id="getReceiptAmount" resultType="java.math.BigDecimal">
- SELECT
- SUM( receipt_payment_amount ) AS total_amount
- FROM
- (
- SELECT
- T1.receipt_payment_amount
- FROM
- receipt_payment T1
- LEFT JOIN invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
- LEFT JOIN invoice_registration_product T3 ON T2.invoice_registration_product_id = T3.id
- LEFT JOIN sales_ledger T4 ON T4.id = T3.sales_ledger_id
- LEFT JOIN (
- SELECT
- T3.customer_id,
- SUM( invoice_total ) AS invoice_total
- FROM
- invoice_ledger T1
- LEFT JOIN invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- GROUP BY
- T3.customer_id
- ) T5 ON T5.customer_id = T4.customer_id
- WHERE
- T4.customer_id = #{customerId}
-
- ORDER BY
- T1.create_time ASC
- LIMIT #{total} ) AS limited_rows
- </select>
-
- <select id="receiptPaymentHistoryList" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
- SELECT
- T1.receipt_payment_date,
- T5.customer_name,
- T1.receipt_payment_amount,
- T1.receipt_payment_type,
- T1.registrant,
- T1.create_time
- FROM
- receipt_payment T1
- LEFT JOIN
- invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
- LEFT JOIN invoice_registration_product T3 ON T2.invoice_registration_product_id = T3.id
- LEFT JOIN sales_ledger T4 ON T3.sales_ledger_id = T4.id
- LEFT JOIN customer T5 ON T5.id = T4.customer_id
- <where>
- <if test="params.searchText != null and params.searchText != '' ">
- T5.customer_name LIKE CONCAT('%',#{params.searchText},'%')
- </if>
- </where>
- ORDER BY T1.receipt_payment_date DESC
- </select>
-
- <select id="receiptPaymentHistoryListPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
- SELECT
- T1.id,
- T1.receipt_payment_date,
- T5.customer_name,
- T1.receipt_payment_amount,
- T1.receipt_payment_type,
- T1.registrant,
- T1.create_time,
- T4.project_name,
- T4.sales_contract_no,
- T4.customer_contract_no
- FROM
- receipt_payment T1
- LEFT JOIN
- invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
- LEFT JOIN invoice_registration_product T3 ON T2.invoice_registration_product_id = T3.id
- LEFT JOIN sales_ledger T4 ON T3.sales_ledger_id = T4.id
- LEFT JOIN customer T5 ON T5.id = T4.customer_id
- <where>
- <if test="params.searchText != null and params.searchText != '' ">
- T5.customer_name LIKE CONCAT('%',#{params.searchText},'%')
- </if>
- <if test="params.receiptPaymentDateStart != null and params.receiptPaymentDateStart != '' ">
- AND T1.receipt_payment_date >= date_format(#{params.receiptPaymentDateStart},'%Y-%m-%d')
- </if>
- <if test="params.receiptPaymentDateEnd != null and params.receiptPaymentDateEnd != '' ">
- AND T1.receipt_payment_date <= date_format(#{params.receiptPaymentDateEnd}, '%Y-%m-%d')
- </if>
- <if test="params.projectName != null and params.projectName != '' ">
- AND T4.project_name LIKE CONCAT('%',#{params.projectName},'%')
- </if>
- <if test="params.customerContractNo != null and params.customerContractNo != '' ">
- AND T4.customer_contract_no LIKE CONCAT('%',#{params.customerContractNo},'%')
- </if>
- <if test="params.salesContractNo != null and params.salesContractNo != '' ">
- AND T4.sales_contract_no LIKE CONCAT('%',#{params.salesContractNo},'%')
- </if>
- </where>
- ORDER BY T1.receipt_payment_date DESC
- </select>
-
-
-
-
-<!-- SELECT-->
-<!-- *-->
-<!-- FROM-->
-<!-- (-->
-<!-- SELECT-->
-<!-- receipt_payment_amount AS receiptAmount,-->
-<!-- receipt_payment_date AS happenTime,-->
-<!-- 0 AS type,-->
-<!-- 0 AS invoiceAmount-->
-<!-- FROM-->
-<!-- receipt_payment-->
-<!-- WHERE-->
-<!-- invoice_ledger_id IN (-->
-<!-- SELECT-->
-<!-- id-->
-<!-- FROM-->
-<!-- invoice_ledger-->
-<!-- WHERE-->
-<!-- invoice_registration_product_id IN (-->
-<!-- SELECT-->
-<!-- id-->
-<!-- FROM-->
-<!-- invoice_registration_product-->
-<!-- WHERE-->
-<!-- sales_ledger_id IN ( SELECT id FROM sales_ledger WHERE customer_id = #{customerId} ))) UNION-->
-<!-- SELECT-->
-<!-- 0 AS receiptAmount,-->
-<!-- invoice_date AS happenTime,-->
-<!-- 1 AS type,-->
-<!-- invoice_total AS invoiceAmount-->
-<!-- FROM-->
-<!-- invoice_ledger-->
-<!-- WHERE-->
-<!-- invoice_registration_product_id IN (-->
-<!-- SELECT-->
-<!-- id-->
-<!-- FROM-->
-<!-- invoice_registration_product-->
-<!-- WHERE-->
-<!-- sales_ledger_id IN ( SELECT id FROM sales_ledger WHERE customer_id = #{customerId} ))-->
-<!-- AND invoice_date IS NOT NULL-->
-<!-- ) T1-->
-<!-- ORDER BY-->
-<!-- T1.happenTime ASC-->
-
-
- <select id="customerInteractions" resultType="com.ruoyi.sales.dto.CustomerInteractionDto">
- SELECT
- rp.receipt_payment_amount AS receiptAmount,
- rp.receipt_payment_date AS happenTime,
- 0 AS type,
- 0 AS invoiceAmount
- FROM
- receipt_payment rp
- WHERE EXISTS (
- SELECT 1
- FROM invoice_ledger il
- JOIN invoice_registration_product irp ON il.invoice_registration_product_id = irp.id
- JOIN sales_ledger sl ON irp.sales_ledger_id = sl.id
- WHERE sl.customer_id = #{customerId}
- AND rp.invoice_ledger_id = il.id
- )
-
- UNION ALL
-
- SELECT
- 0 AS receiptAmount,
- il.invoice_date AS happenTime,
- 1 AS type,
- il.invoice_total AS invoiceAmount
- FROM
- invoice_ledger il
- JOIN invoice_registration_product irp ON il.invoice_registration_product_id = irp.id
- JOIN sales_ledger sl ON irp.sales_ledger_id = sl.id
- WHERE
- sl.customer_id = #{customerId}
- AND il.invoice_date IS NOT NULL
-
- ORDER BY happenTime ASC;
- </select>
-
- <select id="receiptPaymentHistoryListNoPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
- SELECT
- T1.id,
- T1.receipt_payment_date,
- T5.customer_name,
- T1.receipt_payment_amount,
- T1.receipt_payment_type,
- T1.registrant,
- T1.create_time
- FROM
- receipt_payment T1
- LEFT JOIN
- invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
- LEFT JOIN invoice_registration_product T3 ON T2.invoice_registration_product_id = T3.id
- LEFT JOIN sales_ledger T4 ON T3.sales_ledger_id = T4.id
- LEFT JOIN customer T5 ON T5.id = T4.customer_id
- WHERE T1.invoice_ledger_id = #{params.invoiceLedgerId}
- ORDER BY T1.receipt_payment_date DESC
- </select>
-
- <select id="receiptPaymentListByProdRegId" resultType="com.ruoyi.sales.pojo.ReceiptPayment">
- SELECT
- T1.*
- FROM
- receipt_payment T1
- LEFT JOIN invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
- WHERE
- T2.invoice_registration_product_id = #{invoiceRegistrationProductId}
- </select>
- <select id="bindInvoiceNoRegListAll" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
- SELECT
- T1.id ,
- T1.invoice_no ,
- T1.invoice_total ,
- T3.project_name,
- T1.invoice_person ,
- T1.invoice_date ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id ,
- T2.tax_rate,
- T3.sales_contract_no,
- T3.customer_contract_no,
- T3.customer_name,
- T4.invoiceFileName,
- T5.product_category,
- IFNULL(T6.receipt_payment_amount_total ,0) AS receipt_payment_amount_total,
- (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total ,0)) AS no_receipt_amount
- FROM invoice_ledger T1
- LEFT JOIN invoice_registration_product T2 ON T2.id = T1.invoice_registration_product_id
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- LEFT JOIN (
- SELECT
- invoice_ledger_id,
- GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
- FROM invoice_ledger_file GROUP BY invoice_ledger_id
- ) T4 ON T4.invoice_ledger_id = T1.id
- LEFT JOIN sales_ledger_product T5 ON T2.sales_ledger_product_id = T5.id
- LEFT JOIN (
- SELECT SUM(receipt_payment_amount) AS receipt_payment_amount_total,invoice_ledger_id FROM receipt_payment GROUP
- BY invoice_ledger_id
- ) T6 ON T1.id = T6.invoice_ledger_id
- </select>
- <select id="bindInvoiceNoRegListByIds" resultType="com.ruoyi.sales.dto.ReceiptPaymentExeclDto">
- SELECT
- T1.id ,
- T1.invoice_no ,
- T1.invoice_total ,
- T3.project_name,
- T1.invoice_person ,
- T1.invoice_date ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id ,
- T2.tax_rate,
- T3.sales_contract_no,
- T3.customer_contract_no,
- T3.customer_name,
- T4.invoiceFileName,
- T5.product_category,
- IFNULL(T6.receipt_payment_amount_total ,0) AS receipt_payment_amount_total,
- (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total ,0)) AS no_receipt_amount
- FROM invoice_ledger T1
- LEFT JOIN invoice_registration_product T2 ON T2.id = T1.invoice_registration_product_id
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- LEFT JOIN (
- SELECT
- invoice_ledger_id,
- GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
- FROM invoice_ledger_file GROUP BY invoice_ledger_id
- ) T4 ON T4.invoice_ledger_id = T1.id
- LEFT JOIN sales_ledger_product T5 ON T2.sales_ledger_product_id = T5.id
- LEFT JOIN (
- SELECT SUM(receipt_payment_amount) AS receipt_payment_amount_total,invoice_ledger_id FROM receipt_payment GROUP
- BY invoice_ledger_id
- ) T6 ON T1.id = T6.invoice_ledger_id
- <where>
- <if test="ids.size() > 0">
- T1.id IN
- <foreach item="item" collection="ids" separator="," open="(" close=")">
- #{item}
- </foreach>
- </if>
- <if test="tenantId != null " >
- AND T1.tenant_id = #{tenantId}
- </if>
- </where>
-
- </select>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/sales/SalesLedgerMapper.xml" "b/$\173project.build.directory\175/classes/mapper/sales/SalesLedgerMapper.xml"
deleted file mode 100644
index b06878b..0000000
--- "a/$\173project.build.directory\175/classes/mapper/sales/SalesLedgerMapper.xml"
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.SalesLedgerMapper">
-
- <select id="selectSequencesByDate" resultType="java.lang.Integer">
- SELECT CAST(SUBSTR(sales_contract_no,LENGTH(#{datePart})+1 , 3) AS SIGNED)
- FROM sales_ledger
- WHERE sales_contract_no LIKE CONCAT('%',#{datePart},'%')
- </select>
- <select id="getSalesNo" resultType="com.ruoyi.sales.pojo.SalesLedger">
-
- </select>
-
- <select id="selectSalesLedgerList" resultType="com.ruoyi.sales.pojo.SalesLedger">
- SELECT
- T1.id,
- T1.sales_contract_no,
- T1.customer_contract_no,
- T1.project_name,
- T1.entry_date,
- T1.salesman,
- T1.customer_id,
- T1.customer_name,
- T1.entry_person,
- T1.remarks,
- T1.attachment_materials,
- T1.tenant_id,
- T1.contract_amount,
- T1.execution_date,
- T2.nick_name AS entry_person_name,
- T1.payment_method
- FROM
- sales_ledger T1
- LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
- <where>
- <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
- </if>
- </where>
- </select>
-
- <select id="selectSalesLedgerListPage" resultType="com.ruoyi.sales.pojo.SalesLedger">
- SELECT
- T1.id,
- T1.sales_contract_no,
- T1.customer_contract_no,
- T1.project_name,
- T1.entry_date,
- T1.salesman,
- T1.customer_id,
- T1.customer_name,
- T1.entry_person,
- T1.remarks,
- T1.attachment_materials,
- T1.tenant_id,
- T1.contract_amount,
- T1.execution_date,
- T1.approval_status,
- T1.sales_type,
- T2.nick_name AS entry_person_name,
- T1.payment_method
- FROM
- sales_ledger T1
- LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
- <where>
- <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
- </if>
- <if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
- AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
- </if>
- <if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
- AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
- </if>
- <if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
- AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
- </if>
- <if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
- AND T1.entry_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
- AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
- </if>
- <if test="salesLedgerDto.approvalStatus != null">
- AND T1.approval_status =#{salesLedgerDto.approvalStatus}
- </if>
- </where>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/sales/SalesQuotationMapper.xml" "b/$\173project.build.directory\175/classes/mapper/sales/SalesQuotationMapper.xml"
deleted file mode 100644
index a39cd45..0000000
--- "a/$\173project.build.directory\175/classes/mapper/sales/SalesQuotationMapper.xml"
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.SalesQuotationMapper">
- <select id="listPage" resultType="com.ruoyi.sales.dto.SalesQuotationDto">
- SELECT * FROM sales_quotation
- WHERE 1=1
- <if test="salesQuotationDto.quotationNo != null and salesQuotationDto.quotationNo != '' ">
- AND quotation_no LIKE CONCAT('%',#{salesQuotationDto.quotationNo},'%')
- </if>
- <if test="salesQuotationDto.customer != null and salesQuotationDto.customer != '' ">
- AND customer = #{salesQuotationDto.customer}
- </if>
- <if test="salesQuotationDto.status != null and salesQuotationDto.status != '' ">
- AND status = #{salesQuotationDto.status}
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/sales/SalesQuotationProductMapper.xml" "b/$\173project.build.directory\175/classes/mapper/sales/SalesQuotationProductMapper.xml"
deleted file mode 100644
index fa3745e..0000000
--- "a/$\173project.build.directory\175/classes/mapper/sales/SalesQuotationProductMapper.xml"
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.SalesQuotationProductMapper">
-<!-- <select id="selectBySalesQuotationIds" resultType="com.ruoyi.sales.pojo.SalesQuotationProduct">-->
-<!-- select * from sales_quotation_product where sales_quotation_id in-->
-<!-- <foreach collection="salesQuotationIds" item="salesQuotationId" open="(" close=")" separator=",">-->
-<!-- #{salesQuotationId}-->
-<!-- </foreach>-->
-<!-- </select>-->
- <select id="selectBySalesQuotationId" resultType="com.ruoyi.sales.pojo.SalesQuotationProduct">
- select * from sales_quotation_product where sales_quotation_id = #{id}
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/sales/SalespersonManagementMapper.xml" "b/$\173project.build.directory\175/classes/mapper/sales/SalespersonManagementMapper.xml"
deleted file mode 100644
index 3a2049d..0000000
--- "a/$\173project.build.directory\175/classes/mapper/sales/SalespersonManagementMapper.xml"
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.SalespersonManagementMapper">
-
- <select id="listPage" resultType="com.ruoyi.sales.pojo.SalespersonManagement">
- select * from salesperson_management
- <where>
- <if test="req.name != null and req.name != ''">
- and `name` like concat('%',#{req.name},'%')
- </if>
- <if test="req.department != null and req.department != ''">
- and department = #{req.department}
- </if>
- <if test="req.status != null and req.status != ''">
- and status = #{req.status}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/sales/ShippingInfoMapper.xml" "b/$\173project.build.directory\175/classes/mapper/sales/ShippingInfoMapper.xml"
deleted file mode 100644
index a23a02c..0000000
--- "a/$\173project.build.directory\175/classes/mapper/sales/ShippingInfoMapper.xml"
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.ShippingInfoMapper">
-
- <select id="listPage" resultType="com.ruoyi.sales.vo.ShippingInfoVo">
- SELECT
- s.id,
- s.sales_ledger_id,
- s.shipping_date,
- s.shipping_car_number,
- s.create_time,
- s.update_time,
- s.create_user,
- s.update_user,
- s.tenant_id,
- sl.sales_contract_no,
- sl.customer_name,
- slp.product_category,
- slp.specification_model,
- slp.quantity
- FROM shipping_info s
- LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
- left join sales_ledger_product slp on slp.id = s.sales_ledger_product_id and slp.type = 1
- WHERE 1=1
- <if test="req.salesContractNo != null and req.salesContractNo != ''">
- AND sl.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
- </if>
- <if test="req.productCategory != null and req.productCategory != ''">
- AND slp.product_category LIKE CONCAT('%',#{req.productCategory},'%')
- </if>
- <if test="req.shippingCarNumber != null and req.shippingCarNumber != ''">
- AND s.shipping_car_number LIKE CONCAT('%',#{req.shippingCarNumber},'%')
- </if>
- </select>
- <select id="listAll" resultType="com.ruoyi.sales.pojo.ShippingInfo">
- SELECT
- s.id,
- s.sales_ledger_id,
- s.shipping_date,
- s.shipping_car_number,
- s.create_time,
- s.update_time,
- s.create_user,
- s.update_user,
- s.tenant_id,
- sl.sales_contract_no,
- sl.customer_name
- FROM shipping_info s
- LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/staff/HolidayApplicationMapper.xml" "b/$\173project.build.directory\175/classes/mapper/staff/HolidayApplicationMapper.xml"
deleted file mode 100644
index b0bda29..0000000
--- "a/$\173project.build.directory\175/classes/mapper/staff/HolidayApplicationMapper.xml"
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.staff.mapper.HolidayApplicationMapper">
-
-
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/staff/PersonalAttendanceRecordsMapper.xml" "b/$\173project.build.directory\175/classes/mapper/staff/PersonalAttendanceRecordsMapper.xml"
deleted file mode 100644
index 13d3513..0000000
--- "a/$\173project.build.directory\175/classes/mapper/staff/PersonalAttendanceRecordsMapper.xml"
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.staff.mapper.PersonalAttendanceRecordsMapper">
-
-
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/staff/StaffJoinLeaveRecordMapper.xml" "b/$\173project.build.directory\175/classes/mapper/staff/StaffJoinLeaveRecordMapper.xml"
deleted file mode 100644
index d720d37..0000000
--- "a/$\173project.build.directory\175/classes/mapper/staff/StaffJoinLeaveRecordMapper.xml"
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper">
- <select id="staffJoinLeaveRecordListPage" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
- SELECT
- *
- FROM staff_join_leave_record
- where
- staff_state = #{staffJoinLeaveRecord.staffState}
- <if test="staffJoinLeaveRecord.staffName != null and staffJoinLeaveRecord.staffName != '' ">
- AND staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%')
- </if>
- <if test="staffJoinLeaveRecord.entryDateStart != null and staffJoinLeaveRecord.entryDateStart != '' ">
- and contract_start_time like concat('%',#{staffJoinLeaveRecord.entryDateStart},'%')
- </if>
- <if test="staffJoinLeaveRecord.entryDateEnd != null and staffJoinLeaveRecord.entryDateEnd != '' ">
- and contract_end_time like concat('%',#{staffJoinLeaveRecord.entryDateEnd},'%')
- </if>
- order by create_time desc
- </select>
- <select id="staffJoinLeaveRecordList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
- SELECT
- *
- FROM staff_join_leave_record
- where
- staff_state = #{staffJoinLeaveRecord.staffState}
- <if test="staffJoinLeaveRecord.staffName != null and staffJoinLeaveRecord.staffName != '' ">
- AND staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%')
- </if>
- </select>
- <select id="staffOnJobList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
- select *
- from (select *,
- ROW_NUMBER() over (PARTITION BY staff_no ORDER BY create_time DESC ) as rn
- from staff_join_leave_record
- where staff_state = 1) t
- where rn = 1
-
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/staff/StaffOnJobMapper.xml" "b/$\173project.build.directory\175/classes/mapper/staff/StaffOnJobMapper.xml"
deleted file mode 100644
index 25e79b8..0000000
--- "a/$\173project.build.directory\175/classes/mapper/staff/StaffOnJobMapper.xml"
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.staff.mapper.StaffOnJobMapper">
- <select id="staffOnJobListPage" resultType="com.ruoyi.staff.pojo.StaffOnJob">
- SELECT
- *
- FROM staff_on_job
- where 1=1
- <if test="staffOnJob.staffState != null and staffOnJob.staffState != '' ">
- AND staff_state = #{staffOnJob.staffState}
- </if>
- <if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
- AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
- </if>
- <if test="staffOnJob.entryDateStart != null and staffOnJob.entryDateStart != '' ">
- AND contract_expire_time >= DATE_FORMAT(#{staffOnJob.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="staffOnJob.entryDateEnd != null and staffOnJob.entryDateEnd != '' ">
- AND contract_expire_time <= DATE_FORMAT(#{staffOnJob.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
- <select id="staffOnJobList" resultType="com.ruoyi.staff.pojo.StaffOnJob">
- SELECT
- *
- FROM staff_on_job
- where 1=1
- <if test="staffOnJob.staffState != null and staffOnJob.staffState != '' ">
- AND staff_state = #{staffOnJob.staffState}
- </if>
- <if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
- AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/staff/StaffSchedulingMapper.xml" "b/$\173project.build.directory\175/classes/mapper/staff/StaffSchedulingMapper.xml"
deleted file mode 100644
index 1a32ef1..0000000
--- "a/$\173project.build.directory\175/classes/mapper/staff/StaffSchedulingMapper.xml"
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.staff.mapper.StaffSchedulingMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.staff.pojo.StaffScheduling">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="staffId" column="staff_id" jdbcType="INTEGER"/>
- <result property="department" column="department" jdbcType="INTEGER"/>
- <result property="shiftType" column="shift_type" jdbcType="INTEGER"/>
- <result property="workDate" column="work_date" jdbcType="DATE"/>
- <result property="workStartTime" column="work_start_time" jdbcType="TIMESTAMP"/>
- <result property="workEndTime" column="work_end_time" jdbcType="TIMESTAMP"/>
- <result property="workHours" column="work_hours" jdbcType="DECIMAL"/>
- <result property="status" column="status" jdbcType="INTEGER"/>
- <result property="remark" column="remark" jdbcType="VARCHAR"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="createUser" column="create_user" jdbcType="BIGINT"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id,staff_id,department,
- shift_type,work_date,work_start_time,
- work_end_time,work_hours,status,
- remark,create_time,create_user,
- update_time,update_user,tenant_id
- </sql>
- <select id="listPage" resultType="com.ruoyi.staff.dto.StaffSchedulingDto">
- SELECT
- t1.*,t2.staff_name as 'staff_name' ,t2.staff_no as 'staff_no'
- FROM staff_scheduling t1
- left join staff_join_leave_record t2 on t1.staff_id = t2.id
- where 1=1
- <if test="vo.staffName != null and vo.staffName != '' ">
- AND t2.staff_name LIKE CONCAT('%', #{vo.staffName}, '%')
- </if>
- <if test="vo.shiftType != null and vo.shiftType != '' ">
- AND t1.shift_type = #{vo.shiftType}
- </if>
- <if test="vo.startDate != null ">
- AND t1.work_date >= DATE_FORMAT(#{vo.startDate},'%Y-%m-%d')
- </if>
- <if test="vo.endDate != null ">
- AND t1.work_date <![CDATA[ <= ]]> DATE_FORMAT(#{vo.endDate},'%Y-%m-%d')
- </if>
- ORDER BY t1.create_time DESC
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/system/SysConfigMapper.xml" "b/$\173project.build.directory\175/classes/mapper/system/SysConfigMapper.xml"
deleted file mode 100644
index 8681f70..0000000
--- "a/$\173project.build.directory\175/classes/mapper/system/SysConfigMapper.xml"
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysConfigMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysConfig" id="SysConfigResult">
- <id property="configId" column="config_id" />
- <result property="configName" column="config_name" />
- <result property="configKey" column="config_key" />
- <result property="configValue" column="config_value" />
- <result property="configType" column="config_type" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- </resultMap>
-
- <sql id="selectConfigVo">
- select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark
- from sys_config
- </sql>
-
- <!-- 鏌ヨ鏉′欢 -->
- <sql id="sqlwhereSearch">
- <where>
- <if test="configId !=null">
- and config_id = #{configId}
- </if>
- <if test="configKey !=null and configKey != ''">
- and config_key = #{configKey}
- </if>
- </where>
- </sql>
-
- <select id="selectConfig" parameterType="com.ruoyi.project.system.domain.SysConfig" resultMap="SysConfigResult">
- <include refid="selectConfigVo"/>
- <include refid="sqlwhereSearch"/>
- </select>
-
- <select id="selectConfigList" parameterType="com.ruoyi.project.system.domain.SysConfig" resultMap="SysConfigResult">
- <include refid="selectConfigVo"/>
- <where>
- <if test="configName != null and configName != ''">
- AND config_name like concat('%', #{configName}, '%')
- </if>
- <if test="configType != null and configType != ''">
- AND config_type = #{configType}
- </if>
- <if test="configKey != null and configKey != ''">
- AND config_key like concat('%', #{configKey}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
- </if>
- </where>
- </select>
-
- <select id="selectConfigById" parameterType="Long" resultMap="SysConfigResult">
- <include refid="selectConfigVo"/>
- where config_id = #{configId}
- </select>
-
- <select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">
- <include refid="selectConfigVo"/>
- where config_key = #{configKey} limit 1
- </select>
-
- <insert id="insertConfig" parameterType="com.ruoyi.project.system.domain.SysConfig">
- insert into sys_config (
- <if test="configName != null and configName != '' ">config_name,</if>
- <if test="configKey != null and configKey != '' ">config_key,</if>
- <if test="configValue != null and configValue != '' ">config_value,</if>
- <if test="configType != null and configType != '' ">config_type,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- <if test="remark != null and remark != ''">remark,</if>
- create_time
- )values(
- <if test="configName != null and configName != ''">#{configName},</if>
- <if test="configKey != null and configKey != ''">#{configKey},</if>
- <if test="configValue != null and configValue != ''">#{configValue},</if>
- <if test="configType != null and configType != ''">#{configType},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateConfig" parameterType="com.ruoyi.project.system.domain.SysConfig">
- update sys_config
- <set>
- <if test="configName != null and configName != ''">config_name = #{configName},</if>
- <if test="configKey != null and configKey != ''">config_key = #{configKey},</if>
- <if test="configValue != null and configValue != ''">config_value = #{configValue},</if>
- <if test="configType != null and configType != ''">config_type = #{configType},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- <if test="remark != null">remark = #{remark},</if>
- update_time = sysdate()
- </set>
- where config_id = #{configId}
- </update>
-
- <delete id="deleteConfigById" parameterType="Long">
- delete from sys_config where config_id = #{configId}
- </delete>
-
- <delete id="deleteConfigByIds" parameterType="Long">
- delete from sys_config where config_id in
- <foreach item="configId" collection="array" open="(" separator="," close=")">
- #{configId}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/system/SysDeptMapper.xml" "b/$\173project.build.directory\175/classes/mapper/system/SysDeptMapper.xml"
deleted file mode 100644
index 5c6310a..0000000
--- "a/$\173project.build.directory\175/classes/mapper/system/SysDeptMapper.xml"
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysDeptMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysDept" id="SysDeptResult">
- <id property="deptId" column="dept_id" />
- <result property="parentId" column="parent_id" />
- <result property="ancestors" column="ancestors" />
- <result property="deptName" column="dept_name" />
- <result property="orderNum" column="order_num" />
- <result property="leader" column="leader" />
- <result property="phone" column="phone" />
- <result property="email" column="email" />
- <result property="status" column="status" />
- <result property="delFlag" column="del_flag" />
- <result property="parentName" column="parent_name" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- </resultMap>
-
- <sql id="selectDeptVo">
- select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
- from sys_dept d
- </sql>
-
- <select id="selectDeptList" parameterType="com.ruoyi.project.system.domain.SysDept" resultMap="SysDeptResult">
- <include refid="selectDeptVo"/>
- where d.del_flag = '0'
- <if test="deptId != null and deptId != 0">
- AND dept_id = #{deptId}
- </if>
- <if test="parentId != null and parentId != 0">
- AND parent_id = #{parentId}
- </if>
- <if test="deptName != null and deptName != ''">
- AND dept_name like concat('%', #{deptName}, '%')
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
- order by d.parent_id, d.order_num
- </select>
-
- <select id="selectDeptListByRoleId" resultType="Long">
- select d.dept_id
- from sys_dept d
- left join sys_role_dept rd on d.dept_id = rd.dept_id
- where rd.role_id = #{roleId}
- <if test="deptCheckStrictly">
- and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
- </if>
- order by d.parent_id, d.order_num
- </select>
-
- <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
- select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
- (select dept_name from sys_dept where dept_id = d.parent_id) parent_name,
- d.dept_nick
- from sys_dept d
- where d.dept_id = #{deptId}
- </select>
-
- <select id="checkDeptExistUser" parameterType="Long" resultType="int">
- select count(1) from sys_user_dept where dept_id = #{deptId}
- </select>
-
- <select id="hasChildByDeptId" parameterType="Long" resultType="int">
- select count(1) from sys_dept
- where del_flag = '0' and parent_id = #{deptId} limit 1
- </select>
-
- <select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
- select * from sys_dept where find_in_set(#{deptId}, ancestors)
- </select>
-
- <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
- select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
- </select>
-
- <select id="checkDeptNameUnique" resultMap="SysDeptResult">
- <include refid="selectDeptVo"/>
- where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
- </select>
-
- <insert id="insertDept" parameterType="com.ruoyi.project.system.domain.SysDept">
- insert into sys_dept(
- <if test="deptId != null and deptId != 0">dept_id,</if>
- <if test="parentId != null and parentId != 0">parent_id,</if>
- <if test="deptName != null and deptName != ''">dept_name,</if>
- <if test="ancestors != null and ancestors != ''">ancestors,</if>
- <if test="orderNum != null">order_num,</if>
- <if test="leader != null and leader != ''">leader,</if>
- <if test="phone != null and phone != ''">phone,</if>
- <if test="email != null and email != ''">email,</if>
- <if test="deptNick != null and deptNick != ''">dept_nick,</if>
- <if test="status != null">status,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="deptId != null and deptId != 0">#{deptId},</if>
- <if test="parentId != null and parentId != 0">#{parentId},</if>
- <if test="deptName != null and deptName != ''">#{deptName},</if>
- <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
- <if test="orderNum != null">#{orderNum},</if>
- <if test="leader != null and leader != ''">#{leader},</if>
- <if test="phone != null and phone != ''">#{phone},</if>
- <if test="email != null and email != ''">#{email},</if>
- <if test="deptNick != null and deptNick != '' ">#{deptNick},</if>
- <if test="status != null">#{status},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateDept" parameterType="com.ruoyi.project.system.domain.SysDept">
- update sys_dept
- <set>
- <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
- <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
- <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
- <if test="orderNum != null">order_num = #{orderNum},</if>
- <if test="leader != null">leader = #{leader},</if>
- <if test="phone != null">phone = #{phone},</if>
- <if test="email != null">email = #{email},</if>
- <if test="deptNick != null and deptNick != '' ">dept_nick = #{deptNick},</if>
- <if test="status != null and status != ''">status = #{status},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where dept_id = #{deptId}
- </update>
-
- <update id="updateDeptChildren" parameterType="java.util.List">
- update sys_dept set ancestors =
- <foreach collection="depts" item="item" index="index"
- separator=" " open="case dept_id" close="end">
- when #{item.deptId} then #{item.ancestors}
- </foreach>
- where dept_id in
- <foreach collection="depts" item="item" index="index"
- separator="," open="(" close=")">
- #{item.deptId}
- </foreach>
- </update>
-
- <update id="updateDeptStatusNormal" parameterType="Long">
- update sys_dept set status = '0' where dept_id in
- <foreach collection="array" item="deptId" open="(" separator="," close=")">
- #{deptId}
- </foreach>
- </update>
-
- <delete id="deleteDeptById" parameterType="Long">
- update sys_dept set del_flag = '2' where dept_id = #{deptId}
- </delete>
-
- <select id="maxLevelDeptId">
- WITH RECURSIVE DepartmentHierarchy AS (
- SELECT dept_id, parent_id
- FROM sys_dept
- WHERE dept_id = #{deptId}
-
- UNION ALL
-
- -- 閫掑綊鎯呭喌锛氬姞鍏ュ綋鍓嶉儴闂ㄧ殑鐖剁骇閮ㄩ棬
- SELECT d.dept_id, d.parent_id
- FROM sys_dept d
- INNER JOIN DepartmentHierarchy dh ON d.dept_id = dh.parent_id
- )
- -- 鏌ヨ鏈�椤剁骇鐨勭埗绾ч儴闂↖D
- SELECT dept_id as top_level_department_id
- FROM DepartmentHierarchy
- WHERE parent_id = 100;
- </select>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/system/SysDictDataMapper.xml" "b/$\173project.build.directory\175/classes/mapper/system/SysDictDataMapper.xml"
deleted file mode 100644
index 148b58e..0000000
--- "a/$\173project.build.directory\175/classes/mapper/system/SysDictDataMapper.xml"
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysDictDataMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysDictData" id="SysDictDataResult">
- <id property="dictCode" column="dict_code" />
- <result property="dictSort" column="dict_sort" />
- <result property="dictLabel" column="dict_label" />
- <result property="dictValue" column="dict_value" />
- <result property="dictType" column="dict_type" />
- <result property="cssClass" column="css_class" />
- <result property="listClass" column="list_class" />
- <result property="isDefault" column="is_default" />
- <result property="status" column="status" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- </resultMap>
-
- <sql id="selectDictDataVo">
- select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark
- from sys_dict_data
- </sql>
-
- <select id="selectDictDataList" parameterType="com.ruoyi.project.system.domain.SysDictData" resultMap="SysDictDataResult">
- <include refid="selectDictDataVo"/>
- <where>
- <if test="dictType != null and dictType != ''">
- AND dict_type = #{dictType}
- </if>
- <if test="dictLabel != null and dictLabel != ''">
- AND dict_label like concat('%', #{dictLabel}, '%')
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- </where>
- order by dict_sort asc
- </select>
-
- <select id="selectDictDataByType" parameterType="String" resultMap="SysDictDataResult">
- <include refid="selectDictDataVo"/>
- where status = '0' and dict_type = #{dictType} order by dict_sort asc
- </select>
-
- <select id="selectDictLabel" resultType="String">
- select dict_label from sys_dict_data
- where dict_type = #{dictType} and dict_value = #{dictValue}
- </select>
-
- <select id="selectDictDataById" parameterType="Long" resultMap="SysDictDataResult">
- <include refid="selectDictDataVo"/>
- where dict_code = #{dictCode}
- </select>
-
- <select id="countDictDataByType" resultType="Integer">
- select count(1) from sys_dict_data where dict_type=#{dictType}
- </select>
-
- <delete id="deleteDictDataById" parameterType="Long">
- delete from sys_dict_data where dict_code = #{dictCode}
- </delete>
-
- <delete id="deleteDictDataByIds" parameterType="Long">
- delete from sys_dict_data where dict_code in
- <foreach collection="array" item="dictCode" open="(" separator="," close=")">
- #{dictCode}
- </foreach>
- </delete>
-
- <update id="updateDictData" parameterType="com.ruoyi.project.system.domain.SysDictData">
- update sys_dict_data
- <set>
- <if test="dictSort != null">dict_sort = #{dictSort},</if>
- <if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if>
- <if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>
- <if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
- <if test="cssClass != null">css_class = #{cssClass},</if>
- <if test="listClass != null">list_class = #{listClass},</if>
- <if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if>
- <if test="status != null">status = #{status},</if>
- <if test="remark != null">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where dict_code = #{dictCode}
- </update>
-
- <update id="updateDictDataType" parameterType="String">
- update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType}
- </update>
-
- <insert id="insertDictData" parameterType="com.ruoyi.project.system.domain.SysDictData">
- insert into sys_dict_data(
- <if test="dictSort != null">dict_sort,</if>
- <if test="dictLabel != null and dictLabel != ''">dict_label,</if>
- <if test="dictValue != null and dictValue != ''">dict_value,</if>
- <if test="dictType != null and dictType != ''">dict_type,</if>
- <if test="cssClass != null and cssClass != ''">css_class,</if>
- <if test="listClass != null and listClass != ''">list_class,</if>
- <if test="isDefault != null and isDefault != ''">is_default,</if>
- <if test="status != null">status,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="dictSort != null">#{dictSort},</if>
- <if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
- <if test="dictValue != null and dictValue != ''">#{dictValue},</if>
- <if test="dictType != null and dictType != ''">#{dictType},</if>
- <if test="cssClass != null and cssClass != ''">#{cssClass},</if>
- <if test="listClass != null and listClass != ''">#{listClass},</if>
- <if test="isDefault != null and isDefault != ''">#{isDefault},</if>
- <if test="status != null">#{status},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/system/SysDictTypeMapper.xml" "b/$\173project.build.directory\175/classes/mapper/system/SysDictTypeMapper.xml"
deleted file mode 100644
index 1cf1349..0000000
--- "a/$\173project.build.directory\175/classes/mapper/system/SysDictTypeMapper.xml"
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysDictTypeMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysDictType" id="SysDictTypeResult">
- <id property="dictId" column="dict_id" />
- <result property="dictName" column="dict_name" />
- <result property="dictType" column="dict_type" />
- <result property="status" column="status" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- </resultMap>
-
- <sql id="selectDictTypeVo">
- select dict_id, dict_name, dict_type, status, create_by, create_time, remark
- from sys_dict_type
- </sql>
-
- <select id="selectDictTypeList" parameterType="com.ruoyi.project.system.domain.SysDictType" resultMap="SysDictTypeResult">
- <include refid="selectDictTypeVo"/>
- <where>
- <if test="dictName != null and dictName != ''">
- AND dict_name like concat('%', #{dictName}, '%')
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <if test="dictType != null and dictType != ''">
- AND dict_type like concat('%', #{dictType}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
- </if>
- </where>
- </select>
-
- <select id="selectDictTypeAll" resultMap="SysDictTypeResult">
- <include refid="selectDictTypeVo"/>
- </select>
-
- <select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
- <include refid="selectDictTypeVo"/>
- where dict_id = #{dictId}
- </select>
-
- <select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
- <include refid="selectDictTypeVo"/>
- where dict_type = #{dictType}
- </select>
-
- <select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
- <include refid="selectDictTypeVo"/>
- where dict_type = #{dictType} limit 1
- </select>
-
- <delete id="deleteDictTypeById" parameterType="Long">
- delete from sys_dict_type where dict_id = #{dictId}
- </delete>
-
- <delete id="deleteDictTypeByIds" parameterType="Long">
- delete from sys_dict_type where dict_id in
- <foreach collection="array" item="dictId" open="(" separator="," close=")">
- #{dictId}
- </foreach>
- </delete>
-
- <update id="updateDictType" parameterType="com.ruoyi.project.system.domain.SysDictType">
- update sys_dict_type
- <set>
- <if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
- <if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
- <if test="status != null">status = #{status},</if>
- <if test="remark != null">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where dict_id = #{dictId}
- </update>
-
- <insert id="insertDictType" parameterType="com.ruoyi.project.system.domain.SysDictType">
- insert into sys_dict_type(
- <if test="dictName != null and dictName != ''">dict_name,</if>
- <if test="dictType != null and dictType != ''">dict_type,</if>
- <if test="status != null">status,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="dictName != null and dictName != ''">#{dictName},</if>
- <if test="dictType != null and dictType != ''">#{dictType},</if>
- <if test="status != null">#{status},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/system/SysJobLogMapper.xml" "b/$\173project.build.directory\175/classes/mapper/system/SysJobLogMapper.xml"
deleted file mode 100644
index 387e859..0000000
--- "a/$\173project.build.directory\175/classes/mapper/system/SysJobLogMapper.xml"
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.monitor.mapper.SysJobLogMapper">
-
- <resultMap type="com.ruoyi.project.monitor.domain.SysJobLog" id="SysJobLogResult">
- <id property="jobLogId" column="job_log_id" />
- <result property="jobName" column="job_name" />
- <result property="jobGroup" column="job_group" />
- <result property="invokeTarget" column="invoke_target" />
- <result property="jobMessage" column="job_message" />
- <result property="status" column="status" />
- <result property="exceptionInfo" column="exception_info" />
- <result property="createTime" column="create_time" />
- </resultMap>
-
- <sql id="selectJobLogVo">
- select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time
- from sys_job_log
- </sql>
-
- <select id="selectJobLogList" parameterType="com.ruoyi.project.monitor.domain.SysJobLog" resultMap="SysJobLogResult">
- <include refid="selectJobLogVo"/>
- <where>
- <if test="jobName != null and jobName != ''">
- AND job_name like concat('%', #{jobName}, '%')
- </if>
- <if test="jobGroup != null and jobGroup != ''">
- AND job_group = #{jobGroup}
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <if test="invokeTarget != null and invokeTarget != ''">
- AND invoke_target like concat('%', #{invokeTarget}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
- </if>
- </where>
- order by create_time desc
- </select>
-
- <select id="selectJobLogAll" resultMap="SysJobLogResult">
- <include refid="selectJobLogVo"/>
- </select>
-
- <select id="selectJobLogById" parameterType="Long" resultMap="SysJobLogResult">
- <include refid="selectJobLogVo"/>
- where job_log_id = #{jobLogId}
- </select>
-
- <delete id="deleteJobLogById" parameterType="Long">
- delete from sys_job_log where job_log_id = #{jobLogId}
- </delete>
-
- <delete id="deleteJobLogByIds" parameterType="Long">
- delete from sys_job_log where job_log_id in
- <foreach collection="array" item="jobLogId" open="(" separator="," close=")">
- #{jobLogId}
- </foreach>
- </delete>
-
- <update id="cleanJobLog">
- truncate table sys_job_log
- </update>
-
- <insert id="insertJobLog" parameterType="com.ruoyi.project.monitor.domain.SysJobLog">
- insert into sys_job_log(
- <if test="jobLogId != null and jobLogId != 0">job_log_id,</if>
- <if test="jobName != null and jobName != ''">job_name,</if>
- <if test="jobGroup != null and jobGroup != ''">job_group,</if>
- <if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
- <if test="jobMessage != null and jobMessage != ''">job_message,</if>
- <if test="status != null and status != ''">status,</if>
- <if test="exceptionInfo != null and exceptionInfo != ''">exception_info,</if>
- create_time
- )values(
- <if test="jobLogId != null and jobLogId != 0">#{jobLogId},</if>
- <if test="jobName != null and jobName != ''">#{jobName},</if>
- <if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
- <if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
- <if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if>
- sysdate()
- )
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/system/SysJobMapper.xml" "b/$\173project.build.directory\175/classes/mapper/system/SysJobMapper.xml"
deleted file mode 100644
index 71190d6..0000000
--- "a/$\173project.build.directory\175/classes/mapper/system/SysJobMapper.xml"
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.monitor.mapper.SysJobMapper">
-
- <resultMap type="com.ruoyi.project.monitor.domain.SysJob" id="SysJobResult">
- <id property="jobId" column="job_id" />
- <result property="jobName" column="job_name" />
- <result property="jobGroup" column="job_group" />
- <result property="invokeTarget" column="invoke_target" />
- <result property="cronExpression" column="cron_expression" />
- <result property="misfirePolicy" column="misfire_policy" />
- <result property="concurrent" column="concurrent" />
- <result property="status" column="status" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="remark" column="remark" />
- </resultMap>
-
- <sql id="selectJobVo">
- select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark
- from sys_job
- </sql>
-
- <select id="selectJobList" parameterType="com.ruoyi.project.monitor.domain.SysJob" resultMap="SysJobResult">
- <include refid="selectJobVo"/>
- <where>
- <if test="jobName != null and jobName != ''">
- AND job_name like concat('%', #{jobName}, '%')
- </if>
- <if test="jobGroup != null and jobGroup != ''">
- AND job_group = #{jobGroup}
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <if test="invokeTarget != null and invokeTarget != ''">
- AND invoke_target like concat('%', #{invokeTarget}, '%')
- </if>
- </where>
- </select>
-
- <select id="selectJobAll" resultMap="SysJobResult">
- <include refid="selectJobVo"/>
- </select>
-
- <select id="selectJobById" parameterType="Long" resultMap="SysJobResult">
- <include refid="selectJobVo"/>
- where job_id = #{jobId}
- </select>
-
- <delete id="deleteJobById" parameterType="Long">
- delete from sys_job where job_id = #{jobId}
- </delete>
-
- <delete id="deleteJobByIds" parameterType="Long">
- delete from sys_job where job_id in
- <foreach collection="array" item="jobId" open="(" separator="," close=")">
- #{jobId}
- </foreach>
- </delete>
-
- <update id="updateJob" parameterType="com.ruoyi.project.monitor.domain.SysJob">
- update sys_job
- <set>
- <if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
- <if test="jobGroup != null and jobGroup != ''">job_group = #{jobGroup},</if>
- <if test="invokeTarget != null and invokeTarget != ''">invoke_target = #{invokeTarget},</if>
- <if test="cronExpression != null and cronExpression != ''">cron_expression = #{cronExpression},</if>
- <if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy = #{misfirePolicy},</if>
- <if test="concurrent != null and concurrent != ''">concurrent = #{concurrent},</if>
- <if test="status !=null">status = #{status},</if>
- <if test="remark != null and remark != ''">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where job_id = #{jobId}
- </update>
-
- <insert id="insertJob" parameterType="com.ruoyi.project.monitor.domain.SysJob" useGeneratedKeys="true" keyProperty="jobId">
- insert into sys_job(
- <if test="jobId != null and jobId != 0">job_id,</if>
- <if test="jobName != null and jobName != ''">job_name,</if>
- <if test="jobGroup != null and jobGroup != ''">job_group,</if>
- <if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
- <if test="cronExpression != null and cronExpression != ''">cron_expression,</if>
- <if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy,</if>
- <if test="concurrent != null and concurrent != ''">concurrent,</if>
- <if test="status != null and status != ''">status,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="jobId != null and jobId != 0">#{jobId},</if>
- <if test="jobName != null and jobName != ''">#{jobName},</if>
- <if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
- <if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
- <if test="cronExpression != null and cronExpression != ''">#{cronExpression},</if>
- <if test="misfirePolicy != null and misfirePolicy != ''">#{misfirePolicy},</if>
- <if test="concurrent != null and concurrent != ''">#{concurrent},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/system/SysMenuMapper.xml" "b/$\173project.build.directory\175/classes/mapper/system/SysMenuMapper.xml"
deleted file mode 100644
index a3b6426..0000000
--- "a/$\173project.build.directory\175/classes/mapper/system/SysMenuMapper.xml"
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysMenuMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysMenu" id="SysMenuResult">
- <id property="menuId" column="menu_id" />
- <result property="menuName" column="menu_name" />
- <result property="parentName" column="parent_name" />
- <result property="parentId" column="parent_id" />
- <result property="orderNum" column="order_num" />
- <result property="path" column="path" />
- <result property="component" column="component" />
- <result property="query" column="query" />
- <result property="routeName" column="route_name" />
- <result property="isFrame" column="is_frame" />
- <result property="isCache" column="is_cache" />
- <result property="menuType" column="menu_type" />
- <result property="visible" column="visible" />
- <result property="status" column="status" />
- <result property="perms" column="perms" />
- <result property="icon" column="icon" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateTime" column="update_time" />
- <result property="updateBy" column="update_by" />
- <result property="remark" column="remark" />
- </resultMap>
-
- <sql id="selectMenuVo">
- select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
- from sys_menu
- </sql>
-
- <select id="selectMenuList" parameterType="com.ruoyi.project.system.domain.SysMenu" resultMap="SysMenuResult">
- <include refid="selectMenuVo"/>
- <where>
- <if test="menuName != null and menuName != ''">
- AND menu_name like concat('%', #{menuName}, '%')
- </if>
- <if test="visible != null and visible != ''">
- AND visible = #{visible}
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- </where>
- order by parent_id, order_num
- </select>
-
- <select id="selectMenuTreeAll" resultMap="SysMenuResult">
- select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
- from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
- order by m.parent_id, m.order_num
- </select>
-
- <select id="selectMenuListByUserId" parameterType="com.ruoyi.project.system.domain.SysMenu" resultMap="SysMenuResult">
- select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
- left join sys_user_role ur on rm.role_id = ur.role_id
- left join sys_role ro on ur.role_id = ro.role_id
- where ur.user_id = #{params.userId}
- <if test="menuName != null and menuName != ''">
- AND m.menu_name like concat('%', #{menuName}, '%')
- </if>
- <if test="visible != null and visible != ''">
- AND m.visible = #{visible}
- </if>
- <if test="status != null and status != ''">
- AND m.status = #{status}
- </if>
- order by m.parent_id, m.order_num
- </select>
-
- <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
- select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
- left join sys_user_role ur on rm.role_id = ur.role_id
- left join sys_role ro on ur.role_id = ro.role_id
- left join sys_user u on ur.user_id = u.user_id
- where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0
- order by m.parent_id, m.order_num
- </select>
-
- <select id="selectMenuListByRoleId" resultType="Long">
- select m.menu_id
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
- where rm.role_id = #{roleId}
- <if test="menuCheckStrictly">
- and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
- </if>
- order by m.parent_id, m.order_num
- </select>
-
- <select id="selectMenuPerms" resultType="String">
- select distinct m.perms
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
- left join sys_user_role ur on rm.role_id = ur.role_id
- </select>
-
- <select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
- select distinct m.perms
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
- left join sys_user_role ur on rm.role_id = ur.role_id
- left join sys_role r on r.role_id = ur.role_id
- where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
- </select>
-
- <select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
- select distinct m.perms
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
- where m.status = '0' and rm.role_id = #{roleId}
- </select>
-
- <select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
- <include refid="selectMenuVo"/>
- where menu_id = #{menuId}
- </select>
-
- <select id="hasChildByMenuId" resultType="Integer">
- select count(1) from sys_menu where parent_id = #{menuId}
- </select>
-
- <select id="checkMenuNameUnique" parameterType="com.ruoyi.project.system.domain.SysMenu" resultMap="SysMenuResult">
- <include refid="selectMenuVo"/>
- where menu_name=#{menuName} and parent_id = #{parentId} limit 1
- </select>
-
- <update id="updateMenu" parameterType="com.ruoyi.project.system.domain.SysMenu">
- update sys_menu
- <set>
- <if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
- <if test="parentId != null">parent_id = #{parentId},</if>
- <if test="orderNum != null">order_num = #{orderNum},</if>
- <if test="path != null and path != ''">path = #{path},</if>
- <if test="component != null">component = #{component},</if>
- <if test="query != null">`query` = #{query},</if>
- <if test="routeName != null">route_name = #{routeName},</if>
- <if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
- <if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
- <if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
- <if test="visible != null">visible = #{visible},</if>
- <if test="status != null">status = #{status},</if>
- <if test="perms !=null">perms = #{perms},</if>
- <if test="icon !=null and icon != ''">icon = #{icon},</if>
- <if test="remark != null and remark != ''">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where menu_id = #{menuId}
- </update>
-
- <insert id="insertMenu" parameterType="com.ruoyi.project.system.domain.SysMenu">
- insert into sys_menu(
- <if test="menuId != null and menuId != 0">menu_id,</if>
- <if test="parentId != null and parentId != 0">parent_id,</if>
- <if test="menuName != null and menuName != ''">menu_name,</if>
- <if test="orderNum != null">order_num,</if>
- <if test="path != null and path != ''">path,</if>
- <if test="component != null and component != ''">component,</if>
- <if test="query != null and query != ''">`query`,</if>
- <if test="routeName != null">route_name,</if>
- <if test="isFrame != null and isFrame != ''">is_frame,</if>
- <if test="isCache != null and isCache != ''">is_cache,</if>
- <if test="menuType != null and menuType != ''">menu_type,</if>
- <if test="visible != null">visible,</if>
- <if test="status != null">status,</if>
- <if test="perms !=null and perms != ''">perms,</if>
- <if test="icon != null and icon != ''">icon,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="menuId != null and menuId != 0">#{menuId},</if>
- <if test="parentId != null and parentId != 0">#{parentId},</if>
- <if test="menuName != null and menuName != ''">#{menuName},</if>
- <if test="orderNum != null">#{orderNum},</if>
- <if test="path != null and path != ''">#{path},</if>
- <if test="component != null and component != ''">#{component},</if>
- <if test="query != null and query != ''">#{query},</if>
- <if test="routeName != null">#{routeName},</if>
- <if test="isFrame != null and isFrame != ''">#{isFrame},</if>
- <if test="isCache != null and isCache != ''">#{isCache},</if>
- <if test="menuType != null and menuType != ''">#{menuType},</if>
- <if test="visible != null">#{visible},</if>
- <if test="status != null">#{status},</if>
- <if test="perms !=null and perms != ''">#{perms},</if>
- <if test="icon != null and icon != ''">#{icon},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <delete id="deleteMenuById" parameterType="Long">
- delete from sys_menu where menu_id = #{menuId}
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/system/SysNoticeMapper.xml" "b/$\173project.build.directory\175/classes/mapper/system/SysNoticeMapper.xml"
deleted file mode 100644
index e152622..0000000
--- "a/$\173project.build.directory\175/classes/mapper/system/SysNoticeMapper.xml"
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysNoticeMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysNotice" id="SysNoticeResult">
- <result property="noticeId" column="notice_id" />
- <result property="noticeTitle" column="notice_title" />
- <result property="noticeType" column="notice_type" />
- <result property="noticeContent" column="notice_content" />
- <result property="status" column="status" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="remark" column="remark" />
- </resultMap>
-
- <sql id="selectNoticeVo">
- select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark
- from sys_notice
- </sql>
-
- <select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult">
- <include refid="selectNoticeVo"/>
- where notice_id = #{noticeId}
- </select>
-
- <select id="selectNoticeList" parameterType="com.ruoyi.project.system.domain.SysNotice" resultMap="SysNoticeResult">
- <include refid="selectNoticeVo"/>
- <where>
- <if test="noticeTitle != null and noticeTitle != ''">
- AND notice_title like concat('%', #{noticeTitle}, '%')
- </if>
- <if test="noticeType != null and noticeType != ''">
- AND notice_type = #{noticeType}
- </if>
- <if test="createBy != null and createBy != ''">
- AND create_by like concat('%', #{createBy}, '%')
- </if>
- </where>
- </select>
-
- <insert id="insertNotice" parameterType="com.ruoyi.project.system.domain.SysNotice">
- insert into sys_notice (
- <if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
- <if test="noticeType != null and noticeType != '' ">notice_type, </if>
- <if test="noticeContent != null and noticeContent != '' ">notice_content, </if>
- <if test="status != null and status != '' ">status, </if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle}, </if>
- <if test="noticeType != null and noticeType != ''">#{noticeType}, </if>
- <if test="noticeContent != null and noticeContent != ''">#{noticeContent}, </if>
- <if test="status != null and status != ''">#{status}, </if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateNotice" parameterType="com.ruoyi.project.system.domain.SysNotice">
- update sys_notice
- <set>
- <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>
- <if test="noticeType != null and noticeType != ''">notice_type = #{noticeType}, </if>
- <if test="noticeContent != null">notice_content = #{noticeContent}, </if>
- <if test="status != null and status != ''">status = #{status}, </if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where notice_id = #{noticeId}
- </update>
-
- <delete id="deleteNoticeById" parameterType="Long">
- delete from sys_notice where notice_id = #{noticeId}
- </delete>
-
- <delete id="deleteNoticeByIds" parameterType="Long">
- delete from sys_notice where notice_id in
- <foreach item="noticeId" collection="array" open="(" separator="," close=")">
- #{noticeId}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/system/SysPostMapper.xml" "b/$\173project.build.directory\175/classes/mapper/system/SysPostMapper.xml"
deleted file mode 100644
index 177f74d..0000000
--- "a/$\173project.build.directory\175/classes/mapper/system/SysPostMapper.xml"
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysPostMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysPost" id="SysPostResult">
- <id property="postId" column="post_id" />
- <result property="postCode" column="post_code" />
- <result property="postName" column="post_name" />
- <result property="postSort" column="post_sort" />
- <result property="status" column="status" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="remark" column="remark" />
- </resultMap>
-
- <sql id="selectPostVo">
- select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark
- from sys_post
- </sql>
-
- <select id="selectPostList" parameterType="com.ruoyi.project.system.domain.SysPost" resultMap="SysPostResult">
- <include refid="selectPostVo"/>
- <where>
- <if test="postCode != null and postCode != ''">
- AND post_code like concat('%', #{postCode}, '%')
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <if test="postName != null and postName != ''">
- AND post_name like concat('%', #{postName}, '%')
- </if>
- </where>
- </select>
-
- <select id="selectPostAll" resultMap="SysPostResult">
- <include refid="selectPostVo"/>
- </select>
-
- <select id="selectPostById" parameterType="Long" resultMap="SysPostResult">
- <include refid="selectPostVo"/>
- where post_id = #{postId}
- </select>
-
- <select id="selectPostListByUserId" parameterType="Long" resultType="Long">
- select p.post_id
- from sys_post p
- left join sys_user_post up on up.post_id = p.post_id
- left join sys_user u on u.user_id = up.user_id
- where u.user_id = #{userId}
- </select>
-
- <select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
- select p.post_id, p.post_name, p.post_code
- from sys_post p
- left join sys_user_post up on up.post_id = p.post_id
- left join sys_user u on u.user_id = up.user_id
- where u.user_name = #{userName}
- </select>
-
- <select id="checkPostNameUnique" parameterType="String" resultMap="SysPostResult">
- <include refid="selectPostVo"/>
- where post_name=#{postName} limit 1
- </select>
-
- <select id="checkPostCodeUnique" parameterType="String" resultMap="SysPostResult">
- <include refid="selectPostVo"/>
- where post_code=#{postCode} limit 1
- </select>
-
- <update id="updatePost" parameterType="com.ruoyi.project.system.domain.SysPost">
- update sys_post
- <set>
- <if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
- <if test="postName != null and postName != ''">post_name = #{postName},</if>
- <if test="postSort != null">post_sort = #{postSort},</if>
- <if test="status != null and status != ''">status = #{status},</if>
- <if test="remark != null">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where post_id = #{postId}
- </update>
-
- <insert id="insertPost" parameterType="com.ruoyi.project.system.domain.SysPost" useGeneratedKeys="true" keyProperty="postId">
- insert into sys_post(
- <if test="postId != null and postId != 0">post_id,</if>
- <if test="postCode != null and postCode != ''">post_code,</if>
- <if test="postName != null and postName != ''">post_name,</if>
- <if test="postSort != null">post_sort,</if>
- <if test="status != null and status != ''">status,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="postId != null and postId != 0">#{postId},</if>
- <if test="postCode != null and postCode != ''">#{postCode},</if>
- <if test="postName != null and postName != ''">#{postName},</if>
- <if test="postSort != null">#{postSort},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <delete id="deletePostById" parameterType="Long">
- delete from sys_post where post_id = #{postId}
- </delete>
-
- <delete id="deletePostByIds" parameterType="Long">
- delete from sys_post where post_id in
- <foreach collection="array" item="postId" open="(" separator="," close=")">
- #{postId}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/system/SysRoleDeptMapper.xml" "b/$\173project.build.directory\175/classes/mapper/system/SysRoleDeptMapper.xml"
deleted file mode 100644
index 90dae1f..0000000
--- "a/$\173project.build.directory\175/classes/mapper/system/SysRoleDeptMapper.xml"
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysRoleDeptMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysRoleDept" id="SysRoleDeptResult">
- <result property="roleId" column="role_id" />
- <result property="deptId" column="dept_id" />
- </resultMap>
-
- <delete id="deleteRoleDeptByRoleId" parameterType="Long">
- delete from sys_role_dept where role_id=#{roleId}
- </delete>
-
- <select id="selectCountRoleDeptByDeptId" resultType="Integer">
- select count(1) from sys_role_dept where dept_id=#{deptId}
- </select>
-
- <delete id="deleteRoleDept" parameterType="Long">
- delete from sys_role_dept where role_id in
- <foreach collection="array" item="roleId" open="(" separator="," close=")">
- #{roleId}
- </foreach>
- </delete>
-
- <insert id="batchRoleDept">
- insert into sys_role_dept(role_id, dept_id) values
- <foreach item="item" index="index" collection="list" separator=",">
- (#{item.roleId},#{item.deptId})
- </foreach>
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/system/SysRoleMapper.xml" "b/$\173project.build.directory\175/classes/mapper/system/SysRoleMapper.xml"
deleted file mode 100644
index 92ab684..0000000
--- "a/$\173project.build.directory\175/classes/mapper/system/SysRoleMapper.xml"
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysRoleMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysRole" id="SysRoleResult">
- <id property="roleId" column="role_id" />
- <result property="roleName" column="role_name" />
- <result property="roleKey" column="role_key" />
- <result property="roleSort" column="role_sort" />
- <result property="dataScope" column="data_scope" />
- <result property="menuCheckStrictly" column="menu_check_strictly" />
- <result property="deptCheckStrictly" column="dept_check_strictly" />
- <result property="status" column="status" />
- <result property="delFlag" column="del_flag" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="remark" column="remark" />
- </resultMap>
-
- <sql id="selectRoleVo">
- select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
- r.status, r.del_flag, r.create_time, r.remark
- from sys_role r
- left join sys_user_role ur on ur.role_id = r.role_id
- left join sys_user u on u.user_id = ur.user_id
- </sql>
-
- <select id="selectRoleList" parameterType="com.ruoyi.project.system.domain.SysRole" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- where r.del_flag = '0'
- <if test="roleId != null and roleId != 0">
- AND r.role_id = #{roleId}
- </if>
- <if test="roleName != null and roleName != ''">
- AND r.role_name like concat('%', #{roleName}, '%')
- </if>
- <if test="status != null and status != ''">
- AND r.status = #{status}
- </if>
- <if test="roleKey != null and roleKey != ''">
- AND r.role_key like concat('%', #{roleKey}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and date_format(r.create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and date_format(r.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
- </if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
- order by r.role_sort
- </select>
-
- <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- WHERE r.del_flag = '0' and ur.user_id = #{userId}
- </select>
-
- <select id="selectRoleAll" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- </select>
-
- <select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
- select r.role_id
- from sys_role r
- left join sys_user_role ur on ur.role_id = r.role_id
- left join sys_user u on u.user_id = ur.user_id
- where u.user_id = #{userId}
- </select>
-
- <select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- where r.role_id = #{roleId}
- </select>
-
- <select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- WHERE r.del_flag = '0' and u.user_name = #{userName}
- </select>
-
- <select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- where r.role_name=#{roleName} and r.del_flag = '0' limit 1
- </select>
-
- <select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
- </select>
-
- <insert id="insertRole" parameterType="com.ruoyi.project.system.domain.SysRole" useGeneratedKeys="true" keyProperty="roleId">
- insert into sys_role(
- <if test="roleId != null and roleId != 0">role_id,</if>
- <if test="roleName != null and roleName != ''">role_name,</if>
- <if test="roleKey != null and roleKey != ''">role_key,</if>
- <if test="roleSort != null">role_sort,</if>
- <if test="dataScope != null and dataScope != ''">data_scope,</if>
- <if test="menuCheckStrictly != null">menu_check_strictly,</if>
- <if test="deptCheckStrictly != null">dept_check_strictly,</if>
- <if test="status != null and status != ''">status,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="roleId != null and roleId != 0">#{roleId},</if>
- <if test="roleName != null and roleName != ''">#{roleName},</if>
- <if test="roleKey != null and roleKey != ''">#{roleKey},</if>
- <if test="roleSort != null">#{roleSort},</if>
- <if test="dataScope != null and dataScope != ''">#{dataScope},</if>
- <if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
- <if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateRole" parameterType="com.ruoyi.project.system.domain.SysRole">
- update sys_role
- <set>
- <if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
- <if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
- <if test="roleSort != null">role_sort = #{roleSort},</if>
- <if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
- <if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>
- <if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>
- <if test="status != null and status != ''">status = #{status},</if>
- <if test="remark != null">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where role_id = #{roleId}
- </update>
-
- <delete id="deleteRoleById" parameterType="Long">
- update sys_role set del_flag = '2' where role_id = #{roleId}
- </delete>
-
- <delete id="deleteRoleByIds" parameterType="Long">
- update sys_role set del_flag = '2' where role_id in
- <foreach collection="array" item="roleId" open="(" separator="," close=")">
- #{roleId}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/system/SysRoleMenuMapper.xml" "b/$\173project.build.directory\175/classes/mapper/system/SysRoleMenuMapper.xml"
deleted file mode 100644
index fd4f483..0000000
--- "a/$\173project.build.directory\175/classes/mapper/system/SysRoleMenuMapper.xml"
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysRoleMenuMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysRoleMenu" id="SysRoleMenuResult">
- <result property="roleId" column="role_id" />
- <result property="menuId" column="menu_id" />
- </resultMap>
-
- <select id="checkMenuExistRole" resultType="Integer">
- select count(1) from sys_role_menu where menu_id = #{menuId}
- </select>
-
- <delete id="deleteRoleMenuByRoleId" parameterType="Long">
- delete from sys_role_menu where role_id=#{roleId}
- </delete>
-
- <delete id="deleteRoleMenu" parameterType="Long">
- delete from sys_role_menu where role_id in
- <foreach collection="array" item="roleId" open="(" separator="," close=")">
- #{roleId}
- </foreach>
- </delete>
-
- <insert id="batchRoleMenu">
- insert into sys_role_menu(role_id, menu_id) values
- <foreach item="item" index="index" collection="list" separator=",">
- (#{item.roleId},#{item.menuId})
- </foreach>
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/system/SysUserDeptMapper.xml" "b/$\173project.build.directory\175/classes/mapper/system/SysUserDeptMapper.xml"
deleted file mode 100644
index bcf7b01..0000000
--- "a/$\173project.build.directory\175/classes/mapper/system/SysUserDeptMapper.xml"
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysUserDeptMapper">
-
- <select id="userLoginFacotryList" resultType="com.ruoyi.project.system.domain.vo.SysUserDeptVo">
- SELECT
- T1.user_id,
- T1.dept_id,
- T2.dept_name
- FROM
- sys_user_dept T1
- LEFT JOIN sys_dept T2 ON T1.dept_id = T2.dept_id
- <where>
- T1.dept_id IN (select dept_id from sys_dept where parent_id = 100)
- <if test="userDeptVo.userId != null">
- AND T1.user_id = #{userDeptVo.userId}
- </if>
- <if test="userDeptVo.userName != null and userDeptVo.userName != '' ">
- AND T1.user_id IN (
- SELECT user_id FROM sys_user WHERE user_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
- )
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/system/SysUserMapper.xml" "b/$\173project.build.directory\175/classes/mapper/system/SysUserMapper.xml"
deleted file mode 100644
index f77e62c..0000000
--- "a/$\173project.build.directory\175/classes/mapper/system/SysUserMapper.xml"
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysUserMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysUser" id="SysUserResult">
- <id property="userId" column="user_id" />
- <result property="userName" column="user_name" />
- <result property="nickName" column="nick_name" />
- <result property="email" column="email" />
- <result property="phonenumber" column="phonenumber" />
- <result property="sex" column="sex" />
- <result property="avatar" column="avatar" />
- <result property="password" column="password" />
- <result property="status" column="status" />
- <result property="delFlag" column="del_flag" />
- <result property="loginIp" column="login_ip" />
- <result property="loginDate" column="login_date" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="remark" column="remark" />
- <result property="deptNames" column="dept_names" />
- <result property="tenantId" column="tenant_id" />
- <association property="dept" javaType="com.ruoyi.project.system.domain.SysDept" resultMap="deptResult" />
- <collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
- </resultMap>
-
- <resultMap id="deptResult" type="com.ruoyi.project.system.domain.SysDept">
- <id property="deptId" column="dept_id" />
- <result property="parentId" column="parent_id" />
- <result property="deptName" column="dept_name" />
- <result property="ancestors" column="ancestors" />
- <result property="orderNum" column="order_num" />
- <result property="leader" column="leader" />
- <result property="status" column="dept_status" />
- </resultMap>
-
- <resultMap id="RoleResult" type="com.ruoyi.project.system.domain.SysRole">
- <id property="roleId" column="role_id" />
- <result property="roleName" column="role_name" />
- <result property="roleKey" column="role_key" />
- <result property="roleSort" column="role_sort" />
- <result property="dataScope" column="data_scope" />
- <result property="status" column="role_status" />
- </resultMap>
-
- <sql id="selectUserVo">
- select u.user_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
- r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.tenant_id
- from sys_user u
- left join sys_user_role ur on u.user_id = ur.user_id
- left join sys_role r on r.role_id = ur.role_id
- </sql>
-
- <select id="selectUserList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
- select u.user_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,T2.dept_names from sys_user u
- left join
- ( SELECT T1.user_id,GROUP_CONCAT(T2.dept_name SEPARATOR ', ') AS dept_names
- FROM
- sys_user_dept T1
- LEFT JOIN sys_dept T2 ON T1.dept_id = T2.dept_id
- <where>
- <if test="tenantId != null and tenantId != 0">
- T1.dept_id = #{tenantId}
- </if>
- </where>
- GROUP BY T1.user_id
- ) T2 on T2.user_id = u.user_id
- where u.del_flag = '0'
- <if test="userId != null and userId != 0">
- AND u.user_id = #{userId}
- </if>
- <if test="userName != null and userName != ''">
- AND u.user_name like concat('%', #{userName}, '%')
- </if>
- <if test="status != null and status != ''">
- AND u.status = #{status}
- </if>
- <if test="phonenumber != null and phonenumber != ''">
- AND u.phonenumber like concat('%', #{phonenumber}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- AND date_format(u.create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- AND date_format(u.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
- </if>
- <if test="params.deptId != null">
- AND u.user_id IN
- (
- SELECT user_id FROM sys_user_dept WHERE dept_id = #{deptId}
- )
- </if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
- </select>
-
- <select id="selectAllocatedList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
- from sys_user u
- left join sys_user_role ur on u.user_id = ur.user_id
- left join sys_role r on r.role_id = ur.role_id
- where u.del_flag = '0' and r.role_id = #{roleId}
- <if test="userName != null and userName != ''">
- AND u.user_name like concat('%', #{userName}, '%')
- </if>
- <if test="phonenumber != null and phonenumber != ''">
- AND u.phonenumber like concat('%', #{phonenumber}, '%')
- </if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
- </select>
-
- <select id="selectUnallocatedList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
- from sys_user u
- left join sys_user_role ur on u.user_id = ur.user_id
- left join sys_role r on r.role_id = ur.role_id
- where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
- and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
- <if test="userName != null and userName != ''">
- AND u.user_name like concat('%', #{userName}, '%')
- </if>
- <if test="phonenumber != null and phonenumber != ''">
- AND u.phonenumber like concat('%', #{phonenumber}, '%')
- </if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
- </select>
-
- <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
- <include refid="selectUserVo"/>
- where u.user_name = #{userName} and u.del_flag = '0'
- </select>
-
- <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
- <include refid="selectUserVo"/>
- where u.user_id = #{userId}
- </select>
-
- <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
- </select>
-
- <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
- </select>
-
- <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
- </select>
- <select id="selectUserByIds" resultType="com.ruoyi.project.system.domain.SysUser">
- <include refid="selectUserVo"/>
- where u.user_id in <foreach collection="userIds" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
- </select>
- <select id="selectList" resultType="com.ruoyi.project.system.domain.SysUser">
- SELECT user_id, nick_name FROM sys_user
- <where>
- <if test="list != null and list.size() > 0">
- user_id IN
- <foreach item="id" collection="list" open="(" separator="," close=")">
- #{id}
- </foreach>
- </if>
- <if test="list == null or list.size() == 0">
- 1=0 <!-- 绌哄垪琛ㄦ椂杩斿洖绌虹粨鏋� -->
- </if>
- </where>
- </select>
- <select id="selectUsersByIds" resultType="com.ruoyi.project.system.domain.SysUser">
- SELECT user_id, nick_name
- FROM sys_user
- WHERE user_id IN
- <foreach collection="userIds" item="id" open="(" separator="," close=")">
- #{id}
- </foreach>
- </select>
-
- <insert id="insertUser" parameterType="com.ruoyi.project.system.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
- insert into sys_user(
- <if test="userId != null and userId != 0">user_id,</if>
- <if test="deptId != null and deptId != 0">dept_id,</if>
- <if test="userName != null and userName != ''">user_name,</if>
- <if test="nickName != null and nickName != ''">nick_name,</if>
- <if test="email != null and email != ''">email,</if>
- <if test="avatar != null and avatar != ''">avatar,</if>
- <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
- <if test="sex != null and sex != ''">sex,</if>
- <if test="password != null and password != ''">password,</if>
- <if test="status != null and status != ''">status,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="tenantId != null ">tenant_id,</if>
- create_time
- )values(
- <if test="userId != null and userId != ''">#{userId},</if>
- <if test="deptId != null and deptId != ''">#{deptId},</if>
- <if test="userName != null and userName != ''">#{userName},</if>
- <if test="nickName != null and nickName != ''">#{nickName},</if>
- <if test="email != null and email != ''">#{email},</if>
- <if test="avatar != null and avatar != ''">#{avatar},</if>
- <if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
- <if test="sex != null and sex != ''">#{sex},</if>
- <if test="password != null and password != ''">#{password},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="tenantId != null ">#{tenantId},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateUser" parameterType="com.ruoyi.project.system.domain.SysUser">
- update sys_user
- <set>
- <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
- <if test="email != null ">email = #{email},</if>
- <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
- <if test="sex != null and sex != ''">sex = #{sex},</if>
- <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
- <if test="password != null and password != ''">password = #{password},</if>
- <if test="status != null and status != ''">status = #{status},</if>
- <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
- <if test="loginDate != null">login_date = #{loginDate},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- <if test="remark != null">remark = #{remark},</if>
- <if test="tenantId != null">tenant_id = #{tenantId},</if>
- update_time = sysdate()
- </set>
- where user_id = #{userId}
- </update>
-
- <update id="updateUserStatus" parameterType="com.ruoyi.project.system.domain.SysUser">
- update sys_user set status = #{status} where user_id = #{userId}
- </update>
-
- <update id="updateUserAvatar" parameterType="com.ruoyi.project.system.domain.SysUser">
- update sys_user set avatar = #{avatar} where user_name = #{userName}
- </update>
-
- <update id="resetUserPwd" parameterType="com.ruoyi.project.system.domain.SysUser">
- update sys_user set password = #{password} where user_name = #{userName}
- </update>
-
- <delete id="deleteUserById" parameterType="Long">
- update sys_user set del_flag = '2' where user_id = #{userId}
- </delete>
-
- <delete id="deleteUserByIds" parameterType="Long">
- update sys_user set del_flag = '2' where user_id in
- <foreach collection="array" item="userId" open="(" separator="," close=")">
- #{userId}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/system/SysUserPostMapper.xml" "b/$\173project.build.directory\175/classes/mapper/system/SysUserPostMapper.xml"
deleted file mode 100644
index 2a0ba15..0000000
--- "a/$\173project.build.directory\175/classes/mapper/system/SysUserPostMapper.xml"
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysUserPostMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysUserPost" id="SysUserPostResult">
- <result property="userId" column="user_id" />
- <result property="postId" column="post_id" />
- </resultMap>
-
- <delete id="deleteUserPostByUserId" parameterType="Long">
- delete from sys_user_post where user_id=#{userId}
- </delete>
-
- <select id="countUserPostById" resultType="Integer">
- select count(1) from sys_user_post where post_id=#{postId}
- </select>
-
- <delete id="deleteUserPost" parameterType="Long">
- delete from sys_user_post where user_id in
- <foreach collection="array" item="userId" open="(" separator="," close=")">
- #{userId}
- </foreach>
- </delete>
-
- <insert id="batchUserPost">
- insert into sys_user_post(user_id, post_id) values
- <foreach item="item" index="index" collection="list" separator=",">
- (#{item.userId},#{item.postId})
- </foreach>
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/system/SysUserRoleMapper.xml" "b/$\173project.build.directory\175/classes/mapper/system/SysUserRoleMapper.xml"
deleted file mode 100644
index 238f77b..0000000
--- "a/$\173project.build.directory\175/classes/mapper/system/SysUserRoleMapper.xml"
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysUserRoleMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysUserRole" id="SysUserRoleResult">
- <result property="userId" column="user_id" />
- <result property="roleId" column="role_id" />
- </resultMap>
-
- <delete id="deleteUserRoleByUserId" parameterType="Long">
- delete from sys_user_role where user_id=#{userId}
- </delete>
-
- <select id="countUserRoleByRoleId" resultType="Integer">
- select count(1) from sys_user_role where role_id=#{roleId}
- </select>
-
- <delete id="deleteUserRole" parameterType="Long">
- delete from sys_user_role where user_id in
- <foreach collection="array" item="userId" open="(" separator="," close=")">
- #{userId}
- </foreach>
- </delete>
-
- <insert id="batchUserRole">
- insert into sys_user_role(user_id, role_id) values
- <foreach item="item" index="index" collection="list" separator=",">
- (#{item.userId},#{item.roleId})
- </foreach>
- </insert>
-
- <delete id="deleteUserRoleInfo" parameterType="com.ruoyi.project.system.domain.SysUserRole">
- delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
- </delete>
-
- <delete id="deleteUserRoleInfos">
- delete from sys_user_role where role_id=#{roleId} and user_id in
- <foreach collection="userIds" item="userId" open="(" separator="," close=")">
- #{userId}
- </foreach>
- </delete>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/tool/GenTableColumnMapper.xml" "b/$\173project.build.directory\175/classes/mapper/tool/GenTableColumnMapper.xml"
deleted file mode 100644
index 93bc80c..0000000
--- "a/$\173project.build.directory\175/classes/mapper/tool/GenTableColumnMapper.xml"
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper">
-
- <resultMap type="com.ruoyi.project.tool.gen.domain.GenTableColumn" id="GenTableColumnResult">
- <id property="columnId" column="column_id" />
- <result property="tableId" column="table_id" />
- <result property="columnName" column="column_name" />
- <result property="columnComment" column="column_comment" />
- <result property="columnType" column="column_type" />
- <result property="javaType" column="java_type" />
- <result property="javaField" column="java_field" />
- <result property="isPk" column="is_pk" />
- <result property="isIncrement" column="is_increment" />
- <result property="isRequired" column="is_required" />
- <result property="isInsert" column="is_insert" />
- <result property="isEdit" column="is_edit" />
- <result property="isList" column="is_list" />
- <result property="isQuery" column="is_query" />
- <result property="queryType" column="query_type" />
- <result property="htmlType" column="html_type" />
- <result property="dictType" column="dict_type" />
- <result property="sort" column="sort" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- </resultMap>
-
- <sql id="selectGenTableColumnVo">
- select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
- </sql>
-
- <select id="selectGenTableColumnListByTableId" parameterType="Long" resultMap="GenTableColumnResult">
- <include refid="selectGenTableColumnVo"/>
- where table_id = #{tableId}
- order by sort
- </select>
-
- <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
- select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else '0' end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
- from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
- order by ordinal_position
- </select>
-
- <insert id="insertGenTableColumn" parameterType="com.ruoyi.project.tool.gen.domain.GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
- insert into gen_table_column (
- <if test="tableId != null and tableId != ''">table_id,</if>
- <if test="columnName != null and columnName != ''">column_name,</if>
- <if test="columnComment != null and columnComment != ''">column_comment,</if>
- <if test="columnType != null and columnType != ''">column_type,</if>
- <if test="javaType != null and javaType != ''">java_type,</if>
- <if test="javaField != null and javaField != ''">java_field,</if>
- <if test="isPk != null and isPk != ''">is_pk,</if>
- <if test="isIncrement != null and isIncrement != ''">is_increment,</if>
- <if test="isRequired != null and isRequired != ''">is_required,</if>
- <if test="isInsert != null and isInsert != ''">is_insert,</if>
- <if test="isEdit != null and isEdit != ''">is_edit,</if>
- <if test="isList != null and isList != ''">is_list,</if>
- <if test="isQuery != null and isQuery != ''">is_query,</if>
- <if test="queryType != null and queryType != ''">query_type,</if>
- <if test="htmlType != null and htmlType != ''">html_type,</if>
- <if test="dictType != null and dictType != ''">dict_type,</if>
- <if test="sort != null">sort,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="tableId != null and tableId != ''">#{tableId},</if>
- <if test="columnName != null and columnName != ''">#{columnName},</if>
- <if test="columnComment != null and columnComment != ''">#{columnComment},</if>
- <if test="columnType != null and columnType != ''">#{columnType},</if>
- <if test="javaType != null and javaType != ''">#{javaType},</if>
- <if test="javaField != null and javaField != ''">#{javaField},</if>
- <if test="isPk != null and isPk != ''">#{isPk},</if>
- <if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
- <if test="isRequired != null and isRequired != ''">#{isRequired},</if>
- <if test="isInsert != null and isInsert != ''">#{isInsert},</if>
- <if test="isEdit != null and isEdit != ''">#{isEdit},</if>
- <if test="isList != null and isList != ''">#{isList},</if>
- <if test="isQuery != null and isQuery != ''">#{isQuery},</if>
- <if test="queryType != null and queryType != ''">#{queryType},</if>
- <if test="htmlType != null and htmlType != ''">#{htmlType},</if>
- <if test="dictType != null and dictType != ''">#{dictType},</if>
- <if test="sort != null">#{sort},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateGenTableColumn" parameterType="com.ruoyi.project.tool.gen.domain.GenTableColumn">
- update gen_table_column
- <set>
- <if test="columnComment != null">column_comment = #{columnComment},</if>
- <if test="javaType != null">java_type = #{javaType},</if>
- <if test="javaField != null">java_field = #{javaField},</if>
- <if test="isInsert != null">is_insert = #{isInsert},</if>
- <if test="isEdit != null">is_edit = #{isEdit},</if>
- <if test="isList != null">is_list = #{isList},</if>
- <if test="isQuery != null">is_query = #{isQuery},</if>
- <if test="isRequired != null">is_required = #{isRequired},</if>
- <if test="queryType != null">query_type = #{queryType},</if>
- <if test="htmlType != null">html_type = #{htmlType},</if>
- <if test="dictType != null">dict_type = #{dictType},</if>
- <if test="sort != null">sort = #{sort},</if>
- <if test="updateBy != null">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where column_id = #{columnId}
- </update>
-
- <delete id="deleteGenTableColumnByIds" parameterType="Long">
- delete from gen_table_column where table_id in
- <foreach collection="array" item="tableId" open="(" separator="," close=")">
- #{tableId}
- </foreach>
- </delete>
-
- <delete id="deleteGenTableColumns">
- delete from gen_table_column where column_id in
- <foreach collection="list" item="item" open="(" separator="," close=")">
- #{item.columnId}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/tool/GenTableMapper.xml" "b/$\173project.build.directory\175/classes/mapper/tool/GenTableMapper.xml"
deleted file mode 100644
index 9fe471c..0000000
--- "a/$\173project.build.directory\175/classes/mapper/tool/GenTableMapper.xml"
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.tool.gen.mapper.GenTableMapper">
-
- <resultMap type="com.ruoyi.project.tool.gen.domain.GenTable" id="GenTableResult">
- <id property="tableId" column="table_id" />
- <result property="tableName" column="table_name" />
- <result property="tableComment" column="table_comment" />
- <result property="subTableName" column="sub_table_name" />
- <result property="subTableFkName" column="sub_table_fk_name" />
- <result property="className" column="class_name" />
- <result property="tplCategory" column="tpl_category" />
- <result property="tplWebType" column="tpl_web_type" />
- <result property="packageName" column="package_name" />
- <result property="moduleName" column="module_name" />
- <result property="businessName" column="business_name" />
- <result property="functionName" column="function_name" />
- <result property="functionAuthor" column="function_author" />
- <result property="genType" column="gen_type" />
- <result property="genPath" column="gen_path" />
- <result property="options" column="options" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="remark" column="remark" />
- <collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult" />
- </resultMap>
-
- <resultMap type="com.ruoyi.project.tool.gen.domain.GenTableColumn" id="GenTableColumnResult">
- <id property="columnId" column="column_id" />
- <result property="tableId" column="table_id" />
- <result property="columnName" column="column_name" />
- <result property="columnComment" column="column_comment" />
- <result property="columnType" column="column_type" />
- <result property="javaType" column="java_type" />
- <result property="javaField" column="java_field" />
- <result property="isPk" column="is_pk" />
- <result property="isIncrement" column="is_increment" />
- <result property="isRequired" column="is_required" />
- <result property="isInsert" column="is_insert" />
- <result property="isEdit" column="is_edit" />
- <result property="isList" column="is_list" />
- <result property="isQuery" column="is_query" />
- <result property="queryType" column="query_type" />
- <result property="htmlType" column="html_type" />
- <result property="dictType" column="dict_type" />
- <result property="sort" column="sort" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- </resultMap>
-
- <sql id="selectGenTableVo">
- select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
- </sql>
-
- <select id="selectGenTableList" parameterType="com.ruoyi.project.tool.gen.domain.GenTable" resultMap="GenTableResult">
- <include refid="selectGenTableVo"/>
- <where>
- <if test="tableName != null and tableName != ''">
- AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
- </if>
- <if test="tableComment != null and tableComment != ''">
- AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- AND date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- AND date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
- </if>
- </where>
- </select>
-
- <select id="selectDbTableList" parameterType="com.ruoyi.project.tool.gen.domain.GenTable" resultMap="GenTableResult">
- select table_name, table_comment, create_time, update_time from information_schema.tables
- where table_schema = (select database())
- AND table_name NOT LIKE 'qrtz\_%' AND table_name NOT LIKE 'gen\_%'
- AND table_name NOT IN (select table_name from gen_table)
- <if test="tableName != null and tableName != ''">
- AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
- </if>
- <if test="tableComment != null and tableComment != ''">
- AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- AND date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- AND date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
- </if>
- order by create_time desc
- </select>
-
- <select id="selectDbTableListByNames" resultMap="GenTableResult">
- select table_name, table_comment, create_time, update_time from information_schema.tables
- where table_name NOT LIKE 'qrtz\_%' and table_name NOT LIKE 'gen\_%' and table_schema = (select database())
- and table_name in
- <foreach collection="array" item="name" open="(" separator="," close=")">
- #{name}
- </foreach>
- </select>
-
- <select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
- select table_name, table_comment, create_time, update_time from information_schema.tables
- where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
- and table_name = #{tableName}
- </select>
-
- <select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
- SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
- c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
- FROM gen_table t
- LEFT JOIN gen_table_column c ON t.table_id = c.table_id
- where t.table_id = #{tableId} order by c.sort
- </select>
-
- <select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
- SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
- c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
- FROM gen_table t
- LEFT JOIN gen_table_column c ON t.table_id = c.table_id
- where t.table_name = #{tableName} order by c.sort
- </select>
-
- <select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
- SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
- c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
- FROM gen_table t
- LEFT JOIN gen_table_column c ON t.table_id = c.table_id
- order by c.sort
- </select>
-
- <insert id="insertGenTable" parameterType="com.ruoyi.project.tool.gen.domain.GenTable" useGeneratedKeys="true" keyProperty="tableId">
- insert into gen_table (
- <if test="tableName != null">table_name,</if>
- <if test="tableComment != null and tableComment != ''">table_comment,</if>
- <if test="className != null and className != ''">class_name,</if>
- <if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
- <if test="tplWebType != null and tplWebType != ''">tpl_web_type,</if>
- <if test="packageName != null and packageName != ''">package_name,</if>
- <if test="moduleName != null and moduleName != ''">module_name,</if>
- <if test="businessName != null and businessName != ''">business_name,</if>
- <if test="functionName != null and functionName != ''">function_name,</if>
- <if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
- <if test="genType != null and genType != ''">gen_type,</if>
- <if test="genPath != null and genPath != ''">gen_path,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="tableName != null">#{tableName},</if>
- <if test="tableComment != null and tableComment != ''">#{tableComment},</if>
- <if test="className != null and className != ''">#{className},</if>
- <if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
- <if test="tplWebType != null and tplWebType != ''">#{tplWebType},</if>
- <if test="packageName != null and packageName != ''">#{packageName},</if>
- <if test="moduleName != null and moduleName != ''">#{moduleName},</if>
- <if test="businessName != null and businessName != ''">#{businessName},</if>
- <if test="functionName != null and functionName != ''">#{functionName},</if>
- <if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
- <if test="genType != null and genType != ''">#{genType},</if>
- <if test="genPath != null and genPath != ''">#{genPath},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <update id="createTable">
- ${sql}
- </update>
-
- <update id="updateGenTable" parameterType="com.ruoyi.project.tool.gen.domain.GenTable">
- update gen_table
- <set>
- <if test="tableName != null">table_name = #{tableName},</if>
- <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
- <if test="subTableName != null">sub_table_name = #{subTableName},</if>
- <if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</if>
- <if test="className != null and className != ''">class_name = #{className},</if>
- <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
- <if test="genType != null and genType != ''">gen_type = #{genType},</if>
- <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
- <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>
- <if test="tplWebType != null and tplWebType != ''">tpl_web_type = #{tplWebType},</if>
- <if test="packageName != null and packageName != ''">package_name = #{packageName},</if>
- <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
- <if test="businessName != null and businessName != ''">business_name = #{businessName},</if>
- <if test="functionName != null and functionName != ''">function_name = #{functionName},</if>
- <if test="options != null and options != ''">options = #{options},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- <if test="remark != null">remark = #{remark},</if>
- update_time = sysdate()
- </set>
- where table_id = #{tableId}
- </update>
-
- <delete id="deleteGenTableByIds" parameterType="Long">
- delete from gen_table where table_id in
- <foreach collection="array" item="tableId" open="(" separator="," close=")">
- #{tableId}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mapper/warehouse/DocumentClassificationMapper.xml" "b/$\173project.build.directory\175/classes/mapper/warehouse/DocumentClassificationMapper.xml"
deleted file mode 100644
index e758e4f..0000000
--- "a/$\173project.build.directory\175/classes/mapper/warehouse/DocumentClassificationMapper.xml"
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouse.mapper.DocumentClassificationMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.DocumentClassification">
- <id property="id" column="id" />
- <result property="category" column="category" />
- <result property="parentId" column="parent_id" />
- <result property="createTime" column="create_time" />
- <result property="createUser" column="create_user" />
- <result property="updateTime" column="update_time" />
- <result property="updateUser" column="update_user" />
- <result property="tenantId" column="tenant_id" />
- </resultMap>
-
- <sql id="Base_Column_List">
- id,category,parent_id,
- create_time,create_user,update_time,
- update_user,tenant_id
- </sql>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/warehouse/DocumentationBorrowManagementMapper.xml" "b/$\173project.build.directory\175/classes/mapper/warehouse/DocumentationBorrowManagementMapper.xml"
deleted file mode 100644
index 18b2082..0000000
--- "a/$\173project.build.directory\175/classes/mapper/warehouse/DocumentationBorrowManagementMapper.xml"
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper">
-
-<!-- <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.DocumentationBorrowManagement">-->
-<!-- <id property="id" column="id"/>-->
-<!-- <result property="documentationId" column="documentation_id" />-->
-<!-- <result property="borrowerId" column="borrower_id" />-->
-<!-- <result property="borrowPurpose" column="borrow_purpose" />-->
-<!-- <result property="borrowDate" column="borrow_date"/>-->
-<!-- <result property="dueReturnDate" column="due_return_date" />-->
-<!-- <result property="returnDate" column="return_date"/>-->
-<!-- <result property="borrowStatus" column="borrow_status" />-->
-<!-- <result property="remark" column="remark"/>-->
-<!-- <result property="createTime" column="create_time"/>-->
-<!-- <result property="createUser" column="create_user"/>-->
-<!-- <result property="updateTime" column="update_time"/>-->
-<!-- <result property="updateUser" column="update_user"/>-->
-<!-- <result property="tenantId" column="tenant_id"/>-->
-<!-- </resultMap>-->
-
-<!-- <sql id="Base_Column_List">-->
-<!-- id,documentation_id,borrower_id,-->
-<!-- borrow_purpose,borrow_date,due_return_date,-->
-<!-- return_date,borrow_status,remark,-->
-<!-- create_time,create_user,update_time,-->
-<!-- update_user,tenant_id-->
-<!-- </sql>-->
- <select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
- select dbm.*,doc.doc_name
- from documentation_borrow_management dbm
- LEFT JOIN documentation doc on doc.id = dbm.documentation_id
- where 1=1
- <if test="documentationBorrowManagement.borrowStatus != null">
- and borrow_status = #{documentationBorrowManagement.borrowStatus}
- </if>
- <if test="documentationBorrowManagement.documentationId != null">
- and documentation_id = #{documentationBorrowManagement.documentationId}
- </if>
- <if test="documentationBorrowManagement.borrower != null">
- and borrower like concat('%',#{documentationBorrowManagement.borrower},'%')
- </if>
- <if test="documentationBorrowManagement.returner != null">
- and returner like concat('%',#{documentationBorrowManagement.returner},'%')
- </if>
- <if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''">
- and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="documentationBorrowManagement.entryDateEnd != null and documentationBorrowManagement.entryDateEnd != ''">
- and borrow_date <= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
- <select id="export" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
- select dbm.*,doc.doc_name
- from documentation_borrow_management dbm
- LEFT JOIN documentation doc on doc.id = dbm.documentation_id
- where 1=1
- <if test="documentationBorrowManagement.borrowStatus != null">
- and borrow_status = #{documentationBorrowManagement.borrowStatus}
- </if>
- <if test="documentationBorrowManagement.documentationId != null">
- and documentation_id = #{documentationBorrowManagement.documentationId}
- </if>
- <if test="documentationBorrowManagement.borrower != null">
- and borrower like concat('%',#{documentationBorrowManagement.borrower},'%')
- </if>
- <if test="documentationBorrowManagement.returner != null">
- and returner like concat('%',#{documentationBorrowManagement.returner},'%')
- </if>
- <if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''">
- and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="documentationBorrowManagement.entryDateEnd != null and documentationBorrowManagement.entryDateEnd != ''">
- and borrow_date <= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
- <select id="list" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
- select dbm.*,doc.doc_name
- from documentation_borrow_management dbm
- LEFT JOIN documentation doc on doc.id = dbm.documentation_id
- <if test="ew != null">
- ${ew.customSqlSegment}
- </if>
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/warehouse/DocumentationFileMapper.xml" "b/$\173project.build.directory\175/classes/mapper/warehouse/DocumentationFileMapper.xml"
deleted file mode 100644
index a8b74f9..0000000
--- "a/$\173project.build.directory\175/classes/mapper/warehouse/DocumentationFileMapper.xml"
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.warehouse.mapper.DocumentationFileMapper">
- <select id="documentationFileListPage" resultType="com.ruoyi.warehouse.pojo.DocumentationFile">
- SELECT
- *
- FROM documentation_file
- where
- 1=1
- <if test="documentationFile.name != null and documentationFile.name != '' ">
- AND name = #{documentationFile.name}
- </if>
- <if test="documentationFile.documentationId != null">
- AND documentation_id = #{documentationFile.documentationId}
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/warehouse/DocumentationMapper.xml" "b/$\173project.build.directory\175/classes/mapper/warehouse/DocumentationMapper.xml"
deleted file mode 100644
index 91f17a9..0000000
--- "a/$\173project.build.directory\175/classes/mapper/warehouse/DocumentationMapper.xml"
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouse.mapper.DocumentationMapper">
-
- <select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
- SELECT
- doc.*,
- dc.category,
- CONCAT(
- w.warehouse_name, '-',
- wgs.name, '-',
- wgsr.row, '灞�-',
- wgsr.col, '鍒�'
- ) AS location_info -- 鍚堝苟鍚庣殑瀛楁鍚�
- FROM documentation doc
- LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
- LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- where 1=1
- <if test="documentation.documentClassificationId != null">
- and doc.document_classification_id = #{documentation.documentClassificationId}
- </if>
- <if test="documentation.docName != null">
- and doc.doc_name = #{documentation.docName}
- </if>
- <if test="documentation.docNumber != null">
- and doc.doc_number = #{documentation.docNumber}
- </if>
- <if test="documentation.id != null">
- and doc.id = #{documentation.id}
- </if>
- </select>
- <select id="listByDocumentClassificationId" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
- SELECT
- doc.*,
- dc.category,
- CONCAT(
- w.warehouse_name, '-',
- wgs.name, '-',
- wgsr.row, '灞�-',
- wgsr.col, '鍒�'
- ) AS location_info -- 鍚堝苟鍚庣殑瀛楁鍚�
- FROM documentation doc
- LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
- LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- where doc.document_classification_id = #{documentClassificationId}
- </select>
- <select id="list" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
- SELECT
- doc.*,
- dc.category,
- CONCAT(
- w.warehouse_name, '-',
- wgs.name, '-',
- wgsr.row, '灞�-',
- wgsr.col, '鍒�'
- ) AS location_info -- 鍚堝苟鍚庣殑瀛楁鍚�
- FROM documentation doc
- LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
- LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- </select>
- <select id="listBywarehouseGoodsShelvesRowcolId" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
- SELECT
- doc.*,
- dc.category,
- CONCAT(
- w.warehouse_name, '-',
- wgs.name, '-',
- wgsr.row, '灞�-',
- wgsr.col, '鍒�'
- ) AS location_info -- 鍚堝苟鍚庣殑瀛楁鍚�
- FROM documentation doc
- LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
- LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- where doc.warehouse_goods_shelves_rowcol_id = #{warehouseGoodsShelvesRowcolId}
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/warehouse/DocumentationReturnManagementMapper.xml" "b/$\173project.build.directory\175/classes/mapper/warehouse/DocumentationReturnManagementMapper.xml"
deleted file mode 100644
index 06202f8..0000000
--- "a/$\173project.build.directory\175/classes/mapper/warehouse/DocumentationReturnManagementMapper.xml"
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouse.mapper.DocumentationReturnManagementMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationReturnManagementDto">
- select dbm.*,doc.doc_name
- from documentation_return_management dbm
- LEFT JOIN documentation doc on doc.id = dbm.documentation_id
- where 1=1
- <if test="documentationReturnManagement.borrowStatus != null">
- and borrow_status = #{documentationReturnManagement.borrowStatus}
- </if>
- <if test="documentationReturnManagement.documentationId != null">
- and documentation_id = #{documentationReturnManagement.documentationId}
- </if>
- <if test="documentationReturnManagement.borrower != null">
- and borrower like concat('%',#{documentationReturnManagement.borrower},'%')
- </if>
- <if test="documentationReturnManagement.returner != null">
- and returner like concat('%',#{documentationReturnManagement.returner},'%')
- </if>
- <if test="documentationReturnManagement.entryDateStart != null and documentationReturnManagement.entryDateStart != ''">
- and return_date >= DATE_FORMAT(#{documentationReturnManagement.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="documentationReturnManagement.entryDateEnd != null and documentationReturnManagement.entryDateEnd != ''">
- and return_date <= DATE_FORMAT(#{documentationReturnManagement.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
-
- <select id="exportrevent" resultType="com.ruoyi.warehouse.dto.ReturnExportDto">
- select dbm.*,doc.doc_name
- from documentation_return_management dbm
- LEFT JOIN documentation doc on doc.id = dbm.documentation_id
- where dbm.returner IS NOT NULL
- <if test="documentationReturnManagement.borrowStatus != null">
- and borrow_status = #{documentationReturnManagement.borrowStatus}
- </if>
- <if test="documentationReturnManagement.documentationId != null">
- and documentation_id = #{documentationReturnManagement.documentationId}
- </if>
- <if test="documentationReturnManagement.borrower != null">
- and borrower like concat('%',#{documentationReturnManagement.borrower},'%')
- </if>
- <if test="documentationReturnManagement.returner != null">
- and returner like concat('%',#{documentationReturnManagement.returner},'%')
- </if>
- <if test="documentationReturnManagement.entryDateStart != null and documentationReturnManagement.entryDateStart != ''">
- and return_date >= DATE_FORMAT(#{documentationReturnManagement.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="documentationReturnManagement.entryDateEnd != null and documentationReturnManagement.entryDateEnd != ''">
- and return_date <= DATE_FORMAT(#{documentationReturnManagement.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/warehouse/WarehouseGoodsShelvesMapper.xml" "b/$\173project.build.directory\175/classes/mapper/warehouse/WarehouseGoodsShelvesMapper.xml"
deleted file mode 100644
index 8493e2d..0000000
--- "a/$\173project.build.directory\175/classes/mapper/warehouse/WarehouseGoodsShelvesMapper.xml"
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesMapper">
-
-
- <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto">
- SELECT
- doc.doc_name,
- doc.doc_number,
- wgs.*,
- w.warehouse_name,
- dc.category
- FROM warehouse_goods_shelves_rowcol wgsr
- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- LEFT JOIN documentation doc ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id
- LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
- <where>
- 1=1
- <if test="warehouseGoodsShelves.goodsShelvesName != null and warehouseGoodsShelves.goodsShelvesName != ''">
- and wgs.goods_shelves_name like concat('%',#{warehouseGoodsShelves.goodsShelvesName},'%')
- </if>
- <if test="warehouseGoodsShelves.warehouseId != null">
- and wgs.warehouse_id = #{warehouseGoodsShelves.warehouseId}
- </if>
- <if test="warehouseGoodsShelves.id != null">
- and wgs.id = #{warehouseGoodsShelves.id}
- </if>
- </where>
- </select>
- <select id="listAll" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto">
- select wgs.*,w.warehouse_name from warehouse_goods_shelves wgs
- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- <where>
- 1=1
- <if test="warehouseGoodsShelves.goodsShelvesName != null and warehouseGoodsShelves.goodsShelvesName != ''">
- and goods_shelves_name like concat('%',#{warehouseGoodsShelves.goodsShelvesName},'%')
- </if>
- <if test="warehouseGoodsShelves.warehouseId != null">
- and warehouse_id = #{warehouseGoodsShelves.warehouseId}
- </if>
- <if test="warehouseGoodsShelves.id != null">
- and id = #{warehouseGoodsShelves.id}
- </if>
- </where>
- </select>
-
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml" "b/$\173project.build.directory\175/classes/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml"
deleted file mode 100644
index 87dfa32..0000000
--- "a/$\173project.build.directory\175/classes/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml"
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesRowcolMapper">
- <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesRowcolDto">
--- SELECT
--- wgsr.*,
--- w.warehouse_name,
--- wgs.name,
--- dc.category
--- FROM warehouse_goods_shelves_rowcol wgsr
--- LEFT JOIN documentation doc ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id
--- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
--- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
--- LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
- SELECT
- wgsr.*,
- w.warehouse_name,
- wgs.name
- FROM warehouse_goods_shelves_rowcol wgsr
- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- <where>
- 1=1
- <if test="warehouseGoodsShelvesRowcol.row != null">
- and wgsr.row = #{warehouseGoodsShelvesRowcol.row}
- </if>
- <if test="warehouseGoodsShelvesRowcol.col != null">
- and wgsr.col = #{warehouseGoodsShelvesRowcol.col}
- </if>
- <if test="warehouseGoodsShelvesRowcol.warehouseGoodsShelvesId != null">
- and wgsr.warehouse_goods_shelves_id = #{warehouseGoodsShelvesRowcol.warehouseGoodsShelvesId}
- </if>
- <if test="warehouseGoodsShelvesRowcol.id != null">
- and wgsr.id = #{warehouseGoodsShelvesRowcol.id}
- </if>
- </where>
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/warehouse/WarehouseMapper.xml" "b/$\173project.build.directory\175/classes/mapper/warehouse/WarehouseMapper.xml"
deleted file mode 100644
index dd45695..0000000
--- "a/$\173project.build.directory\175/classes/mapper/warehouse/WarehouseMapper.xml"
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseMapper">
-
-
- <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseDto">
- SELECT
- w.*,
- wgs.name,
- doc.doc_name,
- doc.doc_number,
- dc.category
- FROM warehouse_goods_shelves_rowcol wgsr
- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- LEFT JOIN documentation doc ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id
- LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
- <where>
- 1=1
- <if test="warehouse.warehouseName != null">
- and w.warehouse_name like concat('%',#{warehouse.warehouseName},'%')
- </if>
- <if test="warehouse.id != null">
- and w.id = #{warehouse.id}
- </if>
- </where>
- </select>
- <select id="listAll" resultType="com.ruoyi.warehouse.pojo.Warehouse">
- select * from warehouse
- <where>
- 1=1
- <if test="warehouse.warehouseName != null">
- and warehouse_name like concat('%',#{warehouse.warehouseName},'%')
- </if>
- <if test="warehouse.id != null">
- and w.id = #{warehouse.id}
- </if>
- </where>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/mapper/waterrecord/WaterRecordMapper.xml" "b/$\173project.build.directory\175/classes/mapper/waterrecord/WaterRecordMapper.xml"
deleted file mode 100644
index e0a9135..0000000
--- "a/$\173project.build.directory\175/classes/mapper/waterrecord/WaterRecordMapper.xml"
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.waterrecord.mapper.WaterRecordMapper">
-
- <select id="listPage" resultType="com.ruoyi.waterrecord.pojo.WaterRecord">
- select
- t1.*,
- t2.device_name
- from water_record t1
- left join device_ledger t2 on t1.device_model = t2.device_model
- <where>
- <if test="req.deviceName != null and req.deviceName != ''">
- and t2.device_name like concat('%',#{req.deviceName},'%')
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/mybatis/mybatis-config.xml" "b/$\173project.build.directory\175/classes/mybatis/mybatis-config.xml"
deleted file mode 100644
index 3f4167d..0000000
--- "a/$\173project.build.directory\175/classes/mybatis/mybatis-config.xml"
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration
-PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-config.dtd">
-<configuration>
- <!-- 鍏ㄥ眬鍙傛暟 -->
- <settings>
- <!-- 浣垮叏灞�鐨勬槧灏勫櫒鍚敤鎴栫鐢ㄧ紦瀛� -->
- <setting name="cacheEnabled" value="true" />
- <!-- 鍏佽JDBC 鏀寔鑷姩鐢熸垚涓婚敭 -->
- <setting name="useGeneratedKeys" value="true" />
- <!-- 閰嶇疆榛樿鐨勬墽琛屽櫒.SIMPLE灏辨槸鏅�氭墽琛屽櫒;REUSE鎵ц鍣ㄤ細閲嶇敤棰勫鐞嗚鍙�(prepared statements);BATCH鎵ц鍣ㄥ皢閲嶇敤璇彞骞舵墽琛屾壒閲忔洿鏂� -->
- <setting name="defaultExecutorType" value="SIMPLE" />
- <!-- 鎸囧畾 MyBatis 鎵�鐢ㄦ棩蹇楃殑鍏蜂綋瀹炵幇 -->
- <setting name="logImpl" value="SLF4J" />
-<!-- <setting name="logImpl" value="org.apache.ibatis.logging.stdout.StdOutImpl" />-->
- <!-- 浣跨敤椹煎嘲鍛藉悕娉曡浆鎹㈠瓧娈� -->
- <!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
- </settings>
-
-</configuration>
diff --git "a/$\173project.build.directory\175/classes/pom.xml" "b/$\173project.build.directory\175/classes/pom.xml"
deleted file mode 100644
index e82c02f..0000000
--- "a/$\173project.build.directory\175/classes/pom.xml"
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi</artifactId>
- <version>3.8.9</version>
- <packaging>jar</packaging>
-
- <name>ruoyi</name>
- <url>http://www.ruoyi.vip</url>
- <description>鑻ヤ緷绠＄悊绯荤粺</description>
-
- <parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.5.15</version>
- <relativePath />
- </parent>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
- <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
- <pagehelper.spring.boot.starter.version>1.4.7</pagehelper.spring.boot.starter.version>
- <fastjson.version>2.0.53</fastjson.version>
- <druid.version>1.2.23</druid.version>
- <commons.io.version>2.13.0</commons.io.version>
- <bitwalker.version>1.21</bitwalker.version>
- <jwt.version>0.9.1</jwt.version>
- <kaptcha.version>2.3.3</kaptcha.version>
- <swagger.version>3.0.0</swagger.version>
- <poi.version>5.2.3</poi.version>
- <oshi.version>6.6.5</oshi.version>
- <velocity.version>2.3</velocity.version>
- <!-- override dependency version -->
- <tomcat.version>9.0.102</tomcat.version>
- <minio.version>8.4.3</minio.version>
- <okhttp.version>4.9.0</okhttp.version>
- <logback.version>1.2.13</logback.version>
- <spring-security.version>5.7.12</spring-security.version>
- <spring-framework.version>5.3.39</spring-framework.version>
- <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
- </properties>
-
- <dependencies>
- <!-- ruoyi-springboot2 / swagger knife4j 閰嶇疆 -->
- <dependency>
- <groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-spring-boot-starter</artifactId>
- <version>3.0.3</version>
- </dependency>
-
- <!-- SpringBoot 鏍稿績鍖� -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </dependency>
-
- <!-- SpringBoot 娴嬭瘯 -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- SpringBoot 鎷︽埅鍣� -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-aop</artifactId>
- </dependency>
-
- <!-- SpringBoot Web瀹瑰櫒 -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
-
- <!-- spring-boot-devtools -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-devtools</artifactId>
- <optional>true</optional> <!-- 琛ㄧず渚濊禆涓嶄細浼犻�� -->
- </dependency>
-
- <!-- spring security 瀹夊叏璁よ瘉 -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-security</artifactId>
- </dependency>
-
- <!-- redis 缂撳瓨鎿嶄綔 -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-redis</artifactId>
- </dependency>
-
- <!-- pool 瀵硅薄姹� -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- </dependency>
-
- <!-- Mysql椹卞姩鍖� -->
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <!-- pagehelper 鍒嗛〉鎻掍欢 -->
- <dependency>
- <groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>${pagehelper.spring.boot.starter.version}</version>
- </dependency>
-
- <!-- 闃块噷鏁版嵁搴撹繛鎺ユ睜 -->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>druid-spring-boot-starter</artifactId>
- <version>${druid.version}</version>
- </dependency>
-
- <!--mybatis-plus-->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-boot-starter</artifactId>
- <version>${mybatis-plus.version}</version>
- </dependency>
-
- <!--mybatis-plus浠ｇ爜鐢熸垚鍣�-->
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-generator</artifactId>
- <version>${mybatis-plus.version}</version>
- </dependency>
-
- <!-- 鑷畾涔夐獙璇佹敞瑙� -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-validation</artifactId>
- </dependency>
-
- <!-- 甯哥敤宸ュ叿绫� -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
-
- <!-- io甯哥敤宸ュ叿绫� -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- </dependency>
-
- <!-- 瑙ｆ瀽瀹㈡埛绔搷浣滅郴缁熴�佹祻瑙堝櫒绛� -->
- <dependency>
- <groupId>eu.bitwalker</groupId>
- <artifactId>UserAgentUtils</artifactId>
- <version>${bitwalker.version}</version>
- </dependency>
-
- <!-- 闃块噷JSON瑙ｆ瀽鍣� -->
- <dependency>
- <groupId>com.alibaba.fastjson2</groupId>
- <artifactId>fastjson2</artifactId>
- <version>${fastjson.version}</version>
- </dependency>
-
- <!-- Spring妗嗘灦鍩烘湰鐨勬牳蹇冨伐鍏�-->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- </dependency>
-
- <!-- Token鐢熸垚涓庤В鏋�-->
- <dependency>
- <groupId>io.jsonwebtoken</groupId>
- <artifactId>jjwt</artifactId>
- <version>${jwt.version}</version>
- </dependency>
-
- <!-- Jaxb -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
-
- <!-- Swagger3渚濊禆 -->
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-boot-starter</artifactId>
- <version>${swagger.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-models</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- 闃叉杩涘叆swagger椤甸潰鎶ョ被鍨嬭浆鎹㈤敊璇紝鎺掗櫎3.0.0涓殑寮曠敤锛屾墜鍔ㄥ鍔�1.6.2鐗堟湰 -->
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-models</artifactId>
- <version>1.6.2</version>
- </dependency>
-
- <!-- 鑾峰彇绯荤粺淇℃伅 -->
- <dependency>
- <groupId>com.github.oshi</groupId>
- <artifactId>oshi-core</artifactId>
- <version>${oshi.version}</version>
- </dependency>
-
- <!-- excel宸ュ叿 -->
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <version>${poi.version}</version>
- </dependency>
-
-
- <!-- velocity浠ｇ爜鐢熸垚浣跨敤妯℃澘 -->
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
- <version>${velocity.version}</version>
- </dependency>
-
- <!-- 瀹氭椂浠诲姟 -->
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.mchange</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- 楠岃瘉鐮� -->
- <dependency>
- <groupId>pro.fessional</groupId>
- <artifactId>kaptcha</artifactId>
- <version>${kaptcha.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>servlet-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </dependency>
-
-
-
- <!-- minio -->
- <dependency>
- <groupId>io.minio</groupId>
- <artifactId>minio</artifactId>
- <version>${minio.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- minio渚濊禆okhttp 涓嶇劧鎶ラ敊 -->
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- <version>${okhttp.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.deepoove</groupId>
- <artifactId>poi-tl</artifactId>
- <version>1.12.2</version>
- </dependency>
-
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>easyexcel</artifactId>
- <version>4.0.3</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <configuration>
- <fork>true</fork> <!-- 濡傛灉娌℃湁璇ラ厤缃紝devtools涓嶄細鐢熸晥 -->
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <repository>
- <id>public</id>
- <name>aliyun nexus</name>
- <url>https://maven.aliyun.com/repository/public</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>public</id>
- <name>aliyun nexus</name>
- <url>https://maven.aliyun.com/repository/public</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
-</project>
diff --git "a/$\173project.build.directory\175/classes/ry.bat" "b/$\173project.build.directory\175/classes/ry.bat"
deleted file mode 100644
index d523e8c..0000000
--- "a/$\173project.build.directory\175/classes/ry.bat"
+++ /dev/null
@@ -1,67 +0,0 @@
-@echo off
-
-rem jar平级目录
-set AppName=ruoyi.jar
-
-rem JVM参数
-set JVM_OPTS="-Dname=%AppName% -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
-
-
-ECHO.
- ECHO. [1] 启动%AppName%
- ECHO. [2] 关闭%AppName%
- ECHO. [3] 重启%AppName%
- ECHO. [4] 启动状态 %AppName%
- ECHO. [5] 退 出
-ECHO.
-
-ECHO.请输入选择项目的序号:
-set /p ID=
- IF "%id%"=="1" GOTO start
- IF "%id%"=="2" GOTO stop
- IF "%id%"=="3" GOTO restart
- IF "%id%"=="4" GOTO status
- IF "%id%"=="5" EXIT
-PAUSE
-:start
- for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
- set pid=%%a
- set image_name=%%b
- )
- if defined pid (
- echo %%is running
- PAUSE
- )
-
-start javaw %JVM_OPTS% -jar %AppName%
-
-echo starting……
-echo Start %AppName% success...
-goto:eof
-
-rem 函数stop通过jps命令查找pid并结束进程
-:stop
- for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
- set pid=%%a
- set image_name=%%b
- )
- if not defined pid (echo process %AppName% does not exists) else (
- echo prepare to kill %image_name%
- echo start kill %pid% ...
- rem 根据进程ID，kill进程
- taskkill /f /pid %pid%
- )
-goto:eof
-:restart
- call :stop
- call :start
-goto:eof
-:status
- for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
- set pid=%%a
- set image_name=%%b
- )
- if not defined pid (echo process %AppName% is dead ) else (
- echo %image_name% is running
- )
-goto:eof
diff --git "a/$\173project.build.directory\175/classes/ry.sh" "b/$\173project.build.directory\175/classes/ry.sh"
deleted file mode 100644
index 393bf9d..0000000
--- "a/$\173project.build.directory\175/classes/ry.sh"
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-# ./ry.sh start 鍚姩 stop 鍋滄 restart 閲嶅惎 status 鐘舵��
-AppName=target/ruoyi.jar
-
-# JVM鍙傛暟
-JVM_OPTS="-Dname=$AppName -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
-APP_HOME=`pwd`
-LOG_PATH=$APP_HOME/logs/$AppName.log
-
-if [ "$1" = "" ];
-then
- echo -e "\033[0;31m 鏈緭鍏ユ搷浣滃悕 \033[0m \033[0;34m {start|stop|restart|status} \033[0m"
- exit 1
-fi
-
-if [ "$AppName" = "" ];
-then
- echo -e "\033[0;31m 鏈緭鍏ュ簲鐢ㄥ悕 \033[0m"
- exit 1
-fi
-
-function start()
-{
- PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
-
- if [ x"$PID" != x"" ]; then
- echo "$AppName is running..."
- else
- nohup java $JVM_OPTS -jar $AppName > /dev/null 2>&1 &
- echo "Start $AppName success..."
- fi
-}
-
-function stop()
-{
- echo "Stop $AppName"
-
- PID=""
- query(){
- PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
- }
-
- query
- if [ x"$PID" != x"" ]; then
- kill -TERM $PID
- echo "$AppName (pid:$PID) exiting..."
- while [ x"$PID" != x"" ]
- do
- sleep 1
- query
- done
- echo "$AppName exited."
- else
- echo "$AppName already stopped."
- fi
-}
-
-function restart()
-{
- stop
- sleep 2
- start
-}
-
-function status()
-{
- PID=`ps -ef |grep java|grep $AppName|grep -v grep|wc -l`
- if [ $PID != 0 ];then
- echo "$AppName is running..."
- else
- echo "$AppName is not running..."
- fi
-}
-
-case $1 in
- start)
- start;;
- stop)
- stop;;
- restart)
- restart;;
- status)
- status;;
- *)
-
-esac
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/META-INF/spring-devtools.properties" "b/$\173project.build.directory\175/classes/src/main/resources/META-INF/spring-devtools.properties"
deleted file mode 100644
index 37e7b58..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/META-INF/spring-devtools.properties"
+++ /dev/null
@@ -1 +0,0 @@
-restart.include.json=/com.alibaba.fastjson2.*.jar
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-bdsm.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-bdsm.yml"
deleted file mode 100644
index d623a1d..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-bdsm.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9096
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-bdsm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 15
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-bhmy.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-bhmy.yml"
deleted file mode 100644
index 741e60b..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-bhmy.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9070
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-bhmy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 11
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-cjny.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-cjny.yml"
deleted file mode 100644
index 3bb202c..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-cjny.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9038
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-cjny?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 4
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-cmny.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-cmny.yml"
deleted file mode 100644
index 810c8a8..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-cmny.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9088
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-cmny?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 12
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-demo.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-demo.yml"
deleted file mode 100644
index ee53b79..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-demo.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9036
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: demo-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-demo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-dev.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-dev.yml"
deleted file mode 100644
index dd0f9c6..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-dev.yml"
+++ /dev/null
@@ -1,244 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: D:/ruoyi/uploadPath
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 7003
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://114.132.189.42:9099/product-inventory-management-hysn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
- host: 127.0.0.1
-# host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password: 123456
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
- # Quartz瀹氭椂浠诲姟閰嶇疆锛堟柊澧為儴鍒嗭級
- quartz:
- job-store-type: jdbc # 浣跨敤鏁版嵁搴撳瓨鍌�
- jdbc:
- initialize-schema: never # 棣栨杩愯鏃惰嚜鍔ㄥ垱寤鸿〃缁撴瀯锛屾垚鍔熷悗鏀逛负never
- schema: classpath:org/quartz/impl/jdbcjobstore/tables_mysql_innodb.sql # MySQL琛ㄧ粨鏋勮剼鏈�
- properties:
- org:
- quartz:
- scheduler:
- instanceName: RuoYiScheduler
- instanceId: AUTO
- jobStore:
- class: org.quartz.impl.jdbcjobstore.JobStoreTX
- driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate # MySQL閫傞厤
- tablePrefix: qrtz_ # 琛ㄥ悕鍓嶇紑锛屼笌鑴氭湰涓�鑷�
- isClustered: false # 鍗曡妭鐐规ā寮忥紙闆嗙兢闇�鏀逛负true锛�
- clusterCheckinInterval: 10000
- txIsolationLevelSerializable: true
- threadPool:
- class: org.quartz.simpl.SimpleThreadPool
- threadCount: 10 # 绾跨▼姹犲ぇ灏�
- threadPriority: 5
- makeThreadsDaemons: true
- updateCheck: false # 鍏抽棴鐗堟湰妫�鏌�
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: D:/ruoyi/temp/uploads # 涓存椂鐩綍
- upload-dir: D:/ruoyi/prod/uploads # 姝ｅ紡鐩綍
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-dhdc.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-dhdc.yml"
deleted file mode 100644
index 52fbd62..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-dhdc.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9032
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://192.168.1.8:3306/product-inventory-management-dhdc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 192.168.1.8
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 1
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-druid.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-druid.yml"
deleted file mode 100644
index 5cbaf32..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-druid.yml"
+++ /dev/null
@@ -1,69 +0,0 @@
-# 鏁版嵁婧愰厤缃�
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://localhost:3306/product-inventory-management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# url: jdbc:mysql://114.132.189.42:9004/product-inventory-management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
-
-file:
- temp-dir: D:/ruoyi/temp/uploads # 涓存椂鐩綍
- upload-dir: D:/ruoyi/prod/uploads # 姝ｅ紡鐩綍
-# temp-dir: /javaWork/product-inventory-management/file/temp/uploads
-# upload-dir: /javaWork/product-inventory-management/file/prod/uploads
-
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-hbkj.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-hbkj.yml"
deleted file mode 100644
index 36a993c..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-hbkj.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9117
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hbkj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 3
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-hbxm.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-hbxm.yml"
deleted file mode 100644
index 51f6710..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-hbxm.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9100
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hbxm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 13
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-hckx.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-hckx.yml"
deleted file mode 100644
index 6de381e..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-hckx.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9090
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hckx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 12
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-hcmy.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-hcmy.yml"
deleted file mode 100644
index 3521d7a..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-hcmy.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9103
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hcmy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 15
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-hhkj.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-hhkj.yml"
deleted file mode 100644
index 152f330..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-hhkj.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9046
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hhkj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-hsmy.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-hsmy.yml"
deleted file mode 100644
index f057f3f..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-hsmy.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9115
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hsmy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 2
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-hsxny.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-hsxny.yml"
deleted file mode 100644
index 4c0a3f3..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-hsxny.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9101
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hsxny?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 12
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-hxgy.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-hxgy.yml"
deleted file mode 100644
index 1a36dc4..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-hxgy.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9098
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hxgy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 14
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-hxsj.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-hxsj.yml"
deleted file mode 100644
index d756e6e..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-hxsj.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8088
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hxsj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: hxsj@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 15
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-hysn.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-hysn.yml"
deleted file mode 100644
index 825d908..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-hysn.yml"
+++ /dev/null
@@ -1,244 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9034
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-hysn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 5
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
- # Quartz瀹氭椂浠诲姟閰嶇疆锛堟柊澧為儴鍒嗭級
- quartz:
- job-store-type: jdbc # 浣跨敤鏁版嵁搴撳瓨鍌�
- jdbc:
- initialize-schema: never # 棣栨杩愯鏃惰嚜鍔ㄥ垱寤鸿〃缁撴瀯锛屾垚鍔熷悗鏀逛负never
- schema: classpath:org/quartz/impl/jdbcjobstore/tables_mysql_innodb.sql # MySQL琛ㄧ粨鏋勮剼鏈�
- properties:
- org:
- quartz:
- scheduler:
- instanceName: RuoYiScheduler
- instanceId: AUTO
- jobStore:
- class: org.quartz.impl.jdbcjobstore.JobStoreTX
- driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate # MySQL閫傞厤
- tablePrefix: qrtz_ # 琛ㄥ悕鍓嶇紑锛屼笌鑴氭湰涓�鑷�
- isClustered: false # 鍗曡妭鐐规ā寮忥紙闆嗙兢闇�鏀逛负true锛�
- clusterCheckinInterval: 10000
- txIsolationLevelSerializable: true
- threadPool:
- class: org.quartz.simpl.SimpleThreadPool
- threadCount: 10 # 绾跨▼姹犲ぇ灏�
- threadPriority: 5
- makeThreadsDaemons: true
- updateCheck: false # 鍏抽棴鐗堟湰妫�鏌�
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: false
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-jjxm.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-jjxm.yml"
deleted file mode 100644
index d5115a7..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-jjxm.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9107
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-jjxm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-jlsn.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-jlsn.yml"
deleted file mode 100644
index 72e6df9..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-jlsn.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9094
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-jlsn?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 13
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-jsmy.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-jsmy.yml"
deleted file mode 100644
index e38a579..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-jsmy.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9042
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-jsmy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 6
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-jsyny.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-jsyny.yml"
deleted file mode 100644
index a813c9a..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-jsyny.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9074
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-jsyny?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 12
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-jyhj.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-jyhj.yml"
deleted file mode 100644
index 48965fd..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-jyhj.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9030
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.16.230.40:3306/product-inventory-management-jyhj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.16.230.40
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-mkzs.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-mkzs.yml"
deleted file mode 100644
index 6e91a95..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-mkzs.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9111
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-mkzs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 1
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-mqsp.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-mqsp.yml"
deleted file mode 100644
index a09955d..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-mqsp.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9123
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-lqmsp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 6
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-mxsc.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-mxsc.yml"
deleted file mode 100644
index 792bc4b..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-mxsc.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9048
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-mxsc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-nydl.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-nydl.yml"
deleted file mode 100644
index 7d9428e..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-nydl.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9104
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://192.168.0.182:3306/product-inventory-management-nydl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: HpencZdyK7WrtQvBUKnr
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 192.168.0.182
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-phmk.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-phmk.yml"
deleted file mode 100644
index f8a7a15..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-phmk.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9119
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-phmk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 4
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-prod.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-prod.yml"
deleted file mode 100644
index 7c4b412..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-prod.yml"
+++ /dev/null
@@ -1,220 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 7003
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://114.132.189.42:9004/product-inventory-management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
- host: 127.0.0.1
-# host: localhost
-# host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
- password: root2022!
-# password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: false
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-qlmc.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-qlmc.yml"
deleted file mode 100644
index 3b8c0d0..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-qlmc.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8090
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-qlmc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: qlmc@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 15
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-rzny.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-rzny.yml"
deleted file mode 100644
index 22e060e..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-rzny.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9058
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-rzny?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-tjxm.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-tjxm.yml"
deleted file mode 100644
index 1130bb1..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-tjxm.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9064
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-tjxm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 9
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-trsw.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-trsw.yml"
deleted file mode 100644
index d9a0678..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-trsw.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9129
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: demo-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-trsw?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 13
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-tymk.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-tymk.yml"
deleted file mode 100644
index d836ed9..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-tymk.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9121
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: bdsm-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-tymk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 5
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-wdsy.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-wdsy.yml"
deleted file mode 100644
index b55f3fb..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-wdsy.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8068
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://114.132.189.42:9004/product-inventory-management-wdsy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 2
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: false
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-xyhb.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-xyhb.yml"
deleted file mode 100644
index c710d56..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-xyhb.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9052
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-xyhb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 8
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-zjyj.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-zjyj.yml"
deleted file mode 100644
index e6e4b6a..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-zjyj.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8078
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://114.132.189.42:9004/product-inventory-management-zjyj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: false
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-zqhx.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-zqhx.yml"
deleted file mode 100644
index 3a6cf4d..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-zqhx.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 1234
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://114.132.189.42:9004/product-inventory-management-zqhx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: 123456
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 1
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: false
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-zyrq.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-zyrq.yml"
deleted file mode 100644
index 9030508..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-zyrq.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9030
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: demo-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://192.168.10.230:3306/product-inventory-management-zyrq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: zyrq@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 192.168.10.230
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application-zyrqCopy.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application-zyrqCopy.yml"
deleted file mode 100644
index b73a211..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application-zyrqCopy.yml"
+++ /dev/null
@@ -1,219 +0,0 @@
-# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
- # 鍚嶇О
- name: RuoYi
- # 鐗堟湰
- version: 3.8.9
- # 鐗堟潈骞翠唤
- copyrightYear: 2025
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/product-inventory-management/file
-
- # 鑾峰彇ip鍦板潃寮�鍏�
- addressEnabled: false
- # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
- captchaType: math
-
-# 寮�鍙戠幆澧冮厤缃�
-server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 9030
- servlet:
- # 搴旂敤鐨勮闂矾寰�
- context-path: /
- tomcat:
- # tomcat鐨刄RI缂栫爜
- uri-encoding: UTF-8
- # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100
- accept-count: 1000
- threads:
- # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200
- max: 800
- # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
- min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- level:
- com.ruoyi: warn
- org.springframework: warn
-
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: demo-product
-# 鐢ㄦ埛閰嶇疆
-user:
- password:
- # 瀵嗙爜鏈�澶ч敊璇鏁�
- maxRetryCount: 5
- # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
- lockTime: 10
-
-# Spring閰嶇疆
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://172.17.0.1:3306/product-inventory-management-zyrq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: xd@123456..
- # 浠庡簱鏁版嵁婧�
- 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 1 FROM DUAL
- 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
- # 璧勬簮淇℃伅
- messages:
- # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
- basename: i18n/messages
- # 鏂囦欢涓婁紶
- servlet:
- multipart:
- # 鍗曚釜鏂囦欢澶у皬
- max-file-size: 1GB
- # 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 2GB
- # 鏈嶅姟妯″潡
- devtools:
- restart:
- # 鐑儴缃插紑鍏�
- enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
-# host: 127.0.0.1
- host: 172.17.0.1
- # 绔彛锛岄粯璁や负6379
- port: 6380
- # 鏁版嵁搴撶储寮�
- database: 5
- # 瀵嗙爜
-# password: root2022!
- password:
-
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
-
-# token閰嶇疆
-token:
- # 浠ょ墝鑷畾涔夋爣璇�
- header: Authorization
- # 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
- # 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 450
-
-# MyBatis Plus閰嶇疆
-mybatis-plus:
- # 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
- typeAliasesPackage: com.ruoyi.**.pojo
- # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢
- mapperLocations: classpath*:mapper/**/*Mapper.xml
- # 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
- configLocation: classpath:mybatis/mybatis-config.xml
- global-config:
- enable-sql-runner: true
- db-config:
- id-type: auto
-
-# PageHelper鍒嗛〉鎻掍欢
-pagehelper:
- helperDialect: mysql
- supportMethodsArguments: true
- params: count=countSql
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
- # 璇锋眰鍓嶇紑
- pathMapping: /dev-api
-
-# 闃叉XSS鏀诲嚮
-xss:
- # 杩囨护寮�鍏�
- enabled: true
- # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
- excludes: /system/notice
- # 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
-
-# 浠ｇ爜鐢熸垚
-gen:
- # 浣滆��
- author: ruoyi
- # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool
- packageName: com.ruoyi.project.system
- # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸true
- autoRemovePre: false
- # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛�
- tablePrefix: sys_
- # 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
- allowOverwrite: false
-
-file:
- temp-dir: /javaWork/product-inventory-management/file/temp/uploads
- upload-dir: /javaWork/product-inventory-management/file/prod/uploads
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/application.yml" "b/$\173project.build.directory\175/classes/src/main/resources/application.yml"
deleted file mode 100644
index c79d967..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/application.yml"
+++ /dev/null
@@ -1,4 +0,0 @@
-# Spring閰嶇疆
-spring:
- profiles:
- active: dev
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/banner.txt" "b/$\173project.build.directory\175/classes/src/main/resources/banner.txt"
deleted file mode 100644
index 0931cb8..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/banner.txt"
+++ /dev/null
@@ -1,24 +0,0 @@
-Application Version: ${ruoyi.version}
-Spring Boot Version: ${spring-boot.version}
-////////////////////////////////////////////////////////////////////
-// _ooOoo_ //
-// o8888888o //
-// 88" . "88 //
-// (| ^_^ |) //
-// O\ = /O //
-// ____/`---'\____ //
-// .' \\| |// `. //
-// / \\||| : |||// \ //
-// / _||||| -:- |||||- \ //
-// | | \\\ - /// | | //
-// | \_| ''\---/'' | | //
-// \ .-\__ `-` ___/-. / //
-// ___`. .' /--.--\ `. . ___ //
-// ."" '< `.___\_<|>_/___.' >'"". //
-// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
-// \ \ `-. \_ __\ /__ _/ .-` / / //
-// ========`-.____`-.___\_____/___.-`____.-'======== //
-// `=---=' //
-// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
-// 浣涚淇濅綉 姘镐笉瀹曟満 姘告棤BUG //
-////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/i18n/messages.properties" "b/$\173project.build.directory\175/classes/src/main/resources/i18n/messages.properties"
deleted file mode 100644
index 93de005..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/i18n/messages.properties"
+++ /dev/null
@@ -1,38 +0,0 @@
-#閿欒娑堟伅
-not.null=* 蹇呴』濉啓
-user.jcaptcha.error=楠岃瘉鐮侀敊璇�
-user.jcaptcha.expire=楠岃瘉鐮佸凡澶辨晥
-user.not.exists=鐢ㄦ埛涓嶅瓨鍦�/瀵嗙爜閿欒
-user.password.not.match=鐢ㄦ埛涓嶅瓨鍦�/瀵嗙爜閿欒
-user.password.retry.limit.count=瀵嗙爜杈撳叆閿欒{0}娆�
-user.password.retry.limit.exceed=瀵嗙爜杈撳叆閿欒{0}娆★紝甯愭埛閿佸畾{1}鍒嗛挓
-user.password.delete=瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿宸茶鍒犻櫎
-user.blocked=鐢ㄦ埛宸插皝绂侊紝璇疯仈绯荤鐞嗗憳
-role.blocked=瑙掕壊宸插皝绂侊紝璇疯仈绯荤鐞嗗憳
-login.blocked=寰堥仐鎲撅紝璁块棶IP宸茶鍒楀叆绯荤粺榛戝悕鍗�
-user.logout.success=閫�鍑烘垚鍔�
-
-length.not.valid=闀垮害蹇呴』鍦▄min}鍒皗max}涓瓧绗︿箣闂�
-
-user.username.not.valid=* 2鍒�20涓眽瀛椼�佸瓧姣嶃�佹暟瀛楁垨涓嬪垝绾跨粍鎴愶紝涓斿繀椤讳互闈炴暟瀛楀紑澶�
-user.password.not.valid=* 5-50涓瓧绗�
-
-user.email.not.valid=閭鏍煎紡閿欒
-user.mobile.phone.number.not.valid=鎵嬫満鍙锋牸寮忛敊璇�
-user.login.success=鐧诲綍鎴愬姛
-user.register.success=娉ㄥ唽鎴愬姛
-user.notfound=璇烽噸鏂扮櫥褰�
-user.forcelogout=绠＄悊鍛樺己鍒堕��鍑猴紝璇烽噸鏂扮櫥褰�
-user.unknown.error=鏈煡閿欒锛岃閲嶆柊鐧诲綍
-
-##鏂囦欢涓婁紶娑堟伅
-upload.exceed.maxSize=涓婁紶鐨勬枃浠跺ぇ灏忚秴鍑洪檺鍒剁殑鏂囦欢澶у皬锛�<br/>鍏佽鐨勬枃浠舵渶澶уぇ灏忔槸锛歿0}MB锛�
-upload.filename.exceed.length=涓婁紶鐨勬枃浠跺悕鏈�闀縶0}涓瓧绗�
-
-##鏉冮檺
-no.permission=鎮ㄦ病鏈夋暟鎹殑鏉冮檺锛岃鑱旂郴绠＄悊鍛樻坊鍔犳潈闄� [{0}]
-no.create.permission=鎮ㄦ病鏈夊垱寤烘暟鎹殑鏉冮檺锛岃鑱旂郴绠＄悊鍛樻坊鍔犳潈闄� [{0}]
-no.update.permission=鎮ㄦ病鏈変慨鏀规暟鎹殑鏉冮檺锛岃鑱旂郴绠＄悊鍛樻坊鍔犳潈闄� [{0}]
-no.delete.permission=鎮ㄦ病鏈夊垹闄ゆ暟鎹殑鏉冮檺锛岃鑱旂郴绠＄悊鍛樻坊鍔犳潈闄� [{0}]
-no.export.permission=鎮ㄦ病鏈夊鍑烘暟鎹殑鏉冮檺锛岃鑱旂郴绠＄悊鍛樻坊鍔犳潈闄� [{0}]
-no.view.permission=鎮ㄦ病鏈夋煡鐪嬫暟鎹殑鏉冮檺锛岃鑱旂郴绠＄悊鍛樻坊鍔犳潈闄� [{0}]
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/logback.xml" "b/$\173project.build.directory\175/classes/src/main/resources/logback.xml"
deleted file mode 100644
index a360583..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/logback.xml"
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
- <!-- 鏃ュ織瀛樻斁璺緞 -->
- <property name="log.path" value="/home/ruoyi/logs" />
- <!-- 鏃ュ織杈撳嚭鏍煎紡 -->
- <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
-
- <!-- 鎺у埗鍙拌緭鍑� -->
- <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- </appender>
-
- <!-- 绯荤粺鏃ュ織杈撳嚭 -->
- <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-info.log</file>
- <!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
- <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <!-- 杩囨护鐨勭骇鍒� -->
- <level>INFO</level>
- <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
- <onMatch>ACCEPT</onMatch>
- <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
- <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-error.log</file>
- <!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
- <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <!-- 杩囨护鐨勭骇鍒� -->
- <level>ERROR</level>
- <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
- <onMatch>ACCEPT</onMatch>
- <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
- <!-- 鐢ㄦ埛璁块棶鏃ュ織杈撳嚭 -->
- <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-user.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 鎸夊ぉ鍥炴粴 daily -->
- <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- </appender>
-
- <!-- 绯荤粺妯″潡鏃ュ織绾у埆鎺у埗 -->
- <logger name="com.ruoyi" level="info" />
- <!-- Spring鏃ュ織绾у埆鎺у埗 -->
- <logger name="org.springframework" level="warn" />
-
- <root level="info">
- <appender-ref ref="console" />
- </root>
-
- <!--绯荤粺鎿嶄綔鏃ュ織-->
- <root level="info">
- <appender-ref ref="file_info" />
- <appender-ref ref="file_error" />
- </root>
-
- <!--绯荤粺鐢ㄦ埛鎿嶄綔鏃ュ織-->
- <logger name="sys-user" level="info">
- <appender-ref ref="sys-user"/>
- </logger>
-</configuration>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/account/AccountExpenseMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/account/AccountExpenseMapper.xml"
deleted file mode 100644
index fff6020..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/account/AccountExpenseMapper.xml"
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.account.mapper.AccountExpenseMapper">
- <select id="accountExpenseListPage" resultType="com.ruoyi.account.pojo.AccountExpense">
- SELECT
- *
- FROM account_expense
- where
- 1=1
- <if test="accountExpense.entryDateStart != null and accountExpense.entryDateStart != '' ">
- AND expense_date >= DATE_FORMAT(#{accountExpense.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="accountExpense.entryDateEnd != null and accountExpense.entryDateEnd != '' ">
- AND expense_date <= DATE_FORMAT(#{accountExpense.entryDateEnd},'%Y-%m-%d')
- </if>
- <if test="accountExpense.expenseType != null and accountExpense.expenseType != '' ">
- AND expense_type = #{accountExpense.expenseType}
- </if>
- <if test="accountExpense.expenseMethod != null and accountExpense.expenseMethod != '' ">
- AND expense_method = #{accountExpense.expenseMethod}
- </if>
- </select>
- <select id="accountExpenseExport" resultType="com.ruoyi.account.pojo.AccountExpense">
- SELECT
- *
- FROM account_expense
- where
- 1=1
- <if test="accountExpense.entryDateStart != null and accountExpense.entryDateStart != '' ">
- AND expense_date >= DATE_FORMAT(#{accountExpense.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="accountExpense.entryDateEnd != null and accountExpense.entryDateEnd != '' ">
- AND expense_date <= DATE_FORMAT(#{accountExpense.entryDateEnd},'%Y-%m-%d')
- </if>
- <if test="accountExpense.expenseType != null and accountExpense.expenseType != '' ">
- AND expense_type = #{accountExpense.expenseType}
- </if>
- <if test="accountExpense.expenseMethod != null and accountExpense.expenseMethod != '' ">
- AND expense_method = #{accountExpense.expenseMethod}
- </if>
- </select>
- <select id="report" resultType="com.ruoyi.account.dto.AccountDto2">
- SELECT
- sdd.dict_label typeName,
- sum(expense_money) account
- FROM account_expense ae
- left join sys_dict_data sdd on ae.expense_type = sdd.dict_value and sdd.dict_type='expense_types'
- where
- 1=1
- <if test="dateQueryDto.entryDateStart != null and dateQueryDto.entryDateStart != '' ">
- AND expense_date >= DATE_FORMAT(#{dateQueryDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
- AND expense_date <= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
- </if>
- group by expense_type
- </select>
-
- <select id="report1" resultType="java.math.BigDecimal">
- SELECT
- sum(expense_money) account
- FROM account_expense ai
- where
- expense_type=#{dictValue}
- <if test="dateQueryDto.entryDateStart != null and dateQueryDto.entryDateStart != '' ">
- AND expense_date >= DATE_FORMAT(#{dateQueryDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
- AND expense_date <= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/account/AccountFileMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/account/AccountFileMapper.xml"
deleted file mode 100644
index 86266d5..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/account/AccountFileMapper.xml"
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.account.mapper.AccountFileMapper">
- <select id="accountFileListPage" resultType="com.ruoyi.account.pojo.AccountFile">
- SELECT
- *
- FROM account_file
- where
- 1=1
- <if test="accountFile.accountId != null and accountFile.accountId != ''">
- AND account_id = #{accountFile.accountId}
- </if>
- <if test="accountFile.name != null and accountFile.name != '' ">
- AND name = #{accountFile.name}
- </if>
- <if test="accountFile.accountType != null and accountFile.accountType != '' ">
- AND account_type = #{accountFile.accountType}
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/account/AccountIncomeMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/account/AccountIncomeMapper.xml"
deleted file mode 100644
index 1cb49b9..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/account/AccountIncomeMapper.xml"
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.account.mapper.AccountIncomeMapper">
-
- <select id="accountIncomeListPage" resultType="com.ruoyi.account.pojo.AccountIncome">
- SELECT
- *
- FROM account_income
- where
- 1=1
- <if test="accountIncome.entryDateStart != null and accountIncome.entryDateStart != '' ">
- AND income_date >= DATE_FORMAT(#{accountIncome.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="accountIncome.entryDateEnd != null and accountIncome.entryDateEnd != '' ">
- AND income_date <= DATE_FORMAT(#{accountIncome.entryDateEnd},'%Y-%m-%d')
- </if>
- <if test="accountIncome.incomeType != null and accountIncome.incomeType != '' ">
- AND income_type = #{accountIncome.incomeType}
- </if>
- <if test="accountIncome.incomeMethod != null and accountIncome.incomeMethod != '' ">
- AND income_method = #{accountIncome.incomeMethod}
- </if>
- </select>
- <select id="accountIncomeExport" resultType="com.ruoyi.account.pojo.AccountIncome">
- SELECT
- *
- FROM account_income
- where
- 1=1
- <if test="accountIncome.entryDateStart != null and accountIncome.entryDateStart != '' ">
- AND income_date >= DATE_FORMAT(#{accountIncome.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="accountIncome.entryDateEnd != null and accountIncome.entryDateEnd != '' ">
- AND income_date <= DATE_FORMAT(#{accountIncome.entryDateEnd},'%Y-%m-%d')
- </if>
- <if test="accountIncome.incomeType != null and accountIncome.incomeType != '' ">
- AND income_type = #{accountIncome.incomeType}
- </if>
- <if test="accountIncome.incomeMethod != null and accountIncome.incomeMethod != '' ">
- AND income_method = #{accountIncome.incomeMethod}
- </if>
- </select>
- <select id="report" resultType="com.ruoyi.account.dto.AccountDto2">
- SELECT
- sdd.dict_label typeName,
- sum(income_money) account
- FROM account_income ai
- left join sys_dict_data sdd on ai.income_type = sdd.dict_value and sdd.dict_type='income_types'
- where
- 1=1
- <if test="dateQueryDto.entryDateStart != null and dateQueryDto.entryDateStart != '' ">
- AND income_date >= DATE_FORMAT(#{dateQueryDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
- AND income_date <= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
- </if>
- group by income_type
- </select>
- <select id="report1" resultType="java.math.BigDecimal">
- SELECT
- sum(income_money) account
- FROM account_income ai
- where
- income_type=#{dictValue}
- <if test="dateQueryDto.entryDateStart != null and dateQueryDto.entryDateStart != '' ">
- AND income_date >= DATE_FORMAT(#{dateQueryDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
- AND income_date <= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml"
deleted file mode 100644
index 41cd6ca..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/aftersalesservice/AfterSalesServiceMapper.xml"
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.aftersalesservice.mapper.AfterSalesServiceMapper">
-
- <select id="listPage" resultType="com.ruoyi.aftersalesservice.pojo.AfterSalesService">
- select * from after_sales_service
- where 1 = 1
- <if test="req.feedbackDate != null">
- AND feedback_date BETWEEN #{req.feedbackDate} AND #{req.feedbackDate}
- </if>
- <if test="req.disDate != null">
- AND dis_date BETWEEN #{req.disDate} AND #{req.disDate}
- </if>
- <if test="req.tenantId != null and req.tenantId != ''">
- and tenant_id = #{req.tenantId}
- </if>
- <if test="req.status != null and req.status != ''">
- and status = #{req.status}
- </if>
- order by update_time desc
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/AnnualLeaveSettingMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/AnnualLeaveSettingMapper.xml"
deleted file mode 100644
index 39fcb3f..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/AnnualLeaveSettingMapper.xml"
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.AnnualLeaveSettingMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.approve.pojo.AnnualLeaveSetting">
- select * from annual_leave_setting
- where 1=1
- <if test="annualLeaveSetting.employeeType != null">
- and employee_type = #{annualLeaveSetting.employeeType}
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/ApproveLogMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/ApproveLogMapper.xml"
deleted file mode 100644
index e47dbbc..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/ApproveLogMapper.xml"
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.ApproveLogMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.approve.pojo.ApproveLog">
- <id property="id" column="id" />
- <result property="approveId" column="approve_id" />
- <result property="approveNodeOrder" column="approve_node_order" />
- <result property="approveUser" column="approve_user" />
- <result property="approveTime" column="approve_time" />
- <result property="approveStatus" column="approve_status" />
- <result property="approveRemark" column="approve_remark" />
- </resultMap>
-
- <sql id="Base_Column_List">
- id,approve_id,approve_node_order,approve_user,approve_time,approve_status,
- approve_remark
- </sql>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/ApproveNodeMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/ApproveNodeMapper.xml"
deleted file mode 100644
index d5863ed..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/ApproveNodeMapper.xml"
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.ApproveNodeMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.approve.pojo.ApproveNode">
- <id property="id" column="id" />
- <result property="approveProcessId" column="approve_process_id" />
- <result property="approveNodeOrder" column="approve_node_order" />
- <result property="approveNodeUser" column="approve_node_user" />
- <result property="approveNodeTime" column="approve_node_time" />
- <result property="approveNodeStatus" column="approve_node_status" />
- <result property="tenantId" column="tenant_id" />
- <result property="deleteFlag" column="delete_flag" />
- <result property="approveNodeReason" column="approve_node_reason" />
- <result property="approveNodeRemark" column="approve_node_remark" />
- </resultMap>
-
- <sql id="Base_Column_List">
- id,approve_process_id,approve_node_order,approve_node_user,approve_node_time,approve_node_status,
- tenant_id,delete_flag,approve_node_reason,approve_node_remark
- </sql>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/ApproveProcessMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/ApproveProcessMapper.xml"
deleted file mode 100644
index 33b29a9..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/ApproveProcessMapper.xml"
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.ApproveProcessMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.approve.pojo.ApproveProcess">
- <id property="id" column="id" />
- <result property="approveId" column="approve_id" />
- <result property="approveUser" column="approve_user" />
- <result property="approveDeptId" column="approve_dept_id" />
- <result property="approveDeptName" column="approve_dept_name" />
- <result property="approveUserIds" column="approve_user_ids" />
- <result property="approveUserNames" column="approve_user_names" />
- <result property="approveReason" column="approve_reason" />
- <result property="approveTime" column="approve_time" />
- <result property="approveOverTime" column="approve_over_time" />
- <result property="approveStatus" column="approve_status" />
- <result property="approveDelete" column="approve_delete" />
- <result property="tenantId" column="tenant_id" />
- <result property="approveType" column="approve_type" />
- <result property="approveRemark" column="approve_remark" />
- </resultMap>
-
- <sql id="Base_Column_List">
- id,approve_id,approve_user,approve_dept_id,approve_dept_name,approve_user_ids,
- approve_user_names,approve_reason,approve_time,approve_over_time,approve_status,
- approve_delete,tenant_id,approve_type,approve_remark
- </sql>
- <select id="listPage" resultType="com.ruoyi.approve.pojo.ApproveProcess">
- select * from approve_process where approve_delete = 0
- <if test="req.approveId != null and req.approveId != ''">
- and approve_id like concat('%',#{req.approveId},'%')
- </if>
- <if test="req.approveStatus != null or req.approveStatus == 0">
- and approve_status = #{req.approveStatus}
- </if>
- <if test="req.approveType != null ">
- and approve_type = #{req.approveType}
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/FileSharingMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/FileSharingMapper.xml"
deleted file mode 100644
index cd62025..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/FileSharingMapper.xml"
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.FileSharingMapper">
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/HolidaySettingsMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/HolidaySettingsMapper.xml"
deleted file mode 100644
index ac5f19e..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/HolidaySettingsMapper.xml"
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.HolidaySettingsMapper">
-
- <select id="listpage" resultType="com.ruoyi.approve.pojo.HolidaySettings">
- select * from holiday_settings
- where 1=1
- <if test="holidaySettings.type != null">
- and type = #{holidaySettings.type}
- </if>
- <if test="holidaySettings.name != null">
- and name like concat('%',#{holidaySettings.name},'%')
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/KnowledgeBaseMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/KnowledgeBaseMapper.xml"
deleted file mode 100644
index e4819c2..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/KnowledgeBaseMapper.xml"
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.KnowledgeBaseMapper">
-
-
- <select id="listpage" resultType="com.ruoyi.approve.pojo.KnowledgeBase">
- select * from knowledge_base
- <where>
- 1=1
- <if test="knowledgeBase.title != null and knowledgeBase.title != ''">
- and title like concat('%',#{knowledgeBase.title},'%')
- </if>
- <if test="knowledgeBase.type != null and knowledgeBase.type != ''">
- and type = #{knowledgeBase.type}
- </if>
- </where>
-
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/NotificationManagementMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/NotificationManagementMapper.xml"
deleted file mode 100644
index a2e714f..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/NotificationManagementMapper.xml"
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.NotificationManagementMapper">
-
- <select id="listpage" resultType="com.ruoyi.approve.pojo.NotificationManagement">
- select * from notification_management
- <where>
- 1=1
- <if test="notificationManagement.title != null and notificationManagement.title != ''">
- and title like concat('%',#{notificationManagement.title},'%')
- </if>
- <if test="notificationManagement.type != null">
- and type = #{notificationManagement.type}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/OnlineMeetingMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/OnlineMeetingMapper.xml"
deleted file mode 100644
index 5ce6d5d..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/OnlineMeetingMapper.xml"
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.OnlineMeetingMapper">
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/OvertimeSettingMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/OvertimeSettingMapper.xml"
deleted file mode 100644
index b496353..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/OvertimeSettingMapper.xml"
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.OvertimeSettingMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.approve.pojo.OvertimeSetting">
- select * from overtime_setting
- where 1=1
- <if test="overtimeSetting.type != null">
- and type = #{overtimeSetting.type}
- </if>
- <if test="overtimeSetting.name != null and overtimeSetting.name !=''">
- and name like concat('%',#{overtimeSetting.name},'%')
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/RpaProcessAutomationMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/RpaProcessAutomationMapper.xml"
deleted file mode 100644
index 4471d61..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/RpaProcessAutomationMapper.xml"
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.RpaProcessAutomationMapper">
-
- <select id="listpage" resultType="com.ruoyi.approve.pojo.RpaProcessAutomation">
- select * from rpa_process_automation
- <where>
- 1=1
- <if test="rpaProcessAutomation.programName != null and rpaProcessAutomation.programName != ''">
- and program_name like concat('%',#{rpaProcessAutomation.programName},'%')
- </if>
- <if test="rpaProcessAutomation.status != null">
- and status = #{rpaProcessAutomation.status}
- </if>
- </where>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/WorkingHoursSettingMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/WorkingHoursSettingMapper.xml"
deleted file mode 100644
index 63bc1c3..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/approve/WorkingHoursSettingMapper.xml"
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.approve.mapper.WorkingHoursSettingMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.approve.pojo.WorkingHoursSetting">
- select * from working_hours_setting
- where 1=1
- <if test="workingHoursSetting.name != null and workingHoursSetting.name !=''">
- and name like concat('%',#{workingHoursSetting.name},'%')
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/basic/StorageAttachmentMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/basic/StorageAttachmentMapper.xml"
deleted file mode 100644
index a2cc6cf..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/basic/StorageAttachmentMapper.xml"
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.basic.mapper.StorageAttachmentMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StorageAttachment">
- <id column="id" property="id" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="deleted" property="deleted" />
- <result column="record_type" property="recordType" />
- <result column="record_id" property="recordId" />
- <result column="name" property="name" />
- <result column="storage_blob_id" property="storageBlobId" />
- </resultMap>
-
- <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
- <sql id="Base_Column_List">
- id, create_time, update_time, deleted, record_type, record_id, name, storage_blob_id
- </sql>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/basic/StorageBlobMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/basic/StorageBlobMapper.xml"
deleted file mode 100644
index 84e3b00..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/basic/StorageBlobMapper.xml"
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.basic.mapper.StorageBlobMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StorageBlob">
- <id column="id" property="id" />
- <result column="create_time" property="createTime" />
- <result column="key" property="key" />
- <result column="content_type" property="contentType" />
- <result column="original_filename" property="originalFilename" />
- <result column="bucket_filename" property="bucketFilename" />
- <result column="bucket_name" property="bucketName" />
- <result column="byte_size" property="byteSize" />
- </resultMap>
-
- <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
- <sql id="Base_Column_List">
- id, create_time, key, content_type, original_filename,bucket_filename,bucket_name, byte_size
- </sql>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/basic/SupplierManageMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/basic/SupplierManageMapper.xml"
deleted file mode 100644
index 9e65903..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/basic/SupplierManageMapper.xml"
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.basic.mapper.SupplierManageMapper">
-
- <select id="supplierListPage" resultType="com.ruoyi.basic.dto.SupplierManageDto">
- SELECT
- T1.id,
- T1.supplier_name,
- T1.taxpayer_identification_num,
- T1.company_address,
- T1.company_phone,
- T1.bank_account_name,
- T1.bank_account_num,
- T1.contact_user_name,
- T1.contact_user_phone,
- T1.maintain_user_id,
- T1.maintain_time,
- T1.create_time,
- T1.create_user,
- T1.update_time,
- T1.update_user,
- T1.tenant_id,
- T2.nick_name AS maintainUserName
- FROM supplier_manage T1
- LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
- <where>
- <if test="supplierManageDto.supplierName != null and supplierManageDto.supplierName != '' ">
- AND T1.supplier_name LIKE CONCAT('%',#{supplierManageDto.supplierName},'%')
- </if>
- </where>
- </select>
-
- <select id="supplierExportList" resultType="com.ruoyi.basic.excel.SupplierManageExcelDto">
- SELECT
- T1.id,
- T1.supplier_name,
- T1.taxpayer_identification_num,
- T1.company_address,
- T1.company_phone,
- T1.bank_account_name,
- T1.bank_account_num,
- T1.contact_user_name,
- T1.contact_user_phone,
- T1.maintain_user_id,
- T1.maintain_time,
- T1.create_time,
- T1.create_user,
- T1.update_time,
- T1.update_user,
- T1.tenant_id,
- T2.nick_name AS maintainUserName
- FROM supplier_manage T1
- LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
- <where>
- <if test="supplierManageDto.supplierName != null and supplierManageDto.supplierName != '' ">
- AND T1.supplier_name LIKE CONCAT('%',#{supplierManageDto.supplierName},'%')
- </if>
- </where>
- </select>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/DutyPlanMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/DutyPlanMapper.xml"
deleted file mode 100644
index 6c1679d..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/DutyPlanMapper.xml"
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.DutyPlanMapper">
- <resultMap id="DutyPlanDTOMap" type="com.ruoyi.collaborativeApproval.dto.DutyPlanDTO">
- <result column="id" property="id"/>
- <result column="tags" property="tags" typeHandler="com.ruoyi.approve.utils.ListToStringTypeHandler"/>
- </resultMap>
-
- <select id="listPage" resultMap="DutyPlanDTOMap">
- select * from duty_plan
- <where>
- 1=1
- <if test="dutyPlan.title != null and dutyPlan.title != ''">
- and title like concat('%',#{dutyPlan.title},'%')
- </if>
- <if test="dutyPlan.level != null">
- and level = #{dutyPlan.level}
- </if>
- <if test="dutyPlan.period != null">
- and period = #{dutyPlan.period}
- </if>
- <if test="dutyPlan.queryDate != null">
- and start_date <= #{dutyPlan.queryDate}
- and end_date >= #{dutyPlan.queryDate}
- </if>
- </where>
- </select>
-
- <select id="getNum" resultType="java.util.Map">
- SELECT
- level,
- COUNT(*) AS num,
- ROUND(COUNT(*) / total.count * 100) AS completion
- FROM
- duty_plan,
- (SELECT COUNT(*) AS count FROM duty_plan) AS total
- GROUP BY
- level, total.count
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/MeetApplicationMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/MeetApplicationMapper.xml"
deleted file mode 100644
index a195317..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/MeetApplicationMapper.xml"
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.MeetApplicationMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.collaborativeApproval.pojo.MeetApplication">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="title" column="title" jdbcType="VARCHAR"/>
- <result property="type" column="type" jdbcType="VARCHAR"/>
- <result property="roomId" column="room_id" jdbcType="BIGINT"/>
- <result property="host" column="host" jdbcType="VARCHAR"/>
- <result property="meetingDate" column="meeting_date" jdbcType="DATE"/>
- <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
- <result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
- <result property="participants" column="participants" jdbcType="VARCHAR"/>
- <result property="description" column="description" jdbcType="VARCHAR"/>
- <result property="applicationType" column="application_type" jdbcType="VARCHAR"/>
- <result property="status" column="status" jdbcType="TINYINT"/>
- <result property="applicant" column="applicant" jdbcType="VARCHAR"/>
- <result property="createUser" column="create_user" jdbcType="BIGINT"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id,title,type,
- room_id,host,meeting_date,
- start_time,end_time,participants,
- description,application_type,status,
- applicant,create_user,create_time,
- update_user,update_time,tenant_id
- </sql>
- <select id="getMeetSummary" resultType="com.ruoyi.collaborativeApproval.dto.MeetSummaryDto">
- SELECT
- COUNT(*) AS total,
- SUM(CASE
- WHEN meeting_date = CURDATE() AND start_time <![CDATA[<=]]> NOW() AND end_time <![CDATA[>]]> NOW()
- THEN 1 ELSE 0
- END) AS underWay,
- SUM(CASE
- WHEN (meeting_date <![CDATA[<]]> CURDATE() OR (meeting_date = CURDATE() AND end_time <![CDATA[<=]]> NOW()))
- THEN 1 ELSE 0
- END) AS completed,
- SUM(CASE
- WHEN meeting_date <![CDATA[>=]]> CURDATE() AND start_time <![CDATA[>]]> NOW()
- THEN 1 ELSE 0
- END) AS toStart
- FROM meet_application as t1
- where status = 1 OR application_type='notification'
- </select>
- <select id="getMeetSummaryItems" resultType="com.ruoyi.collaborativeApproval.dto.MeetingSimpleDto">
- select t1.id as id,
- t1.title as title,
- (CASE
- WHEN t1.meeting_date = CURDATE() AND t1.start_time <![CDATA[<=]]> NOW() AND t1.end_time <![CDATA[>]]> NOW()
- THEN 2
- WHEN t1.meeting_date <![CDATA[>=]]> CURDATE() AND t1.start_time <![CDATA[>]]> NOW() then 1
- ELSE 0 end) as status,
- t1.start_time as start_time,
- t1.end_time as end_time,
- CONCAT(t2.name, '(', t2.location, ')') as location,
- t1.host as host,
- t1.participants as participants,
- t3.content as content
- from meet_application
- as t1
- left join meeting_room as t2 on t1.room_id = t2.id
- left join meeting_minutes as t3 on t1.id = t3.meeting_id
- where t1.status = 1
- OR t1.application_type = 'notification'
- order by (CASE
- WHEN t1.meeting_date = CURDATE() AND t1.start_time <![CDATA[<=]]> NOW() AND t1.end_time <![CDATA[>]]> NOW()
- THEN 2
- WHEN t1.meeting_date <![CDATA[>=]]> CURDATE() AND t1.start_time > NOW() then 1
- ELSE 0 end) desc, t1.end_time desc
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/MeetDraftMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/MeetDraftMapper.xml"
deleted file mode 100644
index 3b2c86a..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/MeetDraftMapper.xml"
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.MeetDraftMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.collaborativeApproval.pojo.MeetDraft">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="roomId" column="room_id" jdbcType="BIGINT"/>
- <result property="title" column="title" jdbcType="VARCHAR"/>
- <result property="host" column="host" jdbcType="VARCHAR"/>
- <result property="meetingDate" column="meeting_date" jdbcType="DATE"/>
- <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
- <result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
- <result property="participants" column="participants" jdbcType="INTEGER"/>
- <result property="participantList" column="participant_list" jdbcType="VARCHAR"/>
- <result property="description" column="description" jdbcType="VARCHAR"/>
- <result property="creator" column="creator" jdbcType="VARCHAR"/>
- <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id,room_id,title,
- host,meeting_date,start_time,
- end_time,participants,participant_list,
- description,creator,create_user,
- create_time,update_user,update_time,
- tenant_id
- </sql>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/MeetingMinutesMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/MeetingMinutesMapper.xml"
deleted file mode 100644
index 5904e3a..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/MeetingMinutesMapper.xml"
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.MeetingMinutesMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.collaborativeApproval.pojo.MeetingMinutes">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="meetingId" column="meeting_id" jdbcType="BIGINT"/>
- <result property="title" column="title" jdbcType="VARCHAR"/>
- <result property="content" column="content" jdbcType="VARCHAR"/>
- <result property="createUser" column="create_user" jdbcType="BIGINT"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id,meeting_id,title,
- content,create_user,create_time,
- update_user,update_time,tenant_id
- </sql>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/MeetingRoomMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/MeetingRoomMapper.xml"
deleted file mode 100644
index feac888..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/MeetingRoomMapper.xml"
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.MeetingRoomMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.collaborativeApproval.pojo.MeetingRoom">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="name" column="name" jdbcType="VARCHAR"/>
- <result property="location" column="location" jdbcType="VARCHAR"/>
- <result property="capacity" column="capacity" jdbcType="INTEGER"/>
- <result property="equipment" column="equipment" jdbcType="VARCHAR"/>
- <result property="status" column="status" jdbcType="TINYINT"/>
- <result property="remark" column="remark" jdbcType="VARCHAR"/>
- <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id,name,location,
- capacity,equipment,status,
- remark,create_user,create_time,
- update_user,update_time,tenant_id
- </sql>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml"
deleted file mode 100644
index 5f646ad..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/NoticeMapper.xml"
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.NoticeMapper">
-
- <select id="listPage" resultType="com.ruoyi.collaborativeApproval.dto.NoticeDTO">
- select n.*, su.user_name as create_user_name
- from notice n
- left join sys_user su on n.create_user = su.user_id
- <where>
- <if test="ew.title != null and ew.title != ''">
- and n.title like concat('%',#{ew.title},'%')
- </if>
- <if test="ew.type != null">
- and n.type = #{ew.type}
- </if>
- <if test="ew.status != null">
- and n.status = #{ew.status}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/ReadingStatusMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/ReadingStatusMapper.xml"
deleted file mode 100644
index c61f17d..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/ReadingStatusMapper.xml"
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.ReadingStatusMapper">
-
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml"
deleted file mode 100644
index 03dc024..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml"
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.RulesRegulationsManagementMapper">
- <resultMap id="RulesRegulationsManagementDTOMap" type="com.ruoyi.collaborativeApproval.dto.RulesRegulationsManagementDTO">
- <!-- 鍏朵粬瀛楁鏄犲皠锛堜繚鎸佷笉鍙橈級 -->
- <result column="id" property="id"/>
- <result column="regulation_num" property="regulationNum"/>
- <result column="title" property="title"/>
- <!-- ... 鐪佺暐鍏朵粬瀛楁 ... -->
-
- <!-- 鍏抽敭淇锛氫负 scope 瀛楁鎸囧畾绫诲瀷澶勭悊鍣� -->
- <result column="scope" property="scope" typeHandler="com.ruoyi.approve.utils.ListToStringTypeHandler"/>
- </resultMap>
-
- <select id="listPage" resultMap="RulesRegulationsManagementDTOMap">
- select rrm.*, su.user_name as create_user_name
- from rules_regulations_management rrm
- left join sys_user su on rrm.create_user = su.user_id
- <where>
- <if test="ew.regulationNum != null and ew.regulationNum != ''">
- and rrm.regulation_num = #{ew.regulationNum}
- </if>
- <if test="ew.title != null and ew.title != ''">
- and rrm.title like concat('%',#{ew.title},'%')
- </if>
- <if test="ew.category != null">
- and rrm.category = #{ew.category}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml"
deleted file mode 100644
index b8ad6a7..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml"
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.SealApplicationManagementMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.collaborativeApproval.dto.SealApplicationManagementDTO">
- select sam.*, su.user_name as create_user_name, d.dept_name as department
- from seal_application_management sam
- left join sys_user su on sam.create_user = su.user_id
- left join sys_user_dept sud on su.user_id = sud.user_id
- left join sys_dept d on sud.dept_id = d.dept_id
- <where>
- <if test="ew.title != null and ew.title != ''">
- and sam.title like concat('%',#{ew.title},'%')
- </if>
- <if test="ew.status != null">
- and sam.status = #{ew.status}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/StaffContactsPersonalMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/StaffContactsPersonalMapper.xml"
deleted file mode 100644
index 36ce60d..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/collaborativeApproval/StaffContactsPersonalMapper.xml"
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.collaborativeApproval.mapper.StaffContactsPersonalMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.collaborativeApproval.dto.StaffContactsPersonalDTO">
- SELECT
- scp.id,
- scp.contact_id,
- sjlr.staff_no,
- sjlr.staff_name,
- sjlr.sex,
- sjlr.post_job,
- sjlr.adress,
- sjlr.profession,
- sjlr.identity_card,
- sjlr.phone,
- scp.create_time
- FROM staff_contacts_personal scp
- LEFT JOIN (select * from staff_join_leave_record WHERE staff_state = 1) sjlr ON scp.contact_id=sjlr.id
- where 1=1
- <if test="staffContactsPersonalDTO.staffName != null and staffContactsPersonalDTO.staffName != ''">
- and sjlr.staff_name like concat('%',#{staffContactsPersonalDTO.staffName},'%')
- </if>
-
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml"
deleted file mode 100644
index f15dd8c..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml"
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.compensationperformance.mapper.CompensationPerformanceMapper">
-
- <select id="listPage" resultType="com.ruoyi.compensationperformance.pojo.CompensationPerformance">
- select * from compensation_performance
- <where>
- <if test="req.name != null and req.name != ''">
- and `name` like concat('%',#{req.name},'%')
- </if>
- <if test="req.payDateStr != null and req.payDateStr != ''">
- and pay_date like concat('%',#{req.payDateStr},'%')
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/customervisits/CustomerVisitsMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/customervisits/CustomerVisitsMapper.xml"
deleted file mode 100644
index 92d44bd..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/customervisits/CustomerVisitsMapper.xml"
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.customervisits.mapper.CustomerVisitsMapper">
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/device/DeviceDefectRecordMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/device/DeviceDefectRecordMapper.xml"
deleted file mode 100644
index bcd4bd5..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/device/DeviceDefectRecordMapper.xml"
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.ruoyi.device.mapper.DeviceDefectRecordMapper">
-
- <select id="listPage" resultType="com.ruoyi.device.dto.DeviceDefectRecordDto">
- select ddr.*,dl.device_name,dl.device_model
- from device_defect_record ddr
- left join device_ledger dl on ddr.device_ledger_id = dl.id
- <where>
- 1=1
- <if test="deviceDefectRecordDto.deviceLedgerId != null">
- and ddr.device_ledger_id = #{deviceDefectRecordDto.deviceLedgerId}
- </if>
- <if test="deviceDefectRecordDto.deviceName != null and deviceDefectRecordDto.deviceName != ''">
- and dl.device_name like concat('%',#{deviceDefectRecordDto.deviceName},'%')
- </if>
- <if test="deviceDefectRecordDto.status != null">
- and ddr.status = #{deviceDefectRecordDto.status}
- </if>
- </where>
-
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/device/DeviceLedgerMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/device/DeviceLedgerMapper.xml"
deleted file mode 100644
index 9cee459..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/device/DeviceLedgerMapper.xml"
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.ruoyi.device.mapper.DeviceLedgerMapper">
-
- <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceLedgerDto">
- SELECT
- dl.id,
- dl.device_name,
- dl.device_model,
- dl.supplier_name,
- dl.unit,
- dl.number,
- dl.status,
- dl.plan_runtime_time,
- dl.start_runtime_time,
- dl.end_runtime_time,
- dl.runtime_duration,
- dl.tax_including_price_unit,
- dl.tax_including_price_total,
- dl.tax_rate,
- dl.un_tax_including_price_total,
- dl.create_time,
- dl.update_time ,
- su.user_name AS createUser,
- dl.update_user,
- dl.tenant_id
- FROM device_ledger dl
- left join sys_user su on dl.create_user = su.user_id
- <where>
- <!-- 璁惧鍚嶇О -->
- <if test="deviceLedger.deviceName != null and deviceLedger.deviceName != ''">
- AND device_name LIKE CONCAT('%', #{deviceLedger.deviceName}, '%')
- </if>
-
- <!-- 瑙勬牸鍨嬪彿 -->
- <if test="deviceLedger.deviceModel != null and deviceLedger.deviceModel != ''">
- AND device_model LIKE CONCAT('%', #{deviceLedger.deviceModel}, '%')
- </if>
-
- <!-- 渚涘簲鍟嗗悕绉� -->
- <if test="deviceLedger.supplierName != null and deviceLedger.supplierName != ''">
- AND supplier_name LIKE CONCAT('%', #{deviceLedger.supplierName}, '%')
- </if>
-
- <!-- 鍗曚綅 -->
- <if test="deviceLedger.unit != null and deviceLedger.unit != ''">
- AND unit = #{deviceLedger.unit}
- </if>
-
- <!-- 褰曞叆浜� -->
- <if test="deviceLedger.createUser != null and deviceLedger.createUser != ''">
- AND create_user LIKE CONCAT('%', #{deviceLedger.createUser}, '%')
- </if>
-
- <!-- 鏇存柊浜� -->
- <if test="deviceLedger.updateUser != null and deviceLedger.updateUser != ''">
- AND update_user LIKE CONCAT('%', #{deviceLedger.updateUser}, '%')
- </if>
-
- <if test="deviceLedger.entryDateStart != null and deviceLedger.entryDateStart != '' ">
- AND dl.create_time >= DATE_FORMAT(#{deviceLedger.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="deviceLedger.entryDateEnd != null and deviceLedger.entryDateEnd != '' ">
- AND dl.create_time <= DATE_FORMAT(#{deviceLedger.entryDateEnd},'%Y-%m-%d')
- </if>
-
- <!-- 绉熸埛ID -->
- <if test="deviceLedger.tenantId != null">
- AND tenant_id = #{deviceLedger.tenantId}
- </if>
- </where>
- ORDER BY create_time DESC
- </select>
- <select id="deviceLedgerExportList" resultType="com.ruoyi.device.execl.DeviceLedgerExeclDto">
-
- </select>
- <select id="selectById1" resultType="com.ruoyi.device.pojo.DeviceLedger">
- select *
- from device_ledger
- where id = #{id}
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml"
deleted file mode 100644
index 9917ce2..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml"
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.ruoyi.device.mapper.DeviceMaintenanceMapper">
-
- <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
- select dm.id,
- dm.device_ledger_id,
- dm.maintenance_plan_time,
- dm.maintenance_actually_time,
- dm.maintenance_result,
- dm.status,
- dm.create_time,
- dm.update_time,
- dm.create_user,
- dm.update_user,
- dm.tenant_id,
- dm.maintenance_actually_name,
- dl.device_name,
- dl.device_model,
- su.user_name as create_user_name
- from device_maintenance dm
- left join device_ledger dl on dm.device_ledger_id = dl.id
- left join sys_user su on dm.create_user = su.user_id
- <where>
- 1 = 1
- <if test="deviceMaintenanceDto.deviceName != null">
- and dl.device_name like concat('%',#{deviceMaintenanceDto.deviceName},'%')
- </if>
- <if test="deviceMaintenanceDto.deviceModel != null">
- and dl.device_model like concat('%',#{deviceMaintenanceDto.deviceModel},'%')
- </if>
- <if test="deviceMaintenanceDto.maintenanceActuallyName != null">
- and dm.maintenance_actually_name like concat('%',#{deviceMaintenanceDto.maintenanceActuallyName},'%')
- </if>
- <if test="deviceMaintenanceDto.maintenancePlanTimeReq != null">
- and dm.maintenance_plan_time like concat('%',#{deviceMaintenanceDto.maintenancePlanTimeReq},'%')
- </if>
- <if test="deviceMaintenanceDto.maintenanceActuallyTimeReq != null">
- and dm.maintenance_actually_time like concat('%',#{deviceMaintenanceDto.maintenanceActuallyTimeReq},'%')
- </if>
- </where>
- </select>
- <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
- select dm.id,
- dm.device_ledger_id,
- dm.maintenance_plan_time,
- dm.maintenance_actually_time,
- dm.maintenance_result,
- dm.status,
- dm.create_time,
- dm.update_time,
- dm.create_user,
- dm.update_user,
- dm.tenant_id,
- dm.maintenance_actually_name,
- dl.device_name,
- dl.device_model,
- su.user_name as create_user_name
- from device_maintenance dm
- left join device_ledger dl on dm.device_ledger_id = dl.id
- left join sys_user su on dm.create_user = su.user_id
- where dm.id = #{id}
- </select>
- <select id="list1" resultType="com.ruoyi.device.pojo.DeviceMaintenance">
- select *
- from device_maintenance
- where device_ledger_id = #{id}
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/device/DeviceRepairMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/device/DeviceRepairMapper.xml"
deleted file mode 100644
index e8565d6..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/device/DeviceRepairMapper.xml"
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.ruoyi.device.mapper.DeviceRepairMapper">
-
- <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
- select dr.id,
- dr.device_ledger_id,
- dr.repair_time,
- dr.repair_name,
- dr.remark,
- dr.maintenance_name,
- dr.maintenance_time,
- dr.maintenance_result,
- dr.status,
- dr.create_time,
- dr.update_time,
- dr.create_user,
- dr.update_user,
- dr.tenant_id,
- dl.device_name,
- dl.device_model
- from device_repair dr
- left join device_ledger dl on dr.device_ledger_id = dl.id
- <where>
- 1 = 1
- <if test="deviceRepairDto.deviceName != null">
- and dl.device_name like concat('%',#{deviceRepairDto.deviceName},'%')
- </if>
- <if test="deviceRepairDto.deviceModel != null">
- and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
- </if>
- <if test="deviceRepairDto.remark != null">
- and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
- </if>
- <if test="deviceRepairDto.maintenanceName != null">
- and dr.maintenance_name like concat('%',#{deviceRepairDto.maintenanceName},'%')
- </if>
-
- <if test="deviceRepairDto.repairTimeStr != null and deviceRepairDto.repairTimeStr != '' ">
- and dr.repair_time like concat('%',#{deviceRepairDto.repairTimeStr},'%')
- </if>
- <if test="deviceRepairDto.maintenanceTimeStr != null and deviceRepairDto.maintenanceTimeStr != '' ">
- and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
- </if>
- </where>
- </select>
- <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
- select dr.id,
- dr.device_ledger_id,
- dr.repair_time,
- dr.repair_name,
- dr.remark,
- dr.maintenance_name,
- dr.maintenance_time,
- dr.maintenance_result,
- dr.status,
- dr.create_time,
- dr.update_time,
- dr.create_user,
- dr.update_user,
- dr.tenant_id,
- dl.device_name,
- dl.device_model
- from device_repair dr
- left join device_ledger dl on dr.device_ledger_id = dl.id
- where dr.id = #{id}
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml"
deleted file mode 100644
index c026425..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml"
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.equipmentenergyconsumption.mapper.EnergyPeriodMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.EnergyPeriod">
- select * from energy_period
- <where>
- <if test="energyPeriod.date != null">
- date = #{energyPeriod.date}
- </if>
- <if test="energyPeriod.price != null">
- and price = #{energyPeriod.price}
- </if>
- <if test="energyPeriod.peak != null">
- and peak = #{energyPeriod.peak}
- </if>
- <if test="energyPeriod.valley != null">
- and valley = #{energyPeriod.valley}
- </if>
- <if test="energyPeriod.flat != null">
- and flat = #{energyPeriod.flat}
- </if>
- <if test="energyPeriod.sharp != null">
- and sharp = #{energyPeriod.sharp}
- </if>
- </where>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml"
deleted file mode 100644
index eda1827..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/equipmentenergyconsumption/EquipmentEnergyConsumptionMapper.xml"
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.equipmentenergyconsumption.mapper.EquipmentEnergyConsumptionMapper">
-
- <select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption">
- select * from equipment_energy_consumption
- where 1=1
- <if test="req.name != null and req.name != ''">
- and `name` like concat('%',#{req.name},'%')
- </if>
- </select>
- <select id="listPageByTrend" resultType="com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption">
- SELECT
- *,
- day_num as toDayNum
- FROM
- equipment_energy_consumption
- WHERE
- run_date = DATE_SUB(CURRENT_DATE(), INTERVAL 1 DAY)
- <if test="req.name != null and req.name != ''">
- and `name` like concat('%',#{req.name},'%')
- </if>
- GROUP BY
- `code`
- ORDER BY
- update_time DESC;
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml"
deleted file mode 100644
index aed220c..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml"
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.equipmentenergyconsumption.mapper.ElectricityConsumptionAreaMapper">
-
- <select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea">
- select * from electricity_consumption_area
- <where>
- <if test="electricityConsumptionArea.id != null">
- id = #{electricityConsumptionArea.id}
- </if>
- <if test="electricityConsumptionArea.areaName != null and electricityConsumptionArea.areaName != ''">
- and area_name like CONCAT('%', #{electricityConsumptionArea.areaName}, '%')
- </if>
- <if test="electricityConsumptionArea.areaType != null and electricityConsumptionArea.areaType != ''">
- and area_type like CONCAT('%', #{electricityConsumptionArea.areaType}, '%')
- </if>
- <if test="electricityConsumptionArea.sort != null">
- and sort = #{electricityConsumptionArea.sort}
- </if>
- <if test="electricityConsumptionArea.fuId != null">
- and fu_id = #{electricityConsumptionArea.fuId}
- </if>
- </where>
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/inspectiontask/TimingTaskMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/inspectiontask/TimingTaskMapper.xml"
deleted file mode 100644
index bb74e0e..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/inspectiontask/TimingTaskMapper.xml"
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.inspectiontask.mapper.TimingTaskMapper">
-
- <select id="getTaskById" resultType="com.ruoyi.inspectiontask.pojo.TimingTask" useCache="false">
- SELECT * FROM timing_task WHERE id = #{id}
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml"
deleted file mode 100644
index 81cf11d..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml"
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.lavorissue.mapper.LavorIssueMapper">
-
- <select id="listPage" resultType="com.ruoyi.lavorissue.pojo.LaborIssue">
- select
- t1.*,
- t2.staff_name as staffName,
- t2.staff_no as staffNo,
- t3.dict_label as dictName,
- t4.dict_label as dictTypeName
- from labor_issue t1
- left join staff_join_leave_record t2 on t1.staff_id = t2.id
- left join sys_dict_data t3 on t1.dict_id = t3.dict_value
- left join sys_dict_data t4 on t1.dict_type = t4.dict_value
- <where>
- <if test="req.season != null and req.season != ''">
- and (t1.issue_date >= #{req.startDate} and t1.issue_date <= #{req.endDate})
- </if>
- <if test="req.issueDate != null">
- and (t1.issue_date >= #{req.startDate} and t1.issue_date <= #{req.endDate})
- </if>
- <if test="req.staffName != null and req.staffName != ''">
- and t2.staff_name like concat('%',#{req.staffName},'%')
- </if>
- <if test="req.status != null and req.status == 1">
- and t1.adopted_date is not null
- </if>
- <if test="req.status != null and req.status == 2">
- and t1.adopted_date is null
- </if>
- <if test="req.status != null and req.status == 3">
- and t1.adopted_date is not null and t1.issue_date < t1.adopted_date
- </if>
- <if test="req.status != null and req.status == 4">
- and t1.adopted_date is null and t1.issue_date < current_date()
- </if>
- </where>
- </select>
- <select id="list" resultType="com.ruoyi.lavorissue.pojo.LaborIssue">
- select
- t1.*,
- t2.staff_name as staffName,
- t2.staff_no as staffNo,
- t3.dict_label as dictName,
- t4.dict_label as dictTypeName
- from labor_issue t1
- left join staff_join_leave_record t2 on t1.staff_id = t2.id
- left join sys_dict_data t3 on t1.dict_id = t3.dict_value
- left join sys_dict_data t4 on t1.dict_type = t4.dict_value
- <where>
- <if test="req.adoptedDate != null">
- and t1.adopted_date is null
- </if>
- <if test="req.issueDate != null">
- and (t1.issue_date >= #{req.startDate} and t1.issue_date <= #{req.endDate})
- </if>
- <if test="req.staffId != null">
- and t1.staff_id = #{req.staffId}
- </if>
- <if test="req.season != null and req.season != ''">
- and (t1.issue_date >= #{req.startDate} and t1.issue_date <= #{req.endDate})
- </if>
- <if test="req.status != null and req.status == 1">
- and t1.adopted_date is not null
- </if>
- <if test="req.status != null and req.status == 2">
- and t1.adopted_date is null
- </if>
- <if test="req.status != null and req.status == 3">
- and t1.adopted_date is not null and t1.issue_date < t1.adopted_date
- </if>
- <if test="req.status != null and req.status == 4">
- and t1.adopted_date is null and t1.issue_date < current_date()
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml"
deleted file mode 100644
index fc680d0..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml"
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.measuringinstrumentledger.mapper.MeasuringInstrumentLedgerMapper">
-
- <select id="listPage" resultType="com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedger">
- SELECT
- id,
- user_id,
- user_name,
- code,
- name,
- model,
- most_date,
- valid,
- next_date,
- record_date,
- CASE
- WHEN next_date >= DATE_FORMAT(now(),'%Y-%m-%d') THEN 1
- ELSE 2
- END AS status,
- create_user,
- create_time,
- update_user,
- update_time,
- tenant_id
- FROM
- measuring_instrument_ledger
- <where>
- <!-- 鏌ヨ鏉′欢鍚屼笂 -->
- <if test="req.code != null and req.code != ''">
- AND code LIKE CONCAT('%', #{req.code}, '%')
- </if>
- <if test="req.name != null and req.name != ''">
- AND name LIKE CONCAT('%', #{req.name}, '%')
- </if>
- <if test="req.status != null">
- <choose>
- <when test="req.status == 1">
- AND next_date >= DATE_FORMAT(now(),'%Y-%m-%d')
- </when>
- <when test="req.status == 2">
- AND next_date < DATE_FORMAT(now(),'%Y-%m-%d')
- </when>
- </choose>
- </if>
- <if test="req.tenantId != null">
- AND tenant_id = #{req.tenantId}
- </if>
- <if test="req.recordDate != null">
- AND record_date = DATE_FORMAT(#{req.recordDate},'%Y-%m-%d')
- </if>
- </where>
- ORDER BY update_time DESC
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerRecordMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerRecordMapper.xml"
deleted file mode 100644
index 69446e0..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerRecordMapper.xml"
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.measuringinstrumentledger.mapper.MeasuringInstrumentLedgerRecordMapper">
-
- <select id="listPage"
- resultType="com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedgerRecord">
- SELECT
- t1.id,
- t1.user_id,
- t1.user_name,
- t2.code,
- t2.name,
- t2.model,
- t1.valid,
- t1.record_date,
- t1.entry_date
- FROM
- measuring_instrument_ledger_record t1
- left join measuring_instrument_ledger t2 on t1.measuring_instrument_ledger_id = t2.id
- <where>
- <!-- 鏌ヨ鏉′欢鍚屼笂 -->
- <if test="req.code != null and req.code != ''">
- AND t2.code LIKE CONCAT('%', #{req.code}, '%')
- </if>
- <if test="req.name != null and req.name != ''">
- AND t2.name LIKE CONCAT('%', #{req.name}, '%')
- </if>
- <if test="req.entryDate != null">
- AND t1.entry_date = DATE_FORMAT(#{req.entryDate},'%Y-%m-%d')
- </if>
- <if test="req.recordDate != null">
- AND t1.record_date = DATE_FORMAT(#{req.recordDate},'%Y-%m-%d')
- </if>
- </where>
- ORDER BY t1.update_time DESC
- </select>
- <select id="list" resultType="com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedgerRecord">
- SELECT
- t1.id,
- t1.user_id,
- t1.user_name,
- t2.code,
- t2.name,
- t2.model,
- t1.valid,
- t1.record_date,
- t1.entry_date
- FROM
- measuring_instrument_ledger_record t1
- left join measuring_instrument_ledger t2 on t1.measuring_instrument_ledger_id = t2.id
- <where>
- <!-- 鏌ヨ鏉′欢鍚屼笂 -->
- <if test="req.code != null and req.code != ''">
- AND t2.code LIKE CONCAT('%', #{req.code}, '%')
- </if>
- <if test="req.name != null and req.name != ''">
- AND t2.name LIKE CONCAT('%', #{req.name}, '%')
- </if>
- <if test="req.entryDate != null">
- AND t1.entry_date = DATE_FORMAT(#{req.entryDate},'%Y-%m-%d')
- </if>
- <if test="req.recordDate != null">
- AND t1.record_date = DATE_FORMAT(#{req.recordDate},'%Y-%m-%d')
- </if>
- </where>
- ORDER BY t1.update_time DESC
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml"
deleted file mode 100644
index 611d51e..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/measuringinstrumentledger/SparePartsMapper.xml"
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper">
- <select id="listPage" resultType="com.ruoyi.measuringinstrumentledger.dto.SparePartsDto">
- select sp.*,sp1.name as parentName
- from spare_parts sp
- left join spare_parts sp1 on sp1.id = sp.parent_id
- <where>
- <if test="spareParts.name != null and spareParts.name != ''">
- and sp.name like concat('%',#{spareParts.name},'%')
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/monitor/SysLogininforMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/monitor/SysLogininforMapper.xml"
deleted file mode 100644
index 98afbb5..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/monitor/SysLogininforMapper.xml"
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.monitor.mapper.SysLogininforMapper">
-
- <resultMap type="com.ruoyi.project.monitor.domain.SysLogininfor" id="SysLogininforResult">
- <id property="infoId" column="info_id" />
- <result property="userName" column="user_name" />
- <result property="status" column="status" />
- <result property="ipaddr" column="ipaddr" />
- <result property="loginLocation" column="login_location" />
- <result property="browser" column="browser" />
- <result property="os" column="os" />
- <result property="msg" column="msg" />
- <result property="loginTime" column="login_time" />
- </resultMap>
-
- <insert id="insertLogininfor" parameterType="com.ruoyi.project.monitor.domain.SysLogininfor">
- insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
- values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
- </insert>
-
- <select id="selectLogininforList" parameterType="com.ruoyi.project.monitor.domain.SysLogininfor" resultMap="SysLogininforResult">
- select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
- <where>
- <if test="ipaddr != null and ipaddr != ''">
- AND ipaddr like concat('%', #{ipaddr}, '%')
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <if test="userName != null and userName != ''">
- AND user_name like concat('%', #{userName}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- AND login_time >= #{params.beginTime}
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- AND login_time <= #{params.endTime}
- </if>
- </where>
- order by info_id desc
- </select>
-
- <delete id="deleteLogininforByIds" parameterType="Long">
- delete from sys_logininfor where info_id in
- <foreach collection="array" item="infoId" open="(" separator="," close=")">
- #{infoId}
- </foreach>
- </delete>
-
- <update id="cleanLogininfor">
- truncate table sys_logininfor
- </update>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/monitor/SysOperLogMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/monitor/SysOperLogMapper.xml"
deleted file mode 100644
index 6bb7e8f..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/monitor/SysOperLogMapper.xml"
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.monitor.mapper.SysOperLogMapper">
-
- <resultMap type="com.ruoyi.project.monitor.domain.SysOperLog" id="SysOperLogResult">
- <id property="operId" column="oper_id" />
- <result property="title" column="title" />
- <result property="businessType" column="business_type" />
- <result property="method" column="method" />
- <result property="requestMethod" column="request_method" />
- <result property="operatorType" column="operator_type" />
- <result property="operName" column="oper_name" />
- <result property="deptName" column="dept_name" />
- <result property="operUrl" column="oper_url" />
- <result property="operIp" column="oper_ip" />
- <result property="operLocation" column="oper_location" />
- <result property="operParam" column="oper_param" />
- <result property="jsonResult" column="json_result" />
- <result property="status" column="status" />
- <result property="errorMsg" column="error_msg" />
- <result property="operTime" column="oper_time" />
- <result property="costTime" column="cost_time" />
- </resultMap>
-
- <sql id="selectOperLogVo">
- select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time
- from sys_oper_log
- </sql>
-
- <insert id="insertOperlog" parameterType="com.ruoyi.project.monitor.domain.SysOperLog">
- insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time)
- values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate())
- </insert>
-
- <select id="selectOperLogList" parameterType="com.ruoyi.project.monitor.domain.SysOperLog" resultMap="SysOperLogResult">
- <include refid="selectOperLogVo"/>
- <where>
- <if test="operIp != null and operIp != ''">
- AND oper_ip like concat('%', #{operIp}, '%')
- </if>
- <if test="title != null and title != ''">
- AND title like concat('%', #{title}, '%')
- </if>
- <if test="businessType != null">
- AND business_type = #{businessType}
- </if>
- <if test="businessTypes != null and businessTypes.length > 0">
- AND business_type in
- <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
- #{businessType}
- </foreach>
- </if>
- <if test="status != null">
- AND status = #{status}
- </if>
- <if test="operName != null and operName != ''">
- AND oper_name like concat('%', #{operName}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- AND oper_time >= #{params.beginTime}
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- AND oper_time <= #{params.endTime}
- </if>
- </where>
- order by oper_id desc
- </select>
-
- <delete id="deleteOperLogByIds" parameterType="Long">
- delete from sys_oper_log where oper_id in
- <foreach collection="array" item="operId" open="(" separator="," close=")">
- #{operId}
- </foreach>
- </delete>
-
- <select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
- <include refid="selectOperLogVo"/>
- where oper_id = #{operId}
- </select>
-
- <update id="cleanOperLog">
- truncate table sys_oper_log
- </update>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/oA/OaProjectMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/oA/OaProjectMapper.xml"
deleted file mode 100644
index c245a39..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/oA/OaProjectMapper.xml"
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.oA.mapper.OaProjectMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.oA.dto.OaProjectDto">
- select op.*,su.nick_name as managerName from oa_project op
- LEFT JOIN sys_user su ON op.manager_id=su.user_id
- <where>
- 1=1
- <if test="req.projectName != null and req.projectName != ''">
- and op.project_name like concat('%',#{req.projectName},'%')
- </if>
- <if test="req.managerName != null and req.managerName != ''">
- and su.nick_name like concat('%',#{req.managerName},'%')
- </if>
- <if test="req.status != null and req.status != ''">
- and op.status = #{req.status}
- </if>
- </where>
- </select>
- <select id="selectByIds" resultType="com.ruoyi.oA.dto.OaProjectDto">
- select op.*,su.nick_name as managerName from oa_project op
- LEFT JOIN sys_user su ON op.manager_id=su.user_id
- where op.project_id in
- <foreach collection="ids" item="id" open="(" close=")" separator=",">
- #{id}
- </foreach>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/oA/OaProjectPhaseMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/oA/OaProjectPhaseMapper.xml"
deleted file mode 100644
index 2f52fe9..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/oA/OaProjectPhaseMapper.xml"
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.oA.mapper.OaProjectPhaseMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.oA.pojo.OaProjectPhase">
- <id property="phaseId" column="phase_id" jdbcType="INTEGER"/>
- <result property="phaseName" column="phase_name" jdbcType="VARCHAR"/>
- <result property="oaProjectId" column="oa_project_id" jdbcType="INTEGER"/>
- <result property="startDate" column="start_date" jdbcType="TIMESTAMP"/>
- <result property="endDate" column="end_date" jdbcType="TIMESTAMP"/>
- <result property="status" column="status" jdbcType="VARCHAR"/>
- <result property="createUser" column="create_user" jdbcType="BIGINT"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- phase_id,phase_name,oa_project_id,
- start_date,end_date,status,
- create_user,create_time,update_user,
- update_time,tenant_id
- </sql>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/oA/OaProjectPhaseTaskMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/oA/OaProjectPhaseTaskMapper.xml"
deleted file mode 100644
index cc029d9..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/oA/OaProjectPhaseTaskMapper.xml"
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.oA.mapper.OaProjectPhaseTaskMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.oA.pojo.OaProjectPhaseTask">
- <id property="taskId" column="task_id" jdbcType="INTEGER"/>
- <result property="taskName" column="task_name" jdbcType="VARCHAR"/>
- <result property="phaseId" column="phase_id" jdbcType="INTEGER"/>
- <result property="startDate" column="start_date" jdbcType="TIMESTAMP"/>
- <result property="endDate" column="end_date" jdbcType="TIMESTAMP"/>
- <result property="targetDate" column="target_date" jdbcType="TIMESTAMP"/>
- <result property="targetValue" column="target_value" jdbcType="INTEGER"/>
- <result property="currentValue" column="current_value" jdbcType="INTEGER"/>
- <result property="unit" column="unit" jdbcType="VARCHAR"/>
- <result property="status" column="status" jdbcType="VARCHAR"/>
- <result property="completionRate" column="completion_rate" jdbcType="INTEGER"/>
- <result property="createUser" column="create_user" jdbcType="BIGINT"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- task_id,task_name,phase_id,
- start_date,end_date,target_date,
- target_value,current_value,unit,
- status,completion_rate,create_user,
- create_time,update_user,update_time,
- tenant_id
- </sql>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/officesupplies/OfficeSuppliesMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/officesupplies/OfficeSuppliesMapper.xml"
deleted file mode 100644
index 7191aa9..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/officesupplies/OfficeSuppliesMapper.xml"
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.officesupplies.mapper.OfficeSuppliesMapper">
-
- <select id="listPage" resultType="com.ruoyi.officesupplies.pojo.OfficeSupplies">
- select * from office_supplies
- <where>
- <if test="req.code != null and req.code != ''">
- and code like concat('%',#{req.code},'%')
- </if>
- <if test="req.applicant != null and req.applicant != ''">
- and applicant like concat('%',#{req.applicant},'%')
- </if>
- <if test="req.status != null and req.status != ''">
- and status = #{req.status}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/GasTankWarningMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/GasTankWarningMapper.xml"
deleted file mode 100644
index 9f06e2c..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/GasTankWarningMapper.xml"
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.procurementrecord.mapper.GasTankWarningMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.procurementrecord.pojo.GasTankWarning">
- select * from gas_tank_warning
- where 1=1
- <if test="gasTankWarning.tankName != null and gasTankWarning.tankName != ''">
- and tank_name like concat('%', #{gasTankWarning.tankName}, '%')
- </if>
- <if test="gasTankWarning.tankType != null">
- and tank_type = #{gasTankWarning.tankType}
- </if>
- <if test="gasTankWarning.warningType != null">
- and warning_type = #{gasTankWarning.warningType}
- </if>
- <if test="gasTankWarning.warningLevel != null">
- and warning_level = #{gasTankWarning.warningLevel}
- </if>
-
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/InboundManagementMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/InboundManagementMapper.xml"
deleted file mode 100644
index fbaa3e3..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/InboundManagementMapper.xml"
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.procurementrecord.mapper.InboundManagementMapper">
-
- <select id="listPage" resultType="com.ruoyi.procurementrecord.pojo.InboundManagement">
- select * from inbound_management
- <where>
- <if test="req.orderNo != null and req.orderNo != ''">
- and order_no like concat('%',#{req.orderNo},'%')
- </if>
- <if test="req.supplierName != null and req.supplierName != ''">
- and supplier_name like concat('%',#{req.supplierName},'%')
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/ProcurementPlanMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/ProcurementPlanMapper.xml"
deleted file mode 100644
index 2403bf2..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/ProcurementPlanMapper.xml"
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.procurementrecord.mapper.ProcurementPlanMapper">
-
- <select id="listPage" resultType="com.ruoyi.procurementrecord.pojo.ProcurementPlan">
- SELECT * FROM procurement_plan
- <where>
- <if test="req.status != null and req.status != ''">
- AND status = #{req.status}
- </if>
- <if test="req.planName != null and req.planName != ''">
- AND plan_name LIKE CONCAT('%',#{req.planName},'%')
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/ProcurementPriceManagementMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/ProcurementPriceManagementMapper.xml"
deleted file mode 100644
index 196adfa..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/ProcurementPriceManagementMapper.xml"
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.procurementrecord.mapper.ProcurementPriceManagementMapper">
-
- <select id="listPage" resultType="com.ruoyi.procurementrecord.pojo.ProcurementPriceManagement">
- SELECT * FROM procurement_price_management
- <where>
- <if test="req.productName != null and req.productName != ''">
- AND product_name like concat('%',#{req.productName},'%')
- </if>
- <if test="req.supplierName != null and req.supplierName != ''">
- AND supplier_name = #{req.supplierName}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml"
deleted file mode 100644
index e2c9c8f..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml"
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper">
-
- <select id="listProcurementBySalesLedgerId" resultType="com.ruoyi.procurementrecord.dto.ProcurementDto">
- select
- t1.supplier_name,
- t2.product_category,
- t2.id,
- t3.id as recordId,
- t2.specification_model,
- t2.unit,
- t2.quantity,
- t2.min_stock,
- t2.warn_num,
- t2.quantity as quantity0,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t3.inbound_num as quantityStock
- from purchase_ledger t1
- left join sales_ledger_product t2 on t1.id = t2.sales_ledger_id
- left join procurement_record_storage t3 on t2.id = t3.sales_ledger_product_id
- where t1.purchase_contract_number = #{req.purchaseContractNumber}
- <if test="req.id != null and req.id != ''">
- and t3.id = #{req.id}
- </if>
- group by t2.id
- </select>
- <select id="listPage" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
- select
- t3.supplier_name,
- t3.purchase_contract_number,
- t2.product_category,
- t1.id,
- t1.sales_ledger_product_id,
- t1.create_user,
- t2.specification_model,
- t2.unit,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- (t1.inbound_num * t2.tax_inclusive_unit_price) as taxInclusiveTotalPrice,
- (t1.inbound_num * t2.tax_inclusive_unit_price - t1.inbound_num * t2.tax_inclusive_unit_price * t2.tax_rate / 100) as taxExclusiveTotalPrice,
- t1.inbound_batches,
- t1.inbound_num,
- t1.inbound_num as inboundNum0,
- t1.create_time,
- t1.update_time,
- t1.create_by,
- ifnull(t1.warn_num, t2.warn_num) as warnNum
- from procurement_record_storage t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
- left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
- <where>
- 1 = 1
- <if test="req.supplierName != null and req.supplierName != ''">
- and t3.supplier_name like concat('%',#{req.supplierName},'%')
- </if>
- <if test="req.timeStr != null and req.timeStr != ''">
- and t1.create_time like concat('%',#{req.timeStr},'%')
- </if>
- </where>
- </select>
- <select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
- select
- t3.supplier_name,
- t3.purchase_contract_number,
- t2.product_category,
- t1.id,
- t2.specification_model,
- t2.unit,
- t2.quantity,
- t2.quantity as quantity0,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t1.inbound_batches,
- t1.inbound_num,
- t1.create_time,
- t1.create_time as time,
- t1.create_by
- from procurement_record_storage t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
- left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
- </select>
- <select id="listPageCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
- select
- t3.supplier_name,
- t3.purchase_contract_number,
- t2.product_category,
- t1.id,
- t1.sales_ledger_product_id,
- t1.create_user,
- t2.specification_model,
- t2.unit,
- t2.min_stock,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t1.inbound_batches,
- sum(t1.inbound_num) as inboundNum,
- sum(t1.inbound_num) as inboundNum0,
- t1.inbound_num as totalInboundNum,
- t1.create_time,
- t1.update_time,
- t1.create_by,
- ifnull(t1.warn_num, t2.warn_num) as warnNum
- from procurement_record_storage t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
- left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
- <where>
- 1 = 1
- <if test="req.supplierName != null and req.supplierName != ''">
- and t3.supplier_name like concat('%',#{req.supplierName},'%')
- </if>
- <if test="req.timeStr != null and req.timeStr != ''">
- and t1.create_time like concat('%',#{req.timeStr},'%')
- </if>
- <if test="req.reportDate != null">
- and t1.create_time >= #{req.reportDate} and t1.create_time < DATE_ADD(#{req.reportDate}, INTERVAL 1 DAY)
- </if>
- <if test="req.startMonth != null">
- and t1.create_time >= #{req.startMonth}
- </if>
- <if test="req.endMonth != null">
- and t1.create_time <= #{req.endMonth}
- </if>
- <if test="req.startDate != null">
- and t1.create_time >= #{req.startDate}
- </if>
- <if test="req.endDate != null">
- and t1.create_time <= #{req.endDate}
- </if>
- </where>
- group by t3.supplier_name,t2.product_category,t2.specification_model
- </select>
- <select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
- select
- t3.supplier_name,
- t3.purchase_contract_number,
- t2.product_category,
- t1.id,
- t1.sales_ledger_product_id,
- t1.create_user,
- t2.specification_model,
- t2.unit,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t1.inbound_batches,
- t1.inbound_num,
- t1.inbound_num as inboundNum0,
- t1.create_time,
- t1.update_time,
- t1.create_time as cTime,
- t1.update_time as uTime,
- t1.create_by
- from procurement_record_storage t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
- left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml"
deleted file mode 100644
index ec91c53..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml"
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper">
-
- <select id="listPage" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
- select
- t3.supplier_name,
- t2.product_category,
- t1.id,
- t1.code,
- t2.specification_model,
- t2.unit,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t1.inbound_num,
- t1.create_time,
- t1.create_by,
- t2.warn_num
- from procurement_record_out t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
- left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
- <where>
- 1 = 1
- <if test="req.supplierName != null and req.supplierName != ''">
- and t3.supplier_name like concat('%',#{req.supplierName},'%')
- </if>
- <if test="req.timeStr != null and req.timeStr != ''">
- and t1.create_time like concat('%',#{req.timeStr},'%')
- </if>
- </where>
- </select>
- <select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
- select
- t3.supplier_name,
- t2.product_category,
- t1.id,
- t2.specification_model,
- t2.unit,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t1.inbound_num,
- t1.create_time,
- t1.create_time as time,
- t1.create_by
- from procurement_record_out t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
- left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml"
deleted file mode 100644
index ce8eb39..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml"
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.procurementrecord.mapper.ReturnManagementMapper">
-
- <select id="listPage" resultType="com.ruoyi.procurementrecord.pojo.ReturnManagement">
- select * from return_management
- <where>
- <if test="req.returnNo != null and req.returnNo != ''">
- and return_no like concat('%',#{req.returnNo},'%')
- </if>
- <if test="req.returnType != null and req.returnType != ''">
- and return_type = #{req.returnType}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml"
deleted file mode 100644
index 29b88f2..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml"
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.production.mapper.SalesLedgerProductionAccountingMapper">
-
- <select id="listPage" resultType="com.ruoyi.production.dto.SalesLedgerProductionAccountingDto">
- SELECT
- t4.id,
- t4.finished_num * t4.work_hours as wages,
- t4.scheduling_user_id,
- t4.scheduling_user_name,
- t4.scheduling_date,
- t4.finished_num,
- t4.work_hours,
- t4.process,
- T1.sales_contract_no,
- T1.customer_contract_no,
- T1.project_name,
- T1.customer_name,
- t3.product_category,
- t3.specification_model,
- t3.unit
- FROM
- sales_ledger_production_accounting t4
- LEFT JOIN sales_ledger T1 ON T1.id = t4.sales_ledger_id
- left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id
- <where>
- t3.type = 1
- <if test="salesLedgerDto.schedulingUserName != null and salesLedgerDto.schedulingUserName != '' ">
- AND t4.scheduling_user_name LIKE CONCAT('%',#{salesLedgerDto.schedulingUserName},'%')
- </if>
- <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
- </if>
- <if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
- AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
- </if>
- <if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
- AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
- </if>
- <if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
- AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
- </if>
- <if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
- AND t4.scheduling_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
- AND t4.scheduling_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
- </if>
- </where>
- group by t4.id
- order by t4.update_time desc
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml"
deleted file mode 100644
index e7e882c..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml"
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.production.mapper.SalesLedgerSchedulingMapper">
-
- <select id="listPage" resultType="com.ruoyi.production.dto.SalesLedgerSchedulingDto">
- SELECT
- T2.id as salesLedgerProductId,
- T1.id as salesLedgerId,
- ifNull(sum(t3.scheduling_num),0) AS schedulingNum,
- T1.sales_contract_no,
- T1.customer_contract_no,
- T1.project_name,
- T1.entry_date,
- T1.customer_name,
- T2.quantity,
- T2.product_category,
- T2.specification_model,
- T2.unit
- FROM
- sales_ledger_product T2
- LEFT join sales_ledger_scheduling t3 on T2.id = t3.sales_ledger_product_id
- LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
- <where>
- T1.id is not null and T2.type = 1
- <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
- </if>
- <if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
- AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
- </if>
- <if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
- AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
- </if>
- <if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
- AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
- </if>
- <if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
- AND T1.entry_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
- AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
- </if>
- </where>
- GROUP BY T2.id
- </select>
- <select id="list" resultType="com.ruoyi.production.dto.SalesLedgerSchedulingDto">
- SELECT
- T2.id,
- ifNull(sum(t3.scheduling_num),0) AS schedulingNum,
- T1.sales_contract_no,
- T1.customer_contract_no,
- T1.project_name,
- T1.entry_date,
- T1.customer_name,
- T2.quantity,
- T2.product_category,
- T2.specification_model,
- T2.unit
- FROM
- sales_ledger_product T2
- LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
- LEFT join sales_ledger_scheduling t3 on T1.id = t3.sales_ledger_id
- where T1.id is not null and T2.type = 1
- GROUP BY T2.id
- </select>
- <select id="listPageProcess" resultType="com.ruoyi.production.dto.SalesLedgerSchedulingProcessDto">
- SELECT
- t3.id as salesLedgerProductId,
- T1.id as salesLedgerId,
- T2.id,
- T2.status,
- T2.scheduling_user_id,
- T2.scheduling_user_name,
- T2.scheduling_date,
- ifNull(T2.scheduling_num,0) AS schedulingNum,
- ifNull(T2.finished_num,0) AS successNum,
- T1.sales_contract_no,
- T1.customer_contract_no,
- T1.project_name,
- T1.customer_name,
- t3.product_category,
- t3.specification_model,
- t3.unit
- FROM
- sales_ledger_scheduling T2
- LEFT JOIN sales_ledger T1 ON T1.id = T2.sales_ledger_id
- left join sales_ledger_product t3 on T2.sales_ledger_product_id = t3.id
- <where>
- t3.type = 1
- <if test="salesLedgerDto.status != null and salesLedgerDto.status != '' ">
- AND T2.status = #{salesLedgerDto.status}
- </if>
- <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
- </if>
- <if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
- AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
- </if>
- <if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
- AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
- </if>
- <if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
- AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
- </if>
- <if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
- AND T2.scheduling_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
- AND T2.scheduling_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
- </if>
- </where>
- order by T2.status asc
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml"
deleted file mode 100644
index 41cbe07..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/production/SalesLedgerWorkMapper.xml"
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.production.mapper.SalesLedgerWorkMapper">
-
- <select id="listPage" resultType="com.ruoyi.production.dto.SalesLedgerWorkDto">
- SELECT
- t4.id,
- t4.status,
- t4.scheduling_user_id,
- t4.scheduling_user_name,
- t4.scheduling_date,
- t4.scheduling_num,
- t4.finished_num,
- t4.work_hours,
- t4.process,
- T1.sales_contract_no,
- T1.customer_contract_no,
- T1.project_name,
- T1.customer_name,
- t3.product_category,
- t3.specification_model,
- t3.unit
- FROM
- sales_ledger_work t4
- LEFT JOIN sales_ledger T1 ON T1.id = t4.sales_ledger_id
- left join sales_ledger_product t3 on t4.sales_ledger_product_id = t3.id
- <where>
- t3.type = 1
- <if test="salesLedgerDto.status != null and salesLedgerDto.status != '' ">
- AND t4.status = #{salesLedgerDto.status}
- </if>
- <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
- </if>
- <if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
- AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
- </if>
- <if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
- AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
- </if>
- <if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
- AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
- </if>
- <if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
- AND t4.scheduling_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
- AND t4.scheduling_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
- </if>
- </where>
- order by t4.update_time desc
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml"
deleted file mode 100644
index 96e0388..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml"
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.purchase.mapper.InvoicePurchaseMapper">
-
-
- <select id="selectPurchaseReport" resultType="com.ruoyi.purchase.dto.InvoicePurchaseReportDto">
- SELECT
- sl.sales_contract_no AS customerContractNo,
- sl.customer_name,
- sl.contract_amount AS contract_amount,
- sl.project_name,
- SUM( pl.contract_amount ) AS purchase_amount,
- (
- sl.contract_amount - SUM( pl.contract_amount )) AS balance,
- CONCAT( ROUND( ( sl.contract_amount - SUM( pl.contract_amount )) / sl.contract_amount * 100, 1 ), '%' ) AS balance_ratio
- FROM
- sales_ledger sl
- INNER JOIN purchase_ledger pl ON sl.sales_contract_no = pl.sales_contract_no
- <where>
- <if test="c.customerName != null and c.customerName != ''">
- AND sl.customer_name LIKE CONCAT('%', #{c.customerName}, '%')
- </if>
- </where>
- GROUP BY
- sl.sales_contract_no,
- sl.customer_name,
- sl.contract_amount
- ORDER BY
- sl.sales_contract_no
- </select>
- <select id="listVat" resultType="com.ruoyi.purchase.dto.VatDto">
- select *
- from (SELECT
- COALESCE(a1.month, a2.month) AS month,
- IFNULL(a1.tax_amount, 0) AS j_tax_amount,
- IFNULL(a2.x_tax_amount, 0) AS x_tax_amount
- FROM (
- -- 绗竴涓煡璇細鏉ヨ嚜 invoice_ledger 鐨勭◣棰�
- SELECT
- DATE_FORMAT(il.invoice_date, '%Y-%m') AS month,
- ROUND(SUM(pr.invoice_amount - pr.invoice_amount / (1 + pr.tax_rate / 100)), 2) AS tax_amount
- FROM invoice_ledger il
- LEFT JOIN invoice_registration_product pr ON pr.id = il.invoice_registration_product_id
- WHERE il.invoice_no IS NOT NULL
- AND invoice_type = '澧炰笓绁�'
- GROUP BY DATE_FORMAT(il.invoice_date, '%Y-%m')
- ) a1
- LEFT JOIN (
- -- 绗簩涓煡璇細鏉ヨ嚜 ticket_registration 鐨勭◣棰�
- SELECT
- DATE_FORMAT(a.issue_date, '%Y-%m') AS month,
- SUM(a.invoice_amount) AS x_tax_amount
- FROM (
- SELECT DISTINCT pr.id,
- tr.issue_date,
- ROUND(pr.tickets_amount / (1 + pr.tax_rate / 100), 2) AS un_tickets_price,
- ROUND(pr.tickets_amount - pr.tickets_amount / (1 + pr.tax_rate / 100), 2) AS invoice_amount
- FROM product_record pr
- LEFT JOIN purchase_ledger pl ON pl.id = pr.purchase_ledger_id
- LEFT JOIN sales_ledger sl ON sl.id = pl.sales_ledger_id
- LEFT JOIN ticket_registration tr ON tr.purchase_ledger_id = pl.id
- LEFT JOIN product_model pm ON pm.id = pr.product_model_id
- WHERE type = 2
- AND tr.invoice_number IS NOT NULL
- ) a
- GROUP BY DATE_FORMAT(a.issue_date, '%Y-%m')
- ) a2 ON a1.month = a2.month
-
- UNION ALL
-
- SELECT
- COALESCE(a1.month, a2.month) AS month,
- IFNULL(a1.tax_amount, 0) AS tax_amount,
- IFNULL(a2.x_tax_amount, 0) AS x_tax_amount
- FROM (
- -- 绗簩涓煡璇細鏉ヨ嚜 ticket_registration 鐨勭◣棰濓紙鍙嶈繃鏉ヨˉ鍏ㄦ病鏈夊尮閰嶅埌鐨勶級
- SELECT
- DATE_FORMAT(a.issue_date, '%Y-%m') AS month,
- SUM(a.invoice_amount) AS x_tax_amount
- FROM (
- SELECT DISTINCT pr.id,
- tr.issue_date,
- ROUND(pr.tickets_amount / (1 + pr.tax_rate / 100), 2) AS un_tickets_price,
- ROUND(pr.tickets_amount - pr.tickets_amount / (1 + pr.tax_rate / 100), 2) AS invoice_amount
- FROM product_record pr
- LEFT JOIN purchase_ledger pl ON pl.id = pr.purchase_ledger_id
- LEFT JOIN sales_ledger sl ON sl.id = pl.sales_ledger_id
- LEFT JOIN ticket_registration tr ON tr.purchase_ledger_id = pl.id
- LEFT JOIN product_model pm ON pm.id = pr.product_model_id
- WHERE type = 2
- AND tr.invoice_number IS NOT NULL
- ) a
- GROUP BY DATE_FORMAT(a.issue_date, '%Y-%m')
- ) a2
- LEFT JOIN (
- -- 绗竴涓煡璇細鏉ヨ嚜 invoice_ledger 鐨勭◣棰�
- SELECT
- DATE_FORMAT(il.invoice_date, '%Y-%m') AS month,
- ROUND(SUM(pr.invoice_amount - pr.invoice_amount / (1 + pr.tax_rate / 100)), 2) AS tax_amount
- FROM invoice_ledger il
- LEFT JOIN invoice_registration_product pr ON pr.id = il.invoice_registration_product_id
- WHERE il.invoice_no IS NOT NULL
- AND invoice_type = '澧炰笓绁�'
- GROUP BY DATE_FORMAT(il.invoice_date, '%Y-%m')
- ) a1 ON a1.month = a2.month
- WHERE a1.month IS NULL
- ORDER BY month
- )as a
- <where>
- <if test="month != null">
- and a.month = #{month}
- </if>
- </where>
-
- </select>
- <select id="listVat1" resultType="com.ruoyi.purchase.dto.VatDto">
- # SELECT
-# DATE_FORMAT(il.invoice_date, '%Y-%m') AS month,
-# ROUND(SUM(pr.invoice_amount - pr.invoice_amount / (1 + pr.tax_rate / 100)), 2) AS tax_amount
-# FROM invoice_ledger il
-# LEFT JOIN invoice_registration_product pr ON pr.id = il.invoice_registration_product_id
-# WHERE il.invoice_no IS NOT NULL
-# AND invoice_type = '澧炰笓绁�'
-# GROUP BY DATE_FORMAT(il.invoice_date, '%Y-%m')
-# ORDER BY month;
-# select DATE_FORMAT(a.issue_date, '%Y-%m'), sum(a.invoice_amount) as xTaxAmount
-# from (SELECT distinct pr.id,
-# tr.issue_date,
-# ROUND(pr.tickets_amount / (1 + pr.tax_rate / 100), 2) AS un_tickets_price,
-# ROUND(pr.tickets_amount - pr.tickets_amount / (1 + pr.tax_rate / 100),
-# 2) AS invoice_amount
-# FROM product_record pr
-# LEFT JOIN purchase_ledger pl ON pl.id = pr.purchase_ledger_id
-# LEFT JOIN sales_ledger sl ON sl.id = pl.sales_ledger_id
-# LEFT JOIN ticket_registration tr ON tr.purchase_ledger_id = pl.id
-# LEFT JOIN product_model pm ON pm.id = pr.product_model_id
-# WHERE type = 2
-# and tr.invoice_number is not null) a
-# GROUP BY DATE_FORMAT(a.issue_date, '%Y-%m')
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml"
deleted file mode 100644
index 8e8cf1c..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml"
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.purchase.mapper.PaymentRegistrationMapper">
-
- <resultMap type="PaymentRegistration" id="PaymentRegistrationResult">
- <result property="id" column="id"/>
- <result property="saleLedgerId" column="sale_ledger_id"/>
- <result property="purchaseLedgerId" column="purchase_ledger_id"/>
- <result property="supplierId" column="supplier_id"/>
- <result property="ticketRegistrationId" column="ticket_registration_id"/>
- <result property="currentPaymentAmount" column="current_payment_amount"/>
- <result property="paymentMethod" column="payment_method"/>
- <result property="registrantId" column="registrant_id"/>
- <result property="paymentDate" column="payment_date"/>
- <result property="createTime" column="create_time"/>
- <result property="updateTime" column="update_time"/>
- <result property="tenantId" column="tenant_id"/>
- <result property="registrationtDate" column="registrationt_date"/>
- </resultMap>
-
- <resultMap type="com.ruoyi.purchase.dto.PaymentRegistrationDto" id="PaymentRegistrationDtoResult">
- <result property="id" column="id"/>
- <result property="saleLedgerId" column="sale_ledger_id"/>
- <result property="purchaseLedgerId" column="purchase_ledger_id"/>
- <result property="supplierId" column="supplier_id"/>
- <result property="ticketRegistrationId" column="ticket_registration_id"/>
- <result property="currentPaymentAmount" column="current_payment_amount"/>
- <result property="paymentMethod" column="payment_method"/>
- <result property="registrantId" column="registrant_id"/>
- <result property="paymentDate" column="payment_date"/>
- <result property="createTime" column="create_time"/>
- <result property="updateTime" column="update_time"/>
- <result property="salesContractNo" column="sales_contract_no"/>
- <result property="purchaseContractNumber" column="purchase_contract_number"/>
- <result property="supplierName" column="supplier_name"/>
- <result property="invoiceNumber" column="invoice_number"/>
- <result property="taxRate" column="tax_rate"/>
- <result property="invoiceAmount" column="invoice_amount"/>
- <result property="tenantId" column="tenant_id"/>
- <result property="registrationtDate" column="registrationt_date"/>
- </resultMap>
-
- <sql id="selectPaymentRegistrationVo">
- select pr.id,
- pr.sale_ledger_id,
- pr.purchase_ledger_id,
- pr.supplier_id,
- pr.ticket_registration_id,
- pr.current_payment_amount,
- pr.payment_method,
- pr.registrant_id,
- pr.payment_date,
- pr.create_time,
- pr.update_time,
- pr.tenant_id,
- sl.sales_contract_no as sales_contract_no,
- pl.purchase_contract_number as purchase_contract_number,
- sm.supplier_name as supplier_name,
- ip.invoice_number as invoice_number,
- ip.invoice_amount as invoice_amount,
- pr.tax_rate,
- pr.registrationt_date,
- su.nick_name as registrant
- from payment_registration pr
- left join sales_ledger sl on pr.sale_ledger_id = sl.id
- left join purchase_ledger pl on pr.purchase_ledger_id = pl.id
- left join supplier_manage sm on pr.supplier_id = sm.id
- left join ticket_registration ip on pr.ticket_registration_id = ip.id
- left join sys_user su on pr.registrant_id = su.user_id
- </sql>
-
- <select id="selectPaymentRegistrationList" parameterType="com.ruoyi.purchase.dto.PaymentRegistrationDto"
- resultMap="PaymentRegistrationDtoResult">
- <include refid="selectPaymentRegistrationVo"/>
- <where>
- <if test="supplierNameOrContractNo != null and supplierNameOrContractNo != ''">
- and sm.supplier_name LIKE CONCAT('%', #{supplierNameOrContractNo}, '%') or sl.sales_contract_no LIKE
- CONCAT('%', #{supplierNameOrContractNo}, '%')
- or pl.purchase_contract_number LIKE CONCAT('%', #{supplierNameOrContractNo}, '%')
- </if>
- </where>
- </select>
-
- <select id="selectPaymentRegistrationById" parameterType="Long" resultMap="PaymentRegistrationDtoResult">
- <include refid="selectPaymentRegistrationVo"/>
- where pr.id = #{id}
- </select>
-
- <select id="paymentHistoryList" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
- SELECT
- T1.payment_date,
- T2.supplier_name,
- T1.current_payment_amount,
- T1.payment_method,
- T3.nick_name AS registrant,
- T1.registrationt_date
- FROM
- payment_registration T1
- LEFT JOIN
- supplier_manage T2 ON T1.supplier_id = T2.id
- LEFT JOIN
- sys_user T3 ON T3.user_id = T1.registrant_id
- <where>
- <if test="params.searchText != null and params.searchText != '' ">
- AND T2.supplier_name LIKE CONCAT('%',#{params.searchText},'%')
- </if>
- </where>
- ORDER BY T1.payment_date,T1.create_time DESC
- </select>
-
- <select id="countPaymentTotalByTicketRegId" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
- SELECT
- IFNULL(SUM(current_payment_amount),0) AS paymentAmountTotal,
- ticket_registration_id
- FROM
- payment_registration
- <where>
- ticket_registration_id IN
- <foreach collection="ticketRegistrationIds" separator="," open="(" close=")" item="item">
- #{item}
- </foreach>
- </where>
- GROUP BY ticket_registration_id
- </select>
-
- <select id="getPaymentRecordList" resultType="com.ruoyi.purchase.dto.PaymentHistoryRecordVo">
- SELECT * FROM(
- SELECT
- T1.issue_date AS happenTime,
- IFNULL(T1.invoice_amount,0) AS invoiceAmount,
- '1' AS type,
- 0 AS currentPaymentAmount
- FROM
- ticket_registration T1
- LEFT JOIN purchase_ledger T2 ON T1.purchase_ledger_id = T2.id
- WHERE T2.supplier_id = #{supplierId}
- UNION
- SELECT
- payment_date AS happenTime,
- 0 AS invoiceAmount,
- '0' AS type,
- current_payment_amount AS currentPaymentAmount
- FROM payment_registration
- WHERE supplier_id = #{supplierId}
- ) T1
- ORDER BY T1.happenTime ASC
-
- </select>
-
- <select id="paymentHistoryListPage" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
- SELECT
- T1.id,
- T1.payment_date,
- T2.supplier_name,
- T1.current_payment_amount,
- T1.payment_method,
- T3.nick_name AS registrant,
- T1.registrationt_date,
- t4.purchase_contract_number,
- t5.invoice_amount,
- t5.invoice_number
- FROM
- payment_registration T1
- LEFT JOIN purchase_ledger t4 ON t4.id = T1.purchase_ledger_id
- LEFT JOIN
- supplier_manage T2 ON T1.supplier_id = T2.id
- LEFT JOIN
- sys_user T3 ON T3.user_id = T1.registrant_id
- left join ticket_registration t5 on t5.purchase_ledger_id = T1.purchase_ledger_id
- <where>
- <if test="params.searchText != null and params.searchText != '' ">
- AND T2.supplier_name LIKE CONCAT('%',#{params.searchText},'%')
- </if>
- <if test="params.paymentDateStart != null and params.paymentDateStart !='' ">
- AND T1.payment_date >= date_format(#{params.paymentDateStart},'%Y-%m-%d')
- </if>
- <if test="params.paymentDateEnd != null and params.paymentDateEnd !='' ">
- AND T1.payment_date <= date_format(#{params.paymentDateEnd},'%Y-%m-%d')
- </if>
- <if test="params.purchaseContractNumber != null and params.purchaseContractNumber !='' ">
- AND t4.purchase_contract_number LIKE CONCAT('%',#{params.purchaseContractNumber},'%')
- </if>
- </where>
- ORDER BY T1.payment_date,T1.create_time DESC
- </select>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/purchase/ProductRecordMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/purchase/ProductRecordMapper.xml"
deleted file mode 100644
index 5c338d7..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/purchase/ProductRecordMapper.xml"
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.purchase.mapper.ProductRecordMapper">
-
-
- <select id="productRecordPage" resultType="com.ruoyi.purchase.dto.ProductRecordDto">
- SELECT
- sl.sales_contract_no,
- sl.customer_contract_no,
- sl.customer_name,
- pm.model AS product_model,
- pl.purchase_contract_number,
- pl.supplier_name,
- pl.project_name,
- pr.*,
- tr.invoice_number,
- tr.iss_uer_id,
- tr.iss_uer,
- tr.id as ticketRegistrationId,
- ROUND(pr.tickets_amount/(1+pr.tax_rate/100),2 ) as un_tickets_price,
- ROUND(pr.tickets_amount-pr.tickets_amount/(1+pr.tax_rate/100),2 )as invoice_amount
- FROM product_record pr
- left join purchase_ledger pl on pl.id = pr.purchase_ledger_id
- left join sales_ledger sl on sl.id = pl.sales_ledger_id
- left join ticket_registration tr on tr.id = pr.ticket_registration_id
- left join product_model pm on pm.id = pr.product_model_id
- WHERE type = 2
- <if test="c.salesContractNo != null and c.salesContractNo != ''">
- and sl.sales_contract_no = #{c.salesContractNo}
- </if>
- <if test="c.supplierName != null and c.supplierName != ''">
- and pl.supplier_name = #{c.supplierName}
- </if>
- <if test="c.createdAtStart != null and c.createdAtStart != ''">
- and pr.created_at >= date_format(#{c.createdAtStart},'%Y-%m-%d hh:mm:ss')
- </if>
- <if test="c.createdAtEnd != null and c.createdAtEnd != ''">
- and pr.created_at <= date_format(#{c.createdAtEnd},'%Y-%m-%d hh:mm:ss')
- </if>
- <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
- and tr.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
- </if>
- </select>
- <select id="getProductRecordById" resultType="com.ruoyi.purchase.dto.ProductRecordDto">
- SELECT
- sl.sales_contract_no,
- sl.customer_contract_no,
- sl.customer_name,
- pm.model AS product_model,
- pl.purchase_contract_number,
- pl.supplier_name,
- pr.*,
- tr.invoice_number,
- ROUND(pr.tickets_amount/(1+pr.tax_rate/100),2 ) as un_tickets_price,
- ROUND(pr.tickets_amount-pr.tickets_amount/(1+pr.tax_rate/100),2 )as invoice_amount
- FROM product_record pr
- left join purchase_ledger pl on pl.id = pr.purchase_ledger_id
- left join sales_ledger sl on sl.id = pl.sales_ledger_id
- left join ticket_registration tr on tr.id = pr.ticket_registration_id
- left join product_model pm on pm.id = pr.product_model_id
-
- WHERE type = 2 and pr.id = #{id}
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml"
deleted file mode 100644
index 4b617d1..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml"
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.purchase.mapper.PurchaseLedgerMapper">
-
- <update id="updateContractAmountById">
- UPDATE purchase_ledger
- SET contract_amount = #{totalTaxInclusiveAmount}
- WHERE id = #{id}
- </update>
- <select id="selectPurchaseLedgerListPage" resultType="com.ruoyi.purchase.dto.PurchaseLedgerDto">
- select
- pl.id,
- pl.purchase_contract_number ,
- pl.sales_contract_no,
- pl.supplier_name,
- pl.project_name,
- pl.contract_amount,
- sum(pr.tickets_amount)as receipt_payment_amount,
- pl.contract_amount-sum(pr.tickets_amount) AS unReceipt_payment_amount,
- pl.entry_date,
- pl.recorder_name,
- pl.approval_status,
- pl.payment_method
- from purchase_ledger pl
- left join product_record pr on pl.id = pr.purchase_ledger_id
- <where>
- 1 = 1
- <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
- and pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
- </if>
- <if test="c.supplierName != null and c.supplierName != ''">
- and pl.supplier_name like concat('%',#{c.supplierName},'%')
- </if>
- <if test="c.salesContractNo != null and c.salesContractNo != ''">
- and pl.sales_contract_no like concat('%',#{c.salesContractNo},'%')
- </if>
- <if test="c.projectName != null and c.projectName != ''">
- and pl.project_name like concat('%',#{c.projectName},'%')
- </if>
- <if test="c.entryDateStart != null and c.entryDateStart != '' ">
- AND pl.entry_date >= DATE_FORMAT(#{c.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="c.entryDateEnd != null and c.entryDateEnd != '' ">
- AND pl.entry_date <= DATE_FORMAT(#{c.entryDateEnd},'%Y-%m-%d')
- </if>
- <if test="c.approvalStatus != null">
- and pl.approval_status =#{c.approvalStatus}
- </if>
- </where>
- group by pl.id, pl.purchase_contract_number, pl.sales_contract_no, pl.supplier_name,
- pl.project_name,pl.entry_date,
- pl.recorder_name,
- pl.contract_amount
-
- </select>
- <select id="getPaymentRegistrationDtoById" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
- SELECT
- T1.id,
- T1.payment_date,
- T2.supplier_name,
- T1.current_payment_amount,
- T1.payment_method,
- T3.nick_name AS registrant,
- T1.registrationt_date
- FROM
- payment_registration T1
- LEFT JOIN
- supplier_manage T2 ON T1.supplier_id = T2.id
- LEFT JOIN
- sys_user T3 ON T3.user_id = T1.registrant_id
- left join ticket_registration T4 on T1.ticket_registration_id = T4.id
- WHERE
- T4.id = #{id}
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/quality/QualityInspectFileMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/quality/QualityInspectFileMapper.xml"
deleted file mode 100644
index 6f4f68e..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/quality/QualityInspectFileMapper.xml"
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.quality.mapper.QualityInspectFileMapper">
- <select id="qualityInspectFileListPage" resultType="com.ruoyi.quality.pojo.QualityInspectFile">
- select *
- from quality_inspect_file
- where inspect_id = #{qualityInspectFile.inspectId}
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/quality/QualityInspectMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/quality/QualityInspectMapper.xml"
deleted file mode 100644
index 1c75087..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/quality/QualityInspectMapper.xml"
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.quality.mapper.QualityInspectMapper">
- <select id="qualityInspectListPage" resultType="com.ruoyi.quality.pojo.QualityInspect">
- SELECT
- *
- FROM quality_inspect
- where
- inspect_type=#{qualityInspect.inspectType}
- <if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">
- AND supplier = #{qualityInspect.supplier}
- </if>
- <if test="qualityInspect.customer != null and qualityInspect.customer != '' ">
- AND customer = #{qualityInspect.customer}
- </if>
- <if test="qualityInspect.process != null and qualityInspect.process != '' ">
- AND process = #{qualityInspect.process}
- </if>
- <if test="qualityInspect.productName != null and qualityInspect.productName != '' ">
- AND product_name = #{qualityInspect.productName}
- </if>
- <if test="qualityInspect.entryDateStart != null and qualityInspect.entryDateStart != '' ">
- AND check_time >= DATE_FORMAT(#{qualityInspect.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
- AND check_time <= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
- <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
- SELECT
- *
- FROM quality_inspect
- where
- inspect_type=#{qualityInspect.inspectType}
- <if test="qualityInspect.supplier != null and qualityInspect.supplier != '' ">
- AND supplier = #{qualityInspect.supplier}
- </if>
- <if test="qualityInspect.customer != null and qualityInspect.customer != '' ">
- AND customer = #{qualityInspect.customer}
- </if>
- <if test="qualityInspect.process != null and qualityInspect.process != '' ">
- AND process = #{qualityInspect.process}
- </if>
- <if test="qualityInspect.productName != null and qualityInspect.productName != '' ">
- AND product_name = #{qualityInspect.productName}
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/quality/QualityInspectParamMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/quality/QualityInspectParamMapper.xml"
deleted file mode 100644
index 47cb5ff..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/quality/QualityInspectParamMapper.xml"
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.quality.mapper.QualityInspectParamMapper">
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/quality/QualityTestStandardMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/quality/QualityTestStandardMapper.xml"
deleted file mode 100644
index 96448f5..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/quality/QualityTestStandardMapper.xml"
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.quality.mapper.QualityTestStandardMapper">
- <select id="qualityTestStandardListPage" resultType="com.ruoyi.quality.pojo.QualityTestStandard">
- SELECT
- *
- FROM quality_test_standard
- where
- 1=1
- <if test="qualityTestStandard.productId != null and qualityTestStandard.productId != '' ">
- AND product_id = #{qualityTestStandard.productId}
- </if>
- </select>
- <select id="qualityTestStandardList" resultType="com.ruoyi.quality.pojo.QualityTestStandard">
- SELECT
- *
- FROM quality_test_standard
- where
- 1=1
- <if test="qualityTestStandard.productId != null and qualityTestStandard.productId != '' ">
- AND product_id = #{qualityTestStandard.productId}
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml"
deleted file mode 100644
index b15e3f9..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml"
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.quality.mapper.QualityUnqualifiedMapper">
- <select id="qualityUnqualifiedListPage" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
- SELECT
- *
- FROM quality_unqualified
- where
- 1=1
- <if test="qualityUnqualified.inspectType != null ">
- AND inspect_type = #{qualityUnqualified.inspectType}
- </if>
- <if test="qualityUnqualified.inspectState != null ">
- AND inspect_state = #{qualityUnqualified.inspectState}
- </if>
- <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
- AND product_name = #{qualityUnqualified.productName}
- </if>
- <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' ">
- AND check_time >= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
- AND check_time <= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
- <select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
- SELECT
- *
- FROM quality_unqualified
- where
- 1=1
- <if test="qualityUnqualified.inspectType != null">
- AND inspect_type = #{qualityUnqualified.inspectType}
- </if>
- <if test="qualityUnqualified.inspectState != null">
- AND inspect_state = #{qualityUnqualified.inspectState}
- </if>
- <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
- AND product_name = #{qualityUnqualified.productName}
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml"
deleted file mode 100644
index 0c93e4d..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml"
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.InvoiceLedgerMapper">
- <select id="invoiceLedgerPage" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_contract_no ,
- T1.customer_id ,
- T1.invoice_no ,
- T1.invoice_amount ,
- T1.tax_rate ,
- T1.invoice_person ,
- T1.invoice_date ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id ,
- T2.customer_name,
- T3.customer_contract_no,
- T3.salesman,
- T4.invoiceFileName
- FROM invoice_ledger T1
- LEFT JOIN customer T2 ON T1.customer_id = T2.id
- LEFT JOIN sales_ledger T3 ON T1.sales_ledger_id = T3.id
- LEFT JOIN (
- SELECT
- invoice_ledger_id,
- GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
- FROM invoice_ledger_file GROUP BY invoice_ledger_id
- ) T4 ON T4.invoice_ledger_id = T1.id
- <where>
- <if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != ''">
- AND (
- T2.customer_name LIKE CONCAT('%',#{invoiceLedgerDto.searchText},'%')
- OR T1.sales_contract_no LIKE CONCAT('%',#{invoiceLedgerDto.searchText},'%')
- )
- </if>
- <if test="invoiceLedgerDto.invoiceDate != null">
- AND DATE_FORMAT(T1.invoice_date,'%Y-%m-%d') = DATE_FORMAT(#{invoiceLedgerDto.invoiceDate},'%Y-%m-%d')
- </if>
- </where>
- </select>
-
- <select id="invoiceLedgerList" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_contract_no ,
- T1.customer_id ,
- T1.invoice_no ,
- T1.invoice_amount ,
- T1.tax_rate ,
- T1.invoice_person ,
- T1.invoice_date ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id ,
- T2.customer_name,
- T3.salesman,
- T3.customer_contract_no,
- T4.invoiceFileName
- FROM invoice_ledger T1
- LEFT JOIN customer T2 ON T1.customer_id = T2.id
- LEFT JOIN sales_ledger T3 ON T1.sales_ledger_id = T3.id
- LEFT JOIN (
- SELECT
- invoice_ledger_id,
- GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
- FROM invoice_ledger_file GROUP BY invoice_ledger_id
- ) T4 ON T4.invoice_ledger_id = T1.id
- <where>
- <if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != ''">
- AND (
- T2.customer_name LIKE CONCAT('%',#{invoiceLedgerDto.searchText},'%')
- OR T1.sales_contract_no LIKE CONCAT('%',#{invoiceLedgerDto.searchText},'%')
- )
- </if>
- <if test="invoiceLedgerDto.invoiceDate != null">
- AND DATE_FORMAT(T1.invoice_date,'%Y-%m-%d') = DATE_FORMAT(#{invoiceLedgerDto.invoiceDate},'%Y-%m-%d')
- </if>
- </where>
- </select>
-
- <select id="invoiceLedgerInfo" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_contract_no ,
- T1.customer_id ,
- T1.invoice_no ,
- T1.invoice_amount ,
- T1.tax_rate ,
- T1.invoice_person ,
- T1.invoice_date ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id ,
- T2.customer_name
- FROM invoice_ledger T1
- LEFT JOIN customer T2 ON T1.customer_id = T2.id
- WHERE T1.id = #{id}
- </select>
-
- <select id="invoiceLedgerSalesAccount" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
- SELECT
- T4.id,T4.customer_name ,
- SUM(invoice_total) AS invoice_total,
- IFNULL( SUM(T5.receipt_payment_amount) , 0 ) AS receipt_payment_amount,
- IFNULL((IFNULL(SUM(invoice_total),0) - IFNULL(SUM(T5.receipt_payment_amount),0)),0) AS unReceipt_payment_amount
- FROM
- invoice_ledger T1
- LEFT JOIN invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- LEFT JOIN customer T4 ON T4.id = T3.customer_id
- LEFT JOIN ( SELECT invoice_ledger_id, SUM( receipt_payment_amount ) AS receipt_payment_amount FROM receipt_payment GROUP BY invoice_ledger_id ) T5 ON T5.invoice_ledger_id = T1.id
- <where>
- <if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != '' ">
- T4.customer_name LIKE CONCAT ('%',#{invoiceLedgerDto.searchText},'%')
- </if>
- </where>
- GROUP BY T4.id,T4.customer_name
- </select>
-
- <select id="invoiceLedgerProductInfo" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_ledger_product_id ,
- T1.invoice_registration_id ,
- T1.product_category ,
- T1.specification_model ,
- T1.unit ,
- T1.quantity ,
- T1.tax_rate ,
- T1.tax_inclusive_unit_price ,
- T1.tax_inclusive_total_price ,
- T1.tax_exclusive_total_price ,
- T1.invoice_type ,
- T1.invoice_num ,
- T1.invoice_amount ,
- T1.no_invoice_num ,
- T1.no_invoice_amount ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id,
- T2.sales_contract_no,
- T2.customer_contract_no,
- T2.customer_name,
- T3.invoice_no,
- T3.invoice_total,
- T3.invoice_person,
- T3.invoice_date,
- T3.id AS invoice_ledger_id
- FROM invoice_registration_product T1
- LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
- LEFT JOIN invoice_ledger T3 ON T1.id = T3.invoice_registration_product_id
- WHERE T1.id = #{id}
- </select>
-
- <select id="invoicedTotal" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
- SELECT
- IFNULL(SUM(T1.invoice_total),0) AS invoice_total,
- T2.sales_ledger_id
- FROM
- invoice_ledger T1
- LEFT JOIN invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
- <where>
- AND T2.sales_ledger_id IN
- <foreach collection="salesLedgerIds" item="item" open="(" close=")" separator=",">
- #{item}
- </foreach>
- </where>
- GROUP BY
- T2.sales_ledger_id
- </select>
-
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml"
deleted file mode 100644
index 9edbea4..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml"
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.InvoiceRegistrationMapper">
- <select id="invoiceRegistrationListPage" resultType="com.ruoyi.sales.dto.InvoiceRegistrationDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_contract_no ,
- T1.customer_id ,
- T1.salesman ,
- T1.project_name ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id,
- T2.customer_contract_no,
- T3.customer_name,
- T2.contract_amount,
- CASE WHEN T4.noInvoiceAmountTotal IS NULL THEN 0 ELSE T4.noInvoiceAmountTotal END AS noInvoiceAmountTotal
- FROM invoice_registration T1
- LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
- LEFT JOIN customer T3 ON T1.customer_id = T3.id
- LEFT JOIN (
- SELECT
- SUM( no_invoice_amount ) AS noInvoiceAmountTotal ,
- invoice_registration_id
- FROM
- invoice_registration_product
- GROUP BY
- invoice_registration_id
- ) T4 ON T1.id = T4.invoice_registration_id
- </select>
-
- <select id="invoiceRegisAndProductExcelDtoList" resultType="com.ruoyi.sales.excel.InvoiceRegisAndProductExcelDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_contract_no ,
- T1.customer_id ,
- T1.salesman ,
- T1.project_name ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id,
- T2.customer_contract_no,
- T3.customer_name,
- T2.contract_amount,
- T4.product_category,
- T4.specification_model,
- T4.unit,
- T4.quantity,
- T4.tax_rate,
- T4.tax_inclusive_unit_price,
- T4.tax_inclusive_total_price,
- T4.tax_exclusive_total_price,
- T4.invoice_type,
- T4.invoice_num,
- T4.invoice_amount,
- T4.no_invoice_num,
- T4.no_invoice_amount
- FROM invoice_registration T1
- JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
- JOIN customer T3 ON T1.customer_id = T3.id
- JOIN invoice_registration_product T4 ON T1.id = T4.invoice_registration_id
- ORDER BY T1.id ASC
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml"
deleted file mode 100644
index 3178871..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml"
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper">
-
- <select id="invoiceRegistrationProductList" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_ledger_product_id ,
- T1.invoice_registration_id ,
- T1.product_category ,
- T1.specification_model ,
- T1.unit ,
- T1.quantity ,
- T1.tax_rate ,
- T1.tax_inclusive_unit_price ,
- T1.tax_inclusive_total_price ,
- T1.tax_exclusive_total_price ,
- T1.invoice_type ,
- T1.invoice_num ,
- T1.invoice_amount ,
- T1.no_invoice_num ,
- T1.no_invoice_amount ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id,
- T2.sales_contract_no,
- T2.customer_contract_no,
- T2.customer_name,
- T3.invoice_no,
- T3.invoice_total,
- T3.invoice_person,
- T3.invoice_date,
- T4.invoiceFileName
- FROM invoice_registration_product T1
- LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
- LEFT JOIN invoice_ledger T3 ON T1.id = T3.invoice_registration_product_id
- LEFT JOIN (
- SELECT
- invoice_ledger_id,
- GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
- FROM invoice_ledger_file GROUP BY invoice_ledger_id
- ) T4 ON T4.invoice_ledger_id = T3.id
- <where>
- <if test="invoiceRegistrationProductDto.searchText != null and invoiceRegistrationProductDto.searchText != '' ">
- AND (T2.sales_contract_no LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
- OR
- T2.customer_name LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
- )
- </if>
- <if test="invoiceRegistrationProductDto.invoiceDate != null">
- AND T3.invoice_date = #{invoiceRegistrationProductDto.invoiceDate}
- </if>
- </where>
- ORDER BY T1.create_time DESC
- </select>
-
- <select id="invoiceRegistrationProductPage" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_ledger_product_id ,
- T1.invoice_registration_id ,
- T1.product_category ,
- T1.specification_model ,
- T1.unit ,
- T1.quantity ,
- T1.tax_rate ,
- T1.tax_inclusive_unit_price ,
- T1.tax_inclusive_total_price ,
- T1.tax_exclusive_total_price ,
- T1.invoice_type ,
- T1.invoice_num ,
- T1.invoice_amount ,
- T1.no_invoice_num ,
- T1.no_invoice_amount ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id,
- T2.sales_contract_no,
- T2.customer_contract_no,
- T2.customer_name,
- T3.invoice_no,
- T3.id as invoice_ledger_id,
- IFNULL(T3.invoice_total,0) AS invoice_total,
- T3.invoice_person,
- T3.invoice_date,
- T4.invoiceFileName,
- T2.project_name
- FROM invoice_registration_product T1
- LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
- RIGHT JOIN invoice_ledger T3 ON T1.id = T3.invoice_registration_product_id
- LEFT JOIN (
- SELECT
- invoice_ledger_id,
- GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
- FROM invoice_ledger_file GROUP BY invoice_ledger_id
- ) T4 ON T4.invoice_ledger_id = T3.id
- <where>
- <if test="invoiceRegistrationProductDto.searchText != null and invoiceRegistrationProductDto.searchText != '' ">
- AND (T2.sales_contract_no LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
- OR
- T2.customer_name LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
- )
- </if>
- <if test="invoiceRegistrationProductDto.invoiceDateStart != null and invoiceRegistrationProductDto.invoiceDateStart != ''">
- AND T3.invoice_date >= date_format(#{invoiceRegistrationProductDto.invoiceDateStart}, '%Y-%m-%d')
- </if>
- <if test="invoiceRegistrationProductDto.invoiceDateEnd != null and invoiceRegistrationProductDto.invoiceDateEnd != ''">
- AND T3.invoice_date <= date_format(#{invoiceRegistrationProductDto.invoiceDateEnd}, '%Y-%m-%d')
- </if>
- <if test="invoiceRegistrationProductDto.createTimeStart != null ">
- AND T1.create_time >= date_format(#{invoiceRegistrationProductDto.createTimeStart}, '%Y-%m-%d %H:%i:%s')
- </if>
- <if test="invoiceRegistrationProductDto.createTimeEnd != null ">
- AND T1.create_time <= date_format(#{invoiceRegistrationProductDto.createTimeStart}, '%Y-%m-%d %H:%i:%s')+interval 1 day
- </if>
- </where>
- ORDER BY T1.create_time DESC
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/PaymentShippingMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/PaymentShippingMapper.xml"
deleted file mode 100644
index 749c8ba..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/PaymentShippingMapper.xml"
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.PaymentShippingMapper">
-
- <select id="listPage" resultType="com.ruoyi.sales.pojo.PaymentShipping">
- select * from payment_shipping
- <where>
- <if test="req.orderNo != null and req.orderNo != ''">
- and order_no like concat('%',#{req.orderNo},'%')
- </if>
- <if test="req.paymentStatus != null and req.paymentStatus != ''">
- and payment_status = #{req.paymentStatus}
- </if>
- <if test="req.shippingStatus != null and req.shippingStatus != ''">
- and shipping_status = #{req.shippingStatus}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml"
deleted file mode 100644
index a52038b..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml"
+++ /dev/null
@@ -1,430 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.ReceiptPaymentMapper">
- <select id="receiptPaymentListPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
- SELECT
- T4.customer_id,
- IFNULL(T5.invoice_total,0) AS invoice_total,
- T1.receipt_payment_amount,
- T1.receipt_payment_date
- FROM
- receipt_payment T1
- LEFT JOIN invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
- LEFT JOIN invoice_registration_product T3 ON T2.invoice_registration_product_id = T3.id
- LEFT JOIN sales_ledger T4 ON T4.id = T3.sales_ledger_id
- LEFT JOIN (
- SELECT
- T3.customer_id,
- SUM( invoice_total ) AS invoice_total
- FROM
- invoice_ledger T1
- LEFT JOIN invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- GROUP BY T3.customer_id
- ) T5 ON T5.customer_id = T4.customer_id
- <where>
- <if test="receiptPaymentDto.customerId != null">
- AND T4.customer_id = #{receiptPaymentDto.customerId}
- </if>
- </where>
- ORDER BY T1.create_time ASC
- </select>
-
- <select id="receiptPaymentInfo" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
- SELECT
- T1.id ,
- T1.sales_ledger_id ,
- T1.sales_contract_no ,
- T1.customer_id ,
- T1.invoice_no ,
- T1.invoice_amount ,
- T1.tax_rate ,
- T1.receipt_payment_type ,
- T1.receipt_payment_amount ,
- T1.registrant ,
- T1.receipt_payment_date ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id,
- T1.invoice_ledger_id,
- T3.customer_contract_no,
- T2.customer_name
- FROM receipt_payment T1
- LEFT JOIN customer T2 ON T1.customer_id = T2.id
- LEFT JOIN sales_ledger T3 ON T1.sales_ledger_id = T3.id
- WHERE T1.id = #{id}
- </select>
-
- <select id="bindInvoiceNoRegPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
- SELECT
- T1.id ,
- T1.invoice_no ,
- T1.invoice_total ,
- T3.project_name,
- T1.invoice_person ,
- T1.invoice_date ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id ,
- T2.tax_rate,
- T3.sales_contract_no,
- T3.customer_contract_no,
- T3.customer_name,
- T4.invoiceFileName,
- T5.product_category,
- IFNULL(T6.receipt_payment_amount_total ,0) AS receipt_payment_amount_total,
- (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total ,0)) AS no_receipt_amount
- FROM invoice_ledger T1
- LEFT JOIN invoice_registration_product T2 ON T2.id = T1.invoice_registration_product_id
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- LEFT JOIN (
- SELECT
- invoice_ledger_id,
- GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
- FROM invoice_ledger_file GROUP BY invoice_ledger_id
- ) T4 ON T4.invoice_ledger_id = T1.id
- LEFT JOIN sales_ledger_product T5 ON T2.sales_ledger_product_id = T5.id
- LEFT JOIN (
- SELECT SUM(receipt_payment_amount) AS receipt_payment_amount_total,invoice_ledger_id FROM receipt_payment GROUP
- BY invoice_ledger_id
- ) T6 ON T1.id = T6.invoice_ledger_id
- <where>
- <if test="req.customerName != null and req.customerName !=''">
- AND T3.customer_name LIKE CONCAT('%',#{req.customerName},'%')
- </if>
- <if test="req.invoiceLedgerId != null">
- AND T1.id = #{req.invoiceLedgerId}
- </if>
- <if test="req.customerContractNo != null and req.customerContractNo !=''">
- AND T3.customer_contract_no LIKE CONCAT('%',#{req.customerContractNo},'%')
- </if>
- <if test="req.projectName != null and req.projectName !=''">
- AND T3.project_name LIKE CONCAT('%',#{req.projectName},'%')
- </if>
- <if test="req.invoiceDateStart != null and req.invoiceDateStart != '' ">
- AND T1.invoice_date >= DATE_FORMAT(#{req.invoiceDateStart},'%Y-%m-%d')
- </if>
- <if test="req.invoiceDateEnd != null and req.invoiceDateEnd != '' ">
- AND T1.invoice_date <= DATE_FORMAT(#{req.invoiceDateEnd},'%Y-%m-%d')
- </if>
- </where>
- ORDER BY T2.create_time DESC
- </select>
-
- <select id="invoiceInfo" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
- SELECT
- T1.id,
- T1.invoice_no,
- T1.invoice_total ,
- T2.tax_rate,
- T3.customer_name,
- T3.sales_contract_no
- FROM
- invoice_ledger T1
- LEFT JOIN
- invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- WHERE T1.id = #{id}
- </select>
-
- <select id="getReceiptAmount" resultType="java.math.BigDecimal">
- SELECT
- SUM( receipt_payment_amount ) AS total_amount
- FROM
- (
- SELECT
- T1.receipt_payment_amount
- FROM
- receipt_payment T1
- LEFT JOIN invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
- LEFT JOIN invoice_registration_product T3 ON T2.invoice_registration_product_id = T3.id
- LEFT JOIN sales_ledger T4 ON T4.id = T3.sales_ledger_id
- LEFT JOIN (
- SELECT
- T3.customer_id,
- SUM( invoice_total ) AS invoice_total
- FROM
- invoice_ledger T1
- LEFT JOIN invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- GROUP BY
- T3.customer_id
- ) T5 ON T5.customer_id = T4.customer_id
- WHERE
- T4.customer_id = #{customerId}
-
- ORDER BY
- T1.create_time ASC
- LIMIT #{total} ) AS limited_rows
- </select>
-
- <select id="receiptPaymentHistoryList" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
- SELECT
- T1.receipt_payment_date,
- T5.customer_name,
- T1.receipt_payment_amount,
- T1.receipt_payment_type,
- T1.registrant,
- T1.create_time
- FROM
- receipt_payment T1
- LEFT JOIN
- invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
- LEFT JOIN invoice_registration_product T3 ON T2.invoice_registration_product_id = T3.id
- LEFT JOIN sales_ledger T4 ON T3.sales_ledger_id = T4.id
- LEFT JOIN customer T5 ON T5.id = T4.customer_id
- <where>
- <if test="params.searchText != null and params.searchText != '' ">
- T5.customer_name LIKE CONCAT('%',#{params.searchText},'%')
- </if>
- </where>
- ORDER BY T1.receipt_payment_date DESC
- </select>
-
- <select id="receiptPaymentHistoryListPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
- SELECT
- T1.id,
- T1.receipt_payment_date,
- T5.customer_name,
- T1.receipt_payment_amount,
- T1.receipt_payment_type,
- T1.registrant,
- T1.create_time,
- T4.project_name,
- T4.sales_contract_no,
- T4.customer_contract_no
- FROM
- receipt_payment T1
- LEFT JOIN
- invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
- LEFT JOIN invoice_registration_product T3 ON T2.invoice_registration_product_id = T3.id
- LEFT JOIN sales_ledger T4 ON T3.sales_ledger_id = T4.id
- LEFT JOIN customer T5 ON T5.id = T4.customer_id
- <where>
- <if test="params.searchText != null and params.searchText != '' ">
- T5.customer_name LIKE CONCAT('%',#{params.searchText},'%')
- </if>
- <if test="params.receiptPaymentDateStart != null and params.receiptPaymentDateStart != '' ">
- AND T1.receipt_payment_date >= date_format(#{params.receiptPaymentDateStart},'%Y-%m-%d')
- </if>
- <if test="params.receiptPaymentDateEnd != null and params.receiptPaymentDateEnd != '' ">
- AND T1.receipt_payment_date <= date_format(#{params.receiptPaymentDateEnd}, '%Y-%m-%d')
- </if>
- <if test="params.projectName != null and params.projectName != '' ">
- AND T4.project_name LIKE CONCAT('%',#{params.projectName},'%')
- </if>
- <if test="params.customerContractNo != null and params.customerContractNo != '' ">
- AND T4.customer_contract_no LIKE CONCAT('%',#{params.customerContractNo},'%')
- </if>
- <if test="params.salesContractNo != null and params.salesContractNo != '' ">
- AND T4.sales_contract_no LIKE CONCAT('%',#{params.salesContractNo},'%')
- </if>
- </where>
- ORDER BY T1.receipt_payment_date DESC
- </select>
-
-
-
-
-<!-- SELECT-->
-<!-- *-->
-<!-- FROM-->
-<!-- (-->
-<!-- SELECT-->
-<!-- receipt_payment_amount AS receiptAmount,-->
-<!-- receipt_payment_date AS happenTime,-->
-<!-- 0 AS type,-->
-<!-- 0 AS invoiceAmount-->
-<!-- FROM-->
-<!-- receipt_payment-->
-<!-- WHERE-->
-<!-- invoice_ledger_id IN (-->
-<!-- SELECT-->
-<!-- id-->
-<!-- FROM-->
-<!-- invoice_ledger-->
-<!-- WHERE-->
-<!-- invoice_registration_product_id IN (-->
-<!-- SELECT-->
-<!-- id-->
-<!-- FROM-->
-<!-- invoice_registration_product-->
-<!-- WHERE-->
-<!-- sales_ledger_id IN ( SELECT id FROM sales_ledger WHERE customer_id = #{customerId} ))) UNION-->
-<!-- SELECT-->
-<!-- 0 AS receiptAmount,-->
-<!-- invoice_date AS happenTime,-->
-<!-- 1 AS type,-->
-<!-- invoice_total AS invoiceAmount-->
-<!-- FROM-->
-<!-- invoice_ledger-->
-<!-- WHERE-->
-<!-- invoice_registration_product_id IN (-->
-<!-- SELECT-->
-<!-- id-->
-<!-- FROM-->
-<!-- invoice_registration_product-->
-<!-- WHERE-->
-<!-- sales_ledger_id IN ( SELECT id FROM sales_ledger WHERE customer_id = #{customerId} ))-->
-<!-- AND invoice_date IS NOT NULL-->
-<!-- ) T1-->
-<!-- ORDER BY-->
-<!-- T1.happenTime ASC-->
-
-
- <select id="customerInteractions" resultType="com.ruoyi.sales.dto.CustomerInteractionDto">
- SELECT
- rp.receipt_payment_amount AS receiptAmount,
- rp.receipt_payment_date AS happenTime,
- 0 AS type,
- 0 AS invoiceAmount
- FROM
- receipt_payment rp
- WHERE EXISTS (
- SELECT 1
- FROM invoice_ledger il
- JOIN invoice_registration_product irp ON il.invoice_registration_product_id = irp.id
- JOIN sales_ledger sl ON irp.sales_ledger_id = sl.id
- WHERE sl.customer_id = #{customerId}
- AND rp.invoice_ledger_id = il.id
- )
-
- UNION ALL
-
- SELECT
- 0 AS receiptAmount,
- il.invoice_date AS happenTime,
- 1 AS type,
- il.invoice_total AS invoiceAmount
- FROM
- invoice_ledger il
- JOIN invoice_registration_product irp ON il.invoice_registration_product_id = irp.id
- JOIN sales_ledger sl ON irp.sales_ledger_id = sl.id
- WHERE
- sl.customer_id = #{customerId}
- AND il.invoice_date IS NOT NULL
-
- ORDER BY happenTime ASC;
- </select>
-
- <select id="receiptPaymentHistoryListNoPage" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
- SELECT
- T1.id,
- T1.receipt_payment_date,
- T5.customer_name,
- T1.receipt_payment_amount,
- T1.receipt_payment_type,
- T1.registrant,
- T1.create_time
- FROM
- receipt_payment T1
- LEFT JOIN
- invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
- LEFT JOIN invoice_registration_product T3 ON T2.invoice_registration_product_id = T3.id
- LEFT JOIN sales_ledger T4 ON T3.sales_ledger_id = T4.id
- LEFT JOIN customer T5 ON T5.id = T4.customer_id
- WHERE T1.invoice_ledger_id = #{params.invoiceLedgerId}
- ORDER BY T1.receipt_payment_date DESC
- </select>
-
- <select id="receiptPaymentListByProdRegId" resultType="com.ruoyi.sales.pojo.ReceiptPayment">
- SELECT
- T1.*
- FROM
- receipt_payment T1
- LEFT JOIN invoice_ledger T2 ON T1.invoice_ledger_id = T2.id
- WHERE
- T2.invoice_registration_product_id = #{invoiceRegistrationProductId}
- </select>
- <select id="bindInvoiceNoRegListAll" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">
- SELECT
- T1.id ,
- T1.invoice_no ,
- T1.invoice_total ,
- T3.project_name,
- T1.invoice_person ,
- T1.invoice_date ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id ,
- T2.tax_rate,
- T3.sales_contract_no,
- T3.customer_contract_no,
- T3.customer_name,
- T4.invoiceFileName,
- T5.product_category,
- IFNULL(T6.receipt_payment_amount_total ,0) AS receipt_payment_amount_total,
- (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total ,0)) AS no_receipt_amount
- FROM invoice_ledger T1
- LEFT JOIN invoice_registration_product T2 ON T2.id = T1.invoice_registration_product_id
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- LEFT JOIN (
- SELECT
- invoice_ledger_id,
- GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
- FROM invoice_ledger_file GROUP BY invoice_ledger_id
- ) T4 ON T4.invoice_ledger_id = T1.id
- LEFT JOIN sales_ledger_product T5 ON T2.sales_ledger_product_id = T5.id
- LEFT JOIN (
- SELECT SUM(receipt_payment_amount) AS receipt_payment_amount_total,invoice_ledger_id FROM receipt_payment GROUP
- BY invoice_ledger_id
- ) T6 ON T1.id = T6.invoice_ledger_id
- </select>
- <select id="bindInvoiceNoRegListByIds" resultType="com.ruoyi.sales.dto.ReceiptPaymentExeclDto">
- SELECT
- T1.id ,
- T1.invoice_no ,
- T1.invoice_total ,
- T3.project_name,
- T1.invoice_person ,
- T1.invoice_date ,
- T1.create_time ,
- T1.create_user ,
- T1.update_time ,
- T1.update_user ,
- T1.tenant_id ,
- T2.tax_rate,
- T3.sales_contract_no,
- T3.customer_contract_no,
- T3.customer_name,
- T4.invoiceFileName,
- T5.product_category,
- IFNULL(T6.receipt_payment_amount_total ,0) AS receipt_payment_amount_total,
- (T1.invoice_total - IFNULL(T6.receipt_payment_amount_total ,0)) AS no_receipt_amount
- FROM invoice_ledger T1
- LEFT JOIN invoice_registration_product T2 ON T2.id = T1.invoice_registration_product_id
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- LEFT JOIN (
- SELECT
- invoice_ledger_id,
- GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
- FROM invoice_ledger_file GROUP BY invoice_ledger_id
- ) T4 ON T4.invoice_ledger_id = T1.id
- LEFT JOIN sales_ledger_product T5 ON T2.sales_ledger_product_id = T5.id
- LEFT JOIN (
- SELECT SUM(receipt_payment_amount) AS receipt_payment_amount_total,invoice_ledger_id FROM receipt_payment GROUP
- BY invoice_ledger_id
- ) T6 ON T1.id = T6.invoice_ledger_id
- <where>
- <if test="ids.size() > 0">
- T1.id IN
- <foreach item="item" collection="ids" separator="," open="(" close=")">
- #{item}
- </foreach>
- </if>
- <if test="tenantId != null " >
- AND T1.tenant_id = #{tenantId}
- </if>
- </where>
-
- </select>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/SalesLedgerMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/SalesLedgerMapper.xml"
deleted file mode 100644
index b06878b..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/SalesLedgerMapper.xml"
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.SalesLedgerMapper">
-
- <select id="selectSequencesByDate" resultType="java.lang.Integer">
- SELECT CAST(SUBSTR(sales_contract_no,LENGTH(#{datePart})+1 , 3) AS SIGNED)
- FROM sales_ledger
- WHERE sales_contract_no LIKE CONCAT('%',#{datePart},'%')
- </select>
- <select id="getSalesNo" resultType="com.ruoyi.sales.pojo.SalesLedger">
-
- </select>
-
- <select id="selectSalesLedgerList" resultType="com.ruoyi.sales.pojo.SalesLedger">
- SELECT
- T1.id,
- T1.sales_contract_no,
- T1.customer_contract_no,
- T1.project_name,
- T1.entry_date,
- T1.salesman,
- T1.customer_id,
- T1.customer_name,
- T1.entry_person,
- T1.remarks,
- T1.attachment_materials,
- T1.tenant_id,
- T1.contract_amount,
- T1.execution_date,
- T2.nick_name AS entry_person_name,
- T1.payment_method
- FROM
- sales_ledger T1
- LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
- <where>
- <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
- </if>
- </where>
- </select>
-
- <select id="selectSalesLedgerListPage" resultType="com.ruoyi.sales.pojo.SalesLedger">
- SELECT
- T1.id,
- T1.sales_contract_no,
- T1.customer_contract_no,
- T1.project_name,
- T1.entry_date,
- T1.salesman,
- T1.customer_id,
- T1.customer_name,
- T1.entry_person,
- T1.remarks,
- T1.attachment_materials,
- T1.tenant_id,
- T1.contract_amount,
- T1.execution_date,
- T1.approval_status,
- T1.sales_type,
- T2.nick_name AS entry_person_name,
- T1.payment_method
- FROM
- sales_ledger T1
- LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
- <where>
- <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
- </if>
- <if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
- AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
- </if>
- <if test="salesLedgerDto.salesContractNo != null and salesLedgerDto.salesContractNo != '' ">
- AND T1.sales_contract_no LIKE CONCAT('%',#{salesLedgerDto.salesContractNo},'%')
- </if>
- <if test="salesLedgerDto.projectName != null and salesLedgerDto.projectName != '' ">
- AND T1.project_name LIKE CONCAT('%',#{salesLedgerDto.projectName},'%')
- </if>
- <if test="salesLedgerDto.entryDateStart != null and salesLedgerDto.entryDateStart != '' ">
- AND T1.entry_date >= DATE_FORMAT(#{salesLedgerDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
- AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
- </if>
- <if test="salesLedgerDto.approvalStatus != null">
- AND T1.approval_status =#{salesLedgerDto.approvalStatus}
- </if>
- </where>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/SalesQuotationMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/SalesQuotationMapper.xml"
deleted file mode 100644
index a39cd45..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/SalesQuotationMapper.xml"
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.SalesQuotationMapper">
- <select id="listPage" resultType="com.ruoyi.sales.dto.SalesQuotationDto">
- SELECT * FROM sales_quotation
- WHERE 1=1
- <if test="salesQuotationDto.quotationNo != null and salesQuotationDto.quotationNo != '' ">
- AND quotation_no LIKE CONCAT('%',#{salesQuotationDto.quotationNo},'%')
- </if>
- <if test="salesQuotationDto.customer != null and salesQuotationDto.customer != '' ">
- AND customer = #{salesQuotationDto.customer}
- </if>
- <if test="salesQuotationDto.status != null and salesQuotationDto.status != '' ">
- AND status = #{salesQuotationDto.status}
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/SalesQuotationProductMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/SalesQuotationProductMapper.xml"
deleted file mode 100644
index fa3745e..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/SalesQuotationProductMapper.xml"
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.SalesQuotationProductMapper">
-<!-- <select id="selectBySalesQuotationIds" resultType="com.ruoyi.sales.pojo.SalesQuotationProduct">-->
-<!-- select * from sales_quotation_product where sales_quotation_id in-->
-<!-- <foreach collection="salesQuotationIds" item="salesQuotationId" open="(" close=")" separator=",">-->
-<!-- #{salesQuotationId}-->
-<!-- </foreach>-->
-<!-- </select>-->
- <select id="selectBySalesQuotationId" resultType="com.ruoyi.sales.pojo.SalesQuotationProduct">
- select * from sales_quotation_product where sales_quotation_id = #{id}
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/SalespersonManagementMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/SalespersonManagementMapper.xml"
deleted file mode 100644
index 3a2049d..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/SalespersonManagementMapper.xml"
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.SalespersonManagementMapper">
-
- <select id="listPage" resultType="com.ruoyi.sales.pojo.SalespersonManagement">
- select * from salesperson_management
- <where>
- <if test="req.name != null and req.name != ''">
- and `name` like concat('%',#{req.name},'%')
- </if>
- <if test="req.department != null and req.department != ''">
- and department = #{req.department}
- </if>
- <if test="req.status != null and req.status != ''">
- and status = #{req.status}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/ShippingInfoMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/ShippingInfoMapper.xml"
deleted file mode 100644
index a23a02c..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/sales/ShippingInfoMapper.xml"
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.sales.mapper.ShippingInfoMapper">
-
- <select id="listPage" resultType="com.ruoyi.sales.vo.ShippingInfoVo">
- SELECT
- s.id,
- s.sales_ledger_id,
- s.shipping_date,
- s.shipping_car_number,
- s.create_time,
- s.update_time,
- s.create_user,
- s.update_user,
- s.tenant_id,
- sl.sales_contract_no,
- sl.customer_name,
- slp.product_category,
- slp.specification_model,
- slp.quantity
- FROM shipping_info s
- LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
- left join sales_ledger_product slp on slp.id = s.sales_ledger_product_id and slp.type = 1
- WHERE 1=1
- <if test="req.salesContractNo != null and req.salesContractNo != ''">
- AND sl.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
- </if>
- <if test="req.productCategory != null and req.productCategory != ''">
- AND slp.product_category LIKE CONCAT('%',#{req.productCategory},'%')
- </if>
- <if test="req.shippingCarNumber != null and req.shippingCarNumber != ''">
- AND s.shipping_car_number LIKE CONCAT('%',#{req.shippingCarNumber},'%')
- </if>
- </select>
- <select id="listAll" resultType="com.ruoyi.sales.pojo.ShippingInfo">
- SELECT
- s.id,
- s.sales_ledger_id,
- s.shipping_date,
- s.shipping_car_number,
- s.create_time,
- s.update_time,
- s.create_user,
- s.update_user,
- s.tenant_id,
- sl.sales_contract_no,
- sl.customer_name
- FROM shipping_info s
- LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/staff/HolidayApplicationMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/staff/HolidayApplicationMapper.xml"
deleted file mode 100644
index b0bda29..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/staff/HolidayApplicationMapper.xml"
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.staff.mapper.HolidayApplicationMapper">
-
-
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml"
deleted file mode 100644
index 13d3513..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/staff/PersonalAttendanceRecordsMapper.xml"
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.staff.mapper.PersonalAttendanceRecordsMapper">
-
-
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml"
deleted file mode 100644
index d720d37..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml"
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper">
- <select id="staffJoinLeaveRecordListPage" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
- SELECT
- *
- FROM staff_join_leave_record
- where
- staff_state = #{staffJoinLeaveRecord.staffState}
- <if test="staffJoinLeaveRecord.staffName != null and staffJoinLeaveRecord.staffName != '' ">
- AND staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%')
- </if>
- <if test="staffJoinLeaveRecord.entryDateStart != null and staffJoinLeaveRecord.entryDateStart != '' ">
- and contract_start_time like concat('%',#{staffJoinLeaveRecord.entryDateStart},'%')
- </if>
- <if test="staffJoinLeaveRecord.entryDateEnd != null and staffJoinLeaveRecord.entryDateEnd != '' ">
- and contract_end_time like concat('%',#{staffJoinLeaveRecord.entryDateEnd},'%')
- </if>
- order by create_time desc
- </select>
- <select id="staffJoinLeaveRecordList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
- SELECT
- *
- FROM staff_join_leave_record
- where
- staff_state = #{staffJoinLeaveRecord.staffState}
- <if test="staffJoinLeaveRecord.staffName != null and staffJoinLeaveRecord.staffName != '' ">
- AND staff_name LIKE CONCAT('%',#{staffJoinLeaveRecord.staffName},'%')
- </if>
- </select>
- <select id="staffOnJobList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
- select *
- from (select *,
- ROW_NUMBER() over (PARTITION BY staff_no ORDER BY create_time DESC ) as rn
- from staff_join_leave_record
- where staff_state = 1) t
- where rn = 1
-
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/staff/StaffOnJobMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/staff/StaffOnJobMapper.xml"
deleted file mode 100644
index 25e79b8..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/staff/StaffOnJobMapper.xml"
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.staff.mapper.StaffOnJobMapper">
- <select id="staffOnJobListPage" resultType="com.ruoyi.staff.pojo.StaffOnJob">
- SELECT
- *
- FROM staff_on_job
- where 1=1
- <if test="staffOnJob.staffState != null and staffOnJob.staffState != '' ">
- AND staff_state = #{staffOnJob.staffState}
- </if>
- <if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
- AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
- </if>
- <if test="staffOnJob.entryDateStart != null and staffOnJob.entryDateStart != '' ">
- AND contract_expire_time >= DATE_FORMAT(#{staffOnJob.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="staffOnJob.entryDateEnd != null and staffOnJob.entryDateEnd != '' ">
- AND contract_expire_time <= DATE_FORMAT(#{staffOnJob.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
- <select id="staffOnJobList" resultType="com.ruoyi.staff.pojo.StaffOnJob">
- SELECT
- *
- FROM staff_on_job
- where 1=1
- <if test="staffOnJob.staffState != null and staffOnJob.staffState != '' ">
- AND staff_state = #{staffOnJob.staffState}
- </if>
- <if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
- AND staff_name LIKE CONCAT('%',#{staffOnJob.staffName},'%')
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/staff/StaffSchedulingMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/staff/StaffSchedulingMapper.xml"
deleted file mode 100644
index 1a32ef1..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/staff/StaffSchedulingMapper.xml"
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.staff.mapper.StaffSchedulingMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.staff.pojo.StaffScheduling">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="staffId" column="staff_id" jdbcType="INTEGER"/>
- <result property="department" column="department" jdbcType="INTEGER"/>
- <result property="shiftType" column="shift_type" jdbcType="INTEGER"/>
- <result property="workDate" column="work_date" jdbcType="DATE"/>
- <result property="workStartTime" column="work_start_time" jdbcType="TIMESTAMP"/>
- <result property="workEndTime" column="work_end_time" jdbcType="TIMESTAMP"/>
- <result property="workHours" column="work_hours" jdbcType="DECIMAL"/>
- <result property="status" column="status" jdbcType="INTEGER"/>
- <result property="remark" column="remark" jdbcType="VARCHAR"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="createUser" column="create_user" jdbcType="BIGINT"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="BIGINT"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id,staff_id,department,
- shift_type,work_date,work_start_time,
- work_end_time,work_hours,status,
- remark,create_time,create_user,
- update_time,update_user,tenant_id
- </sql>
- <select id="listPage" resultType="com.ruoyi.staff.dto.StaffSchedulingDto">
- SELECT
- t1.*,t2.staff_name as 'staff_name' ,t2.staff_no as 'staff_no'
- FROM staff_scheduling t1
- left join staff_join_leave_record t2 on t1.staff_id = t2.id
- where 1=1
- <if test="vo.staffName != null and vo.staffName != '' ">
- AND t2.staff_name LIKE CONCAT('%', #{vo.staffName}, '%')
- </if>
- <if test="vo.shiftType != null and vo.shiftType != '' ">
- AND t1.shift_type = #{vo.shiftType}
- </if>
- <if test="vo.startDate != null ">
- AND t1.work_date >= DATE_FORMAT(#{vo.startDate},'%Y-%m-%d')
- </if>
- <if test="vo.endDate != null ">
- AND t1.work_date <![CDATA[ <= ]]> DATE_FORMAT(#{vo.endDate},'%Y-%m-%d')
- </if>
- ORDER BY t1.create_time DESC
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysConfigMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysConfigMapper.xml"
deleted file mode 100644
index 8681f70..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysConfigMapper.xml"
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysConfigMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysConfig" id="SysConfigResult">
- <id property="configId" column="config_id" />
- <result property="configName" column="config_name" />
- <result property="configKey" column="config_key" />
- <result property="configValue" column="config_value" />
- <result property="configType" column="config_type" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- </resultMap>
-
- <sql id="selectConfigVo">
- select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark
- from sys_config
- </sql>
-
- <!-- 鏌ヨ鏉′欢 -->
- <sql id="sqlwhereSearch">
- <where>
- <if test="configId !=null">
- and config_id = #{configId}
- </if>
- <if test="configKey !=null and configKey != ''">
- and config_key = #{configKey}
- </if>
- </where>
- </sql>
-
- <select id="selectConfig" parameterType="com.ruoyi.project.system.domain.SysConfig" resultMap="SysConfigResult">
- <include refid="selectConfigVo"/>
- <include refid="sqlwhereSearch"/>
- </select>
-
- <select id="selectConfigList" parameterType="com.ruoyi.project.system.domain.SysConfig" resultMap="SysConfigResult">
- <include refid="selectConfigVo"/>
- <where>
- <if test="configName != null and configName != ''">
- AND config_name like concat('%', #{configName}, '%')
- </if>
- <if test="configType != null and configType != ''">
- AND config_type = #{configType}
- </if>
- <if test="configKey != null and configKey != ''">
- AND config_key like concat('%', #{configKey}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
- </if>
- </where>
- </select>
-
- <select id="selectConfigById" parameterType="Long" resultMap="SysConfigResult">
- <include refid="selectConfigVo"/>
- where config_id = #{configId}
- </select>
-
- <select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">
- <include refid="selectConfigVo"/>
- where config_key = #{configKey} limit 1
- </select>
-
- <insert id="insertConfig" parameterType="com.ruoyi.project.system.domain.SysConfig">
- insert into sys_config (
- <if test="configName != null and configName != '' ">config_name,</if>
- <if test="configKey != null and configKey != '' ">config_key,</if>
- <if test="configValue != null and configValue != '' ">config_value,</if>
- <if test="configType != null and configType != '' ">config_type,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- <if test="remark != null and remark != ''">remark,</if>
- create_time
- )values(
- <if test="configName != null and configName != ''">#{configName},</if>
- <if test="configKey != null and configKey != ''">#{configKey},</if>
- <if test="configValue != null and configValue != ''">#{configValue},</if>
- <if test="configType != null and configType != ''">#{configType},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateConfig" parameterType="com.ruoyi.project.system.domain.SysConfig">
- update sys_config
- <set>
- <if test="configName != null and configName != ''">config_name = #{configName},</if>
- <if test="configKey != null and configKey != ''">config_key = #{configKey},</if>
- <if test="configValue != null and configValue != ''">config_value = #{configValue},</if>
- <if test="configType != null and configType != ''">config_type = #{configType},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- <if test="remark != null">remark = #{remark},</if>
- update_time = sysdate()
- </set>
- where config_id = #{configId}
- </update>
-
- <delete id="deleteConfigById" parameterType="Long">
- delete from sys_config where config_id = #{configId}
- </delete>
-
- <delete id="deleteConfigByIds" parameterType="Long">
- delete from sys_config where config_id in
- <foreach item="configId" collection="array" open="(" separator="," close=")">
- #{configId}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysDeptMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysDeptMapper.xml"
deleted file mode 100644
index 5c6310a..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysDeptMapper.xml"
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysDeptMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysDept" id="SysDeptResult">
- <id property="deptId" column="dept_id" />
- <result property="parentId" column="parent_id" />
- <result property="ancestors" column="ancestors" />
- <result property="deptName" column="dept_name" />
- <result property="orderNum" column="order_num" />
- <result property="leader" column="leader" />
- <result property="phone" column="phone" />
- <result property="email" column="email" />
- <result property="status" column="status" />
- <result property="delFlag" column="del_flag" />
- <result property="parentName" column="parent_name" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- </resultMap>
-
- <sql id="selectDeptVo">
- select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
- from sys_dept d
- </sql>
-
- <select id="selectDeptList" parameterType="com.ruoyi.project.system.domain.SysDept" resultMap="SysDeptResult">
- <include refid="selectDeptVo"/>
- where d.del_flag = '0'
- <if test="deptId != null and deptId != 0">
- AND dept_id = #{deptId}
- </if>
- <if test="parentId != null and parentId != 0">
- AND parent_id = #{parentId}
- </if>
- <if test="deptName != null and deptName != ''">
- AND dept_name like concat('%', #{deptName}, '%')
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
- order by d.parent_id, d.order_num
- </select>
-
- <select id="selectDeptListByRoleId" resultType="Long">
- select d.dept_id
- from sys_dept d
- left join sys_role_dept rd on d.dept_id = rd.dept_id
- where rd.role_id = #{roleId}
- <if test="deptCheckStrictly">
- and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
- </if>
- order by d.parent_id, d.order_num
- </select>
-
- <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
- select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
- (select dept_name from sys_dept where dept_id = d.parent_id) parent_name,
- d.dept_nick
- from sys_dept d
- where d.dept_id = #{deptId}
- </select>
-
- <select id="checkDeptExistUser" parameterType="Long" resultType="int">
- select count(1) from sys_user_dept where dept_id = #{deptId}
- </select>
-
- <select id="hasChildByDeptId" parameterType="Long" resultType="int">
- select count(1) from sys_dept
- where del_flag = '0' and parent_id = #{deptId} limit 1
- </select>
-
- <select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
- select * from sys_dept where find_in_set(#{deptId}, ancestors)
- </select>
-
- <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
- select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
- </select>
-
- <select id="checkDeptNameUnique" resultMap="SysDeptResult">
- <include refid="selectDeptVo"/>
- where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
- </select>
-
- <insert id="insertDept" parameterType="com.ruoyi.project.system.domain.SysDept">
- insert into sys_dept(
- <if test="deptId != null and deptId != 0">dept_id,</if>
- <if test="parentId != null and parentId != 0">parent_id,</if>
- <if test="deptName != null and deptName != ''">dept_name,</if>
- <if test="ancestors != null and ancestors != ''">ancestors,</if>
- <if test="orderNum != null">order_num,</if>
- <if test="leader != null and leader != ''">leader,</if>
- <if test="phone != null and phone != ''">phone,</if>
- <if test="email != null and email != ''">email,</if>
- <if test="deptNick != null and deptNick != ''">dept_nick,</if>
- <if test="status != null">status,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="deptId != null and deptId != 0">#{deptId},</if>
- <if test="parentId != null and parentId != 0">#{parentId},</if>
- <if test="deptName != null and deptName != ''">#{deptName},</if>
- <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
- <if test="orderNum != null">#{orderNum},</if>
- <if test="leader != null and leader != ''">#{leader},</if>
- <if test="phone != null and phone != ''">#{phone},</if>
- <if test="email != null and email != ''">#{email},</if>
- <if test="deptNick != null and deptNick != '' ">#{deptNick},</if>
- <if test="status != null">#{status},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateDept" parameterType="com.ruoyi.project.system.domain.SysDept">
- update sys_dept
- <set>
- <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
- <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
- <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
- <if test="orderNum != null">order_num = #{orderNum},</if>
- <if test="leader != null">leader = #{leader},</if>
- <if test="phone != null">phone = #{phone},</if>
- <if test="email != null">email = #{email},</if>
- <if test="deptNick != null and deptNick != '' ">dept_nick = #{deptNick},</if>
- <if test="status != null and status != ''">status = #{status},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where dept_id = #{deptId}
- </update>
-
- <update id="updateDeptChildren" parameterType="java.util.List">
- update sys_dept set ancestors =
- <foreach collection="depts" item="item" index="index"
- separator=" " open="case dept_id" close="end">
- when #{item.deptId} then #{item.ancestors}
- </foreach>
- where dept_id in
- <foreach collection="depts" item="item" index="index"
- separator="," open="(" close=")">
- #{item.deptId}
- </foreach>
- </update>
-
- <update id="updateDeptStatusNormal" parameterType="Long">
- update sys_dept set status = '0' where dept_id in
- <foreach collection="array" item="deptId" open="(" separator="," close=")">
- #{deptId}
- </foreach>
- </update>
-
- <delete id="deleteDeptById" parameterType="Long">
- update sys_dept set del_flag = '2' where dept_id = #{deptId}
- </delete>
-
- <select id="maxLevelDeptId">
- WITH RECURSIVE DepartmentHierarchy AS (
- SELECT dept_id, parent_id
- FROM sys_dept
- WHERE dept_id = #{deptId}
-
- UNION ALL
-
- -- 閫掑綊鎯呭喌锛氬姞鍏ュ綋鍓嶉儴闂ㄧ殑鐖剁骇閮ㄩ棬
- SELECT d.dept_id, d.parent_id
- FROM sys_dept d
- INNER JOIN DepartmentHierarchy dh ON d.dept_id = dh.parent_id
- )
- -- 鏌ヨ鏈�椤剁骇鐨勭埗绾ч儴闂↖D
- SELECT dept_id as top_level_department_id
- FROM DepartmentHierarchy
- WHERE parent_id = 100;
- </select>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysDictDataMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysDictDataMapper.xml"
deleted file mode 100644
index 148b58e..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysDictDataMapper.xml"
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysDictDataMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysDictData" id="SysDictDataResult">
- <id property="dictCode" column="dict_code" />
- <result property="dictSort" column="dict_sort" />
- <result property="dictLabel" column="dict_label" />
- <result property="dictValue" column="dict_value" />
- <result property="dictType" column="dict_type" />
- <result property="cssClass" column="css_class" />
- <result property="listClass" column="list_class" />
- <result property="isDefault" column="is_default" />
- <result property="status" column="status" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- </resultMap>
-
- <sql id="selectDictDataVo">
- select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark
- from sys_dict_data
- </sql>
-
- <select id="selectDictDataList" parameterType="com.ruoyi.project.system.domain.SysDictData" resultMap="SysDictDataResult">
- <include refid="selectDictDataVo"/>
- <where>
- <if test="dictType != null and dictType != ''">
- AND dict_type = #{dictType}
- </if>
- <if test="dictLabel != null and dictLabel != ''">
- AND dict_label like concat('%', #{dictLabel}, '%')
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- </where>
- order by dict_sort asc
- </select>
-
- <select id="selectDictDataByType" parameterType="String" resultMap="SysDictDataResult">
- <include refid="selectDictDataVo"/>
- where status = '0' and dict_type = #{dictType} order by dict_sort asc
- </select>
-
- <select id="selectDictLabel" resultType="String">
- select dict_label from sys_dict_data
- where dict_type = #{dictType} and dict_value = #{dictValue}
- </select>
-
- <select id="selectDictDataById" parameterType="Long" resultMap="SysDictDataResult">
- <include refid="selectDictDataVo"/>
- where dict_code = #{dictCode}
- </select>
-
- <select id="countDictDataByType" resultType="Integer">
- select count(1) from sys_dict_data where dict_type=#{dictType}
- </select>
-
- <delete id="deleteDictDataById" parameterType="Long">
- delete from sys_dict_data where dict_code = #{dictCode}
- </delete>
-
- <delete id="deleteDictDataByIds" parameterType="Long">
- delete from sys_dict_data where dict_code in
- <foreach collection="array" item="dictCode" open="(" separator="," close=")">
- #{dictCode}
- </foreach>
- </delete>
-
- <update id="updateDictData" parameterType="com.ruoyi.project.system.domain.SysDictData">
- update sys_dict_data
- <set>
- <if test="dictSort != null">dict_sort = #{dictSort},</if>
- <if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if>
- <if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>
- <if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
- <if test="cssClass != null">css_class = #{cssClass},</if>
- <if test="listClass != null">list_class = #{listClass},</if>
- <if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if>
- <if test="status != null">status = #{status},</if>
- <if test="remark != null">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where dict_code = #{dictCode}
- </update>
-
- <update id="updateDictDataType" parameterType="String">
- update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType}
- </update>
-
- <insert id="insertDictData" parameterType="com.ruoyi.project.system.domain.SysDictData">
- insert into sys_dict_data(
- <if test="dictSort != null">dict_sort,</if>
- <if test="dictLabel != null and dictLabel != ''">dict_label,</if>
- <if test="dictValue != null and dictValue != ''">dict_value,</if>
- <if test="dictType != null and dictType != ''">dict_type,</if>
- <if test="cssClass != null and cssClass != ''">css_class,</if>
- <if test="listClass != null and listClass != ''">list_class,</if>
- <if test="isDefault != null and isDefault != ''">is_default,</if>
- <if test="status != null">status,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="dictSort != null">#{dictSort},</if>
- <if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
- <if test="dictValue != null and dictValue != ''">#{dictValue},</if>
- <if test="dictType != null and dictType != ''">#{dictType},</if>
- <if test="cssClass != null and cssClass != ''">#{cssClass},</if>
- <if test="listClass != null and listClass != ''">#{listClass},</if>
- <if test="isDefault != null and isDefault != ''">#{isDefault},</if>
- <if test="status != null">#{status},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysDictTypeMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysDictTypeMapper.xml"
deleted file mode 100644
index 1cf1349..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysDictTypeMapper.xml"
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysDictTypeMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysDictType" id="SysDictTypeResult">
- <id property="dictId" column="dict_id" />
- <result property="dictName" column="dict_name" />
- <result property="dictType" column="dict_type" />
- <result property="status" column="status" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- </resultMap>
-
- <sql id="selectDictTypeVo">
- select dict_id, dict_name, dict_type, status, create_by, create_time, remark
- from sys_dict_type
- </sql>
-
- <select id="selectDictTypeList" parameterType="com.ruoyi.project.system.domain.SysDictType" resultMap="SysDictTypeResult">
- <include refid="selectDictTypeVo"/>
- <where>
- <if test="dictName != null and dictName != ''">
- AND dict_name like concat('%', #{dictName}, '%')
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <if test="dictType != null and dictType != ''">
- AND dict_type like concat('%', #{dictType}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
- </if>
- </where>
- </select>
-
- <select id="selectDictTypeAll" resultMap="SysDictTypeResult">
- <include refid="selectDictTypeVo"/>
- </select>
-
- <select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
- <include refid="selectDictTypeVo"/>
- where dict_id = #{dictId}
- </select>
-
- <select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
- <include refid="selectDictTypeVo"/>
- where dict_type = #{dictType}
- </select>
-
- <select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
- <include refid="selectDictTypeVo"/>
- where dict_type = #{dictType} limit 1
- </select>
-
- <delete id="deleteDictTypeById" parameterType="Long">
- delete from sys_dict_type where dict_id = #{dictId}
- </delete>
-
- <delete id="deleteDictTypeByIds" parameterType="Long">
- delete from sys_dict_type where dict_id in
- <foreach collection="array" item="dictId" open="(" separator="," close=")">
- #{dictId}
- </foreach>
- </delete>
-
- <update id="updateDictType" parameterType="com.ruoyi.project.system.domain.SysDictType">
- update sys_dict_type
- <set>
- <if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
- <if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
- <if test="status != null">status = #{status},</if>
- <if test="remark != null">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where dict_id = #{dictId}
- </update>
-
- <insert id="insertDictType" parameterType="com.ruoyi.project.system.domain.SysDictType">
- insert into sys_dict_type(
- <if test="dictName != null and dictName != ''">dict_name,</if>
- <if test="dictType != null and dictType != ''">dict_type,</if>
- <if test="status != null">status,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="dictName != null and dictName != ''">#{dictName},</if>
- <if test="dictType != null and dictType != ''">#{dictType},</if>
- <if test="status != null">#{status},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysJobLogMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysJobLogMapper.xml"
deleted file mode 100644
index 387e859..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysJobLogMapper.xml"
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.monitor.mapper.SysJobLogMapper">
-
- <resultMap type="com.ruoyi.project.monitor.domain.SysJobLog" id="SysJobLogResult">
- <id property="jobLogId" column="job_log_id" />
- <result property="jobName" column="job_name" />
- <result property="jobGroup" column="job_group" />
- <result property="invokeTarget" column="invoke_target" />
- <result property="jobMessage" column="job_message" />
- <result property="status" column="status" />
- <result property="exceptionInfo" column="exception_info" />
- <result property="createTime" column="create_time" />
- </resultMap>
-
- <sql id="selectJobLogVo">
- select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time
- from sys_job_log
- </sql>
-
- <select id="selectJobLogList" parameterType="com.ruoyi.project.monitor.domain.SysJobLog" resultMap="SysJobLogResult">
- <include refid="selectJobLogVo"/>
- <where>
- <if test="jobName != null and jobName != ''">
- AND job_name like concat('%', #{jobName}, '%')
- </if>
- <if test="jobGroup != null and jobGroup != ''">
- AND job_group = #{jobGroup}
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <if test="invokeTarget != null and invokeTarget != ''">
- AND invoke_target like concat('%', #{invokeTarget}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
- </if>
- </where>
- order by create_time desc
- </select>
-
- <select id="selectJobLogAll" resultMap="SysJobLogResult">
- <include refid="selectJobLogVo"/>
- </select>
-
- <select id="selectJobLogById" parameterType="Long" resultMap="SysJobLogResult">
- <include refid="selectJobLogVo"/>
- where job_log_id = #{jobLogId}
- </select>
-
- <delete id="deleteJobLogById" parameterType="Long">
- delete from sys_job_log where job_log_id = #{jobLogId}
- </delete>
-
- <delete id="deleteJobLogByIds" parameterType="Long">
- delete from sys_job_log where job_log_id in
- <foreach collection="array" item="jobLogId" open="(" separator="," close=")">
- #{jobLogId}
- </foreach>
- </delete>
-
- <update id="cleanJobLog">
- truncate table sys_job_log
- </update>
-
- <insert id="insertJobLog" parameterType="com.ruoyi.project.monitor.domain.SysJobLog">
- insert into sys_job_log(
- <if test="jobLogId != null and jobLogId != 0">job_log_id,</if>
- <if test="jobName != null and jobName != ''">job_name,</if>
- <if test="jobGroup != null and jobGroup != ''">job_group,</if>
- <if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
- <if test="jobMessage != null and jobMessage != ''">job_message,</if>
- <if test="status != null and status != ''">status,</if>
- <if test="exceptionInfo != null and exceptionInfo != ''">exception_info,</if>
- create_time
- )values(
- <if test="jobLogId != null and jobLogId != 0">#{jobLogId},</if>
- <if test="jobName != null and jobName != ''">#{jobName},</if>
- <if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
- <if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
- <if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if>
- sysdate()
- )
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysJobMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysJobMapper.xml"
deleted file mode 100644
index 71190d6..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysJobMapper.xml"
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.monitor.mapper.SysJobMapper">
-
- <resultMap type="com.ruoyi.project.monitor.domain.SysJob" id="SysJobResult">
- <id property="jobId" column="job_id" />
- <result property="jobName" column="job_name" />
- <result property="jobGroup" column="job_group" />
- <result property="invokeTarget" column="invoke_target" />
- <result property="cronExpression" column="cron_expression" />
- <result property="misfirePolicy" column="misfire_policy" />
- <result property="concurrent" column="concurrent" />
- <result property="status" column="status" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="remark" column="remark" />
- </resultMap>
-
- <sql id="selectJobVo">
- select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark
- from sys_job
- </sql>
-
- <select id="selectJobList" parameterType="com.ruoyi.project.monitor.domain.SysJob" resultMap="SysJobResult">
- <include refid="selectJobVo"/>
- <where>
- <if test="jobName != null and jobName != ''">
- AND job_name like concat('%', #{jobName}, '%')
- </if>
- <if test="jobGroup != null and jobGroup != ''">
- AND job_group = #{jobGroup}
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <if test="invokeTarget != null and invokeTarget != ''">
- AND invoke_target like concat('%', #{invokeTarget}, '%')
- </if>
- </where>
- </select>
-
- <select id="selectJobAll" resultMap="SysJobResult">
- <include refid="selectJobVo"/>
- </select>
-
- <select id="selectJobById" parameterType="Long" resultMap="SysJobResult">
- <include refid="selectJobVo"/>
- where job_id = #{jobId}
- </select>
-
- <delete id="deleteJobById" parameterType="Long">
- delete from sys_job where job_id = #{jobId}
- </delete>
-
- <delete id="deleteJobByIds" parameterType="Long">
- delete from sys_job where job_id in
- <foreach collection="array" item="jobId" open="(" separator="," close=")">
- #{jobId}
- </foreach>
- </delete>
-
- <update id="updateJob" parameterType="com.ruoyi.project.monitor.domain.SysJob">
- update sys_job
- <set>
- <if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
- <if test="jobGroup != null and jobGroup != ''">job_group = #{jobGroup},</if>
- <if test="invokeTarget != null and invokeTarget != ''">invoke_target = #{invokeTarget},</if>
- <if test="cronExpression != null and cronExpression != ''">cron_expression = #{cronExpression},</if>
- <if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy = #{misfirePolicy},</if>
- <if test="concurrent != null and concurrent != ''">concurrent = #{concurrent},</if>
- <if test="status !=null">status = #{status},</if>
- <if test="remark != null and remark != ''">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where job_id = #{jobId}
- </update>
-
- <insert id="insertJob" parameterType="com.ruoyi.project.monitor.domain.SysJob" useGeneratedKeys="true" keyProperty="jobId">
- insert into sys_job(
- <if test="jobId != null and jobId != 0">job_id,</if>
- <if test="jobName != null and jobName != ''">job_name,</if>
- <if test="jobGroup != null and jobGroup != ''">job_group,</if>
- <if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
- <if test="cronExpression != null and cronExpression != ''">cron_expression,</if>
- <if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy,</if>
- <if test="concurrent != null and concurrent != ''">concurrent,</if>
- <if test="status != null and status != ''">status,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="jobId != null and jobId != 0">#{jobId},</if>
- <if test="jobName != null and jobName != ''">#{jobName},</if>
- <if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
- <if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
- <if test="cronExpression != null and cronExpression != ''">#{cronExpression},</if>
- <if test="misfirePolicy != null and misfirePolicy != ''">#{misfirePolicy},</if>
- <if test="concurrent != null and concurrent != ''">#{concurrent},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysMenuMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysMenuMapper.xml"
deleted file mode 100644
index a3b6426..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysMenuMapper.xml"
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysMenuMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysMenu" id="SysMenuResult">
- <id property="menuId" column="menu_id" />
- <result property="menuName" column="menu_name" />
- <result property="parentName" column="parent_name" />
- <result property="parentId" column="parent_id" />
- <result property="orderNum" column="order_num" />
- <result property="path" column="path" />
- <result property="component" column="component" />
- <result property="query" column="query" />
- <result property="routeName" column="route_name" />
- <result property="isFrame" column="is_frame" />
- <result property="isCache" column="is_cache" />
- <result property="menuType" column="menu_type" />
- <result property="visible" column="visible" />
- <result property="status" column="status" />
- <result property="perms" column="perms" />
- <result property="icon" column="icon" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateTime" column="update_time" />
- <result property="updateBy" column="update_by" />
- <result property="remark" column="remark" />
- </resultMap>
-
- <sql id="selectMenuVo">
- select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
- from sys_menu
- </sql>
-
- <select id="selectMenuList" parameterType="com.ruoyi.project.system.domain.SysMenu" resultMap="SysMenuResult">
- <include refid="selectMenuVo"/>
- <where>
- <if test="menuName != null and menuName != ''">
- AND menu_name like concat('%', #{menuName}, '%')
- </if>
- <if test="visible != null and visible != ''">
- AND visible = #{visible}
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- </where>
- order by parent_id, order_num
- </select>
-
- <select id="selectMenuTreeAll" resultMap="SysMenuResult">
- select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
- from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
- order by m.parent_id, m.order_num
- </select>
-
- <select id="selectMenuListByUserId" parameterType="com.ruoyi.project.system.domain.SysMenu" resultMap="SysMenuResult">
- select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
- left join sys_user_role ur on rm.role_id = ur.role_id
- left join sys_role ro on ur.role_id = ro.role_id
- where ur.user_id = #{params.userId}
- <if test="menuName != null and menuName != ''">
- AND m.menu_name like concat('%', #{menuName}, '%')
- </if>
- <if test="visible != null and visible != ''">
- AND m.visible = #{visible}
- </if>
- <if test="status != null and status != ''">
- AND m.status = #{status}
- </if>
- order by m.parent_id, m.order_num
- </select>
-
- <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
- select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
- left join sys_user_role ur on rm.role_id = ur.role_id
- left join sys_role ro on ur.role_id = ro.role_id
- left join sys_user u on ur.user_id = u.user_id
- where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0
- order by m.parent_id, m.order_num
- </select>
-
- <select id="selectMenuListByRoleId" resultType="Long">
- select m.menu_id
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
- where rm.role_id = #{roleId}
- <if test="menuCheckStrictly">
- and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
- </if>
- order by m.parent_id, m.order_num
- </select>
-
- <select id="selectMenuPerms" resultType="String">
- select distinct m.perms
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
- left join sys_user_role ur on rm.role_id = ur.role_id
- </select>
-
- <select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
- select distinct m.perms
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
- left join sys_user_role ur on rm.role_id = ur.role_id
- left join sys_role r on r.role_id = ur.role_id
- where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
- </select>
-
- <select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
- select distinct m.perms
- from sys_menu m
- left join sys_role_menu rm on m.menu_id = rm.menu_id
- where m.status = '0' and rm.role_id = #{roleId}
- </select>
-
- <select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
- <include refid="selectMenuVo"/>
- where menu_id = #{menuId}
- </select>
-
- <select id="hasChildByMenuId" resultType="Integer">
- select count(1) from sys_menu where parent_id = #{menuId}
- </select>
-
- <select id="checkMenuNameUnique" parameterType="com.ruoyi.project.system.domain.SysMenu" resultMap="SysMenuResult">
- <include refid="selectMenuVo"/>
- where menu_name=#{menuName} and parent_id = #{parentId} limit 1
- </select>
-
- <update id="updateMenu" parameterType="com.ruoyi.project.system.domain.SysMenu">
- update sys_menu
- <set>
- <if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
- <if test="parentId != null">parent_id = #{parentId},</if>
- <if test="orderNum != null">order_num = #{orderNum},</if>
- <if test="path != null and path != ''">path = #{path},</if>
- <if test="component != null">component = #{component},</if>
- <if test="query != null">`query` = #{query},</if>
- <if test="routeName != null">route_name = #{routeName},</if>
- <if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
- <if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
- <if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
- <if test="visible != null">visible = #{visible},</if>
- <if test="status != null">status = #{status},</if>
- <if test="perms !=null">perms = #{perms},</if>
- <if test="icon !=null and icon != ''">icon = #{icon},</if>
- <if test="remark != null and remark != ''">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where menu_id = #{menuId}
- </update>
-
- <insert id="insertMenu" parameterType="com.ruoyi.project.system.domain.SysMenu">
- insert into sys_menu(
- <if test="menuId != null and menuId != 0">menu_id,</if>
- <if test="parentId != null and parentId != 0">parent_id,</if>
- <if test="menuName != null and menuName != ''">menu_name,</if>
- <if test="orderNum != null">order_num,</if>
- <if test="path != null and path != ''">path,</if>
- <if test="component != null and component != ''">component,</if>
- <if test="query != null and query != ''">`query`,</if>
- <if test="routeName != null">route_name,</if>
- <if test="isFrame != null and isFrame != ''">is_frame,</if>
- <if test="isCache != null and isCache != ''">is_cache,</if>
- <if test="menuType != null and menuType != ''">menu_type,</if>
- <if test="visible != null">visible,</if>
- <if test="status != null">status,</if>
- <if test="perms !=null and perms != ''">perms,</if>
- <if test="icon != null and icon != ''">icon,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="menuId != null and menuId != 0">#{menuId},</if>
- <if test="parentId != null and parentId != 0">#{parentId},</if>
- <if test="menuName != null and menuName != ''">#{menuName},</if>
- <if test="orderNum != null">#{orderNum},</if>
- <if test="path != null and path != ''">#{path},</if>
- <if test="component != null and component != ''">#{component},</if>
- <if test="query != null and query != ''">#{query},</if>
- <if test="routeName != null">#{routeName},</if>
- <if test="isFrame != null and isFrame != ''">#{isFrame},</if>
- <if test="isCache != null and isCache != ''">#{isCache},</if>
- <if test="menuType != null and menuType != ''">#{menuType},</if>
- <if test="visible != null">#{visible},</if>
- <if test="status != null">#{status},</if>
- <if test="perms !=null and perms != ''">#{perms},</if>
- <if test="icon != null and icon != ''">#{icon},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <delete id="deleteMenuById" parameterType="Long">
- delete from sys_menu where menu_id = #{menuId}
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysNoticeMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysNoticeMapper.xml"
deleted file mode 100644
index e152622..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysNoticeMapper.xml"
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysNoticeMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysNotice" id="SysNoticeResult">
- <result property="noticeId" column="notice_id" />
- <result property="noticeTitle" column="notice_title" />
- <result property="noticeType" column="notice_type" />
- <result property="noticeContent" column="notice_content" />
- <result property="status" column="status" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="remark" column="remark" />
- </resultMap>
-
- <sql id="selectNoticeVo">
- select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark
- from sys_notice
- </sql>
-
- <select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult">
- <include refid="selectNoticeVo"/>
- where notice_id = #{noticeId}
- </select>
-
- <select id="selectNoticeList" parameterType="com.ruoyi.project.system.domain.SysNotice" resultMap="SysNoticeResult">
- <include refid="selectNoticeVo"/>
- <where>
- <if test="noticeTitle != null and noticeTitle != ''">
- AND notice_title like concat('%', #{noticeTitle}, '%')
- </if>
- <if test="noticeType != null and noticeType != ''">
- AND notice_type = #{noticeType}
- </if>
- <if test="createBy != null and createBy != ''">
- AND create_by like concat('%', #{createBy}, '%')
- </if>
- </where>
- </select>
-
- <insert id="insertNotice" parameterType="com.ruoyi.project.system.domain.SysNotice">
- insert into sys_notice (
- <if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
- <if test="noticeType != null and noticeType != '' ">notice_type, </if>
- <if test="noticeContent != null and noticeContent != '' ">notice_content, </if>
- <if test="status != null and status != '' ">status, </if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle}, </if>
- <if test="noticeType != null and noticeType != ''">#{noticeType}, </if>
- <if test="noticeContent != null and noticeContent != ''">#{noticeContent}, </if>
- <if test="status != null and status != ''">#{status}, </if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateNotice" parameterType="com.ruoyi.project.system.domain.SysNotice">
- update sys_notice
- <set>
- <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>
- <if test="noticeType != null and noticeType != ''">notice_type = #{noticeType}, </if>
- <if test="noticeContent != null">notice_content = #{noticeContent}, </if>
- <if test="status != null and status != ''">status = #{status}, </if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where notice_id = #{noticeId}
- </update>
-
- <delete id="deleteNoticeById" parameterType="Long">
- delete from sys_notice where notice_id = #{noticeId}
- </delete>
-
- <delete id="deleteNoticeByIds" parameterType="Long">
- delete from sys_notice where notice_id in
- <foreach item="noticeId" collection="array" open="(" separator="," close=")">
- #{noticeId}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysPostMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysPostMapper.xml"
deleted file mode 100644
index 177f74d..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysPostMapper.xml"
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysPostMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysPost" id="SysPostResult">
- <id property="postId" column="post_id" />
- <result property="postCode" column="post_code" />
- <result property="postName" column="post_name" />
- <result property="postSort" column="post_sort" />
- <result property="status" column="status" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="remark" column="remark" />
- </resultMap>
-
- <sql id="selectPostVo">
- select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark
- from sys_post
- </sql>
-
- <select id="selectPostList" parameterType="com.ruoyi.project.system.domain.SysPost" resultMap="SysPostResult">
- <include refid="selectPostVo"/>
- <where>
- <if test="postCode != null and postCode != ''">
- AND post_code like concat('%', #{postCode}, '%')
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <if test="postName != null and postName != ''">
- AND post_name like concat('%', #{postName}, '%')
- </if>
- </where>
- </select>
-
- <select id="selectPostAll" resultMap="SysPostResult">
- <include refid="selectPostVo"/>
- </select>
-
- <select id="selectPostById" parameterType="Long" resultMap="SysPostResult">
- <include refid="selectPostVo"/>
- where post_id = #{postId}
- </select>
-
- <select id="selectPostListByUserId" parameterType="Long" resultType="Long">
- select p.post_id
- from sys_post p
- left join sys_user_post up on up.post_id = p.post_id
- left join sys_user u on u.user_id = up.user_id
- where u.user_id = #{userId}
- </select>
-
- <select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
- select p.post_id, p.post_name, p.post_code
- from sys_post p
- left join sys_user_post up on up.post_id = p.post_id
- left join sys_user u on u.user_id = up.user_id
- where u.user_name = #{userName}
- </select>
-
- <select id="checkPostNameUnique" parameterType="String" resultMap="SysPostResult">
- <include refid="selectPostVo"/>
- where post_name=#{postName} limit 1
- </select>
-
- <select id="checkPostCodeUnique" parameterType="String" resultMap="SysPostResult">
- <include refid="selectPostVo"/>
- where post_code=#{postCode} limit 1
- </select>
-
- <update id="updatePost" parameterType="com.ruoyi.project.system.domain.SysPost">
- update sys_post
- <set>
- <if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
- <if test="postName != null and postName != ''">post_name = #{postName},</if>
- <if test="postSort != null">post_sort = #{postSort},</if>
- <if test="status != null and status != ''">status = #{status},</if>
- <if test="remark != null">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where post_id = #{postId}
- </update>
-
- <insert id="insertPost" parameterType="com.ruoyi.project.system.domain.SysPost" useGeneratedKeys="true" keyProperty="postId">
- insert into sys_post(
- <if test="postId != null and postId != 0">post_id,</if>
- <if test="postCode != null and postCode != ''">post_code,</if>
- <if test="postName != null and postName != ''">post_name,</if>
- <if test="postSort != null">post_sort,</if>
- <if test="status != null and status != ''">status,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="postId != null and postId != 0">#{postId},</if>
- <if test="postCode != null and postCode != ''">#{postCode},</if>
- <if test="postName != null and postName != ''">#{postName},</if>
- <if test="postSort != null">#{postSort},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <delete id="deletePostById" parameterType="Long">
- delete from sys_post where post_id = #{postId}
- </delete>
-
- <delete id="deletePostByIds" parameterType="Long">
- delete from sys_post where post_id in
- <foreach collection="array" item="postId" open="(" separator="," close=")">
- #{postId}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysRoleDeptMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysRoleDeptMapper.xml"
deleted file mode 100644
index 90dae1f..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysRoleDeptMapper.xml"
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysRoleDeptMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysRoleDept" id="SysRoleDeptResult">
- <result property="roleId" column="role_id" />
- <result property="deptId" column="dept_id" />
- </resultMap>
-
- <delete id="deleteRoleDeptByRoleId" parameterType="Long">
- delete from sys_role_dept where role_id=#{roleId}
- </delete>
-
- <select id="selectCountRoleDeptByDeptId" resultType="Integer">
- select count(1) from sys_role_dept where dept_id=#{deptId}
- </select>
-
- <delete id="deleteRoleDept" parameterType="Long">
- delete from sys_role_dept where role_id in
- <foreach collection="array" item="roleId" open="(" separator="," close=")">
- #{roleId}
- </foreach>
- </delete>
-
- <insert id="batchRoleDept">
- insert into sys_role_dept(role_id, dept_id) values
- <foreach item="item" index="index" collection="list" separator=",">
- (#{item.roleId},#{item.deptId})
- </foreach>
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysRoleMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysRoleMapper.xml"
deleted file mode 100644
index 92ab684..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysRoleMapper.xml"
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysRoleMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysRole" id="SysRoleResult">
- <id property="roleId" column="role_id" />
- <result property="roleName" column="role_name" />
- <result property="roleKey" column="role_key" />
- <result property="roleSort" column="role_sort" />
- <result property="dataScope" column="data_scope" />
- <result property="menuCheckStrictly" column="menu_check_strictly" />
- <result property="deptCheckStrictly" column="dept_check_strictly" />
- <result property="status" column="status" />
- <result property="delFlag" column="del_flag" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="remark" column="remark" />
- </resultMap>
-
- <sql id="selectRoleVo">
- select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
- r.status, r.del_flag, r.create_time, r.remark
- from sys_role r
- left join sys_user_role ur on ur.role_id = r.role_id
- left join sys_user u on u.user_id = ur.user_id
- </sql>
-
- <select id="selectRoleList" parameterType="com.ruoyi.project.system.domain.SysRole" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- where r.del_flag = '0'
- <if test="roleId != null and roleId != 0">
- AND r.role_id = #{roleId}
- </if>
- <if test="roleName != null and roleName != ''">
- AND r.role_name like concat('%', #{roleName}, '%')
- </if>
- <if test="status != null and status != ''">
- AND r.status = #{status}
- </if>
- <if test="roleKey != null and roleKey != ''">
- AND r.role_key like concat('%', #{roleKey}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and date_format(r.create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and date_format(r.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
- </if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
- order by r.role_sort
- </select>
-
- <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- WHERE r.del_flag = '0' and ur.user_id = #{userId}
- </select>
-
- <select id="selectRoleAll" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- </select>
-
- <select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
- select r.role_id
- from sys_role r
- left join sys_user_role ur on ur.role_id = r.role_id
- left join sys_user u on u.user_id = ur.user_id
- where u.user_id = #{userId}
- </select>
-
- <select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- where r.role_id = #{roleId}
- </select>
-
- <select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- WHERE r.del_flag = '0' and u.user_name = #{userName}
- </select>
-
- <select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- where r.role_name=#{roleName} and r.del_flag = '0' limit 1
- </select>
-
- <select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
- </select>
-
- <insert id="insertRole" parameterType="com.ruoyi.project.system.domain.SysRole" useGeneratedKeys="true" keyProperty="roleId">
- insert into sys_role(
- <if test="roleId != null and roleId != 0">role_id,</if>
- <if test="roleName != null and roleName != ''">role_name,</if>
- <if test="roleKey != null and roleKey != ''">role_key,</if>
- <if test="roleSort != null">role_sort,</if>
- <if test="dataScope != null and dataScope != ''">data_scope,</if>
- <if test="menuCheckStrictly != null">menu_check_strictly,</if>
- <if test="deptCheckStrictly != null">dept_check_strictly,</if>
- <if test="status != null and status != ''">status,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="roleId != null and roleId != 0">#{roleId},</if>
- <if test="roleName != null and roleName != ''">#{roleName},</if>
- <if test="roleKey != null and roleKey != ''">#{roleKey},</if>
- <if test="roleSort != null">#{roleSort},</if>
- <if test="dataScope != null and dataScope != ''">#{dataScope},</if>
- <if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
- <if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateRole" parameterType="com.ruoyi.project.system.domain.SysRole">
- update sys_role
- <set>
- <if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
- <if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
- <if test="roleSort != null">role_sort = #{roleSort},</if>
- <if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
- <if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>
- <if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>
- <if test="status != null and status != ''">status = #{status},</if>
- <if test="remark != null">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where role_id = #{roleId}
- </update>
-
- <delete id="deleteRoleById" parameterType="Long">
- update sys_role set del_flag = '2' where role_id = #{roleId}
- </delete>
-
- <delete id="deleteRoleByIds" parameterType="Long">
- update sys_role set del_flag = '2' where role_id in
- <foreach collection="array" item="roleId" open="(" separator="," close=")">
- #{roleId}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysRoleMenuMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysRoleMenuMapper.xml"
deleted file mode 100644
index fd4f483..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysRoleMenuMapper.xml"
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysRoleMenuMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysRoleMenu" id="SysRoleMenuResult">
- <result property="roleId" column="role_id" />
- <result property="menuId" column="menu_id" />
- </resultMap>
-
- <select id="checkMenuExistRole" resultType="Integer">
- select count(1) from sys_role_menu where menu_id = #{menuId}
- </select>
-
- <delete id="deleteRoleMenuByRoleId" parameterType="Long">
- delete from sys_role_menu where role_id=#{roleId}
- </delete>
-
- <delete id="deleteRoleMenu" parameterType="Long">
- delete from sys_role_menu where role_id in
- <foreach collection="array" item="roleId" open="(" separator="," close=")">
- #{roleId}
- </foreach>
- </delete>
-
- <insert id="batchRoleMenu">
- insert into sys_role_menu(role_id, menu_id) values
- <foreach item="item" index="index" collection="list" separator=",">
- (#{item.roleId},#{item.menuId})
- </foreach>
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysUserDeptMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysUserDeptMapper.xml"
deleted file mode 100644
index bcf7b01..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysUserDeptMapper.xml"
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysUserDeptMapper">
-
- <select id="userLoginFacotryList" resultType="com.ruoyi.project.system.domain.vo.SysUserDeptVo">
- SELECT
- T1.user_id,
- T1.dept_id,
- T2.dept_name
- FROM
- sys_user_dept T1
- LEFT JOIN sys_dept T2 ON T1.dept_id = T2.dept_id
- <where>
- T1.dept_id IN (select dept_id from sys_dept where parent_id = 100)
- <if test="userDeptVo.userId != null">
- AND T1.user_id = #{userDeptVo.userId}
- </if>
- <if test="userDeptVo.userName != null and userDeptVo.userName != '' ">
- AND T1.user_id IN (
- SELECT user_id FROM sys_user WHERE user_name LIKE CONCAT('%',#{userDeptVo.userName},'%')
- )
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysUserMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysUserMapper.xml"
deleted file mode 100644
index f77e62c..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysUserMapper.xml"
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysUserMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysUser" id="SysUserResult">
- <id property="userId" column="user_id" />
- <result property="userName" column="user_name" />
- <result property="nickName" column="nick_name" />
- <result property="email" column="email" />
- <result property="phonenumber" column="phonenumber" />
- <result property="sex" column="sex" />
- <result property="avatar" column="avatar" />
- <result property="password" column="password" />
- <result property="status" column="status" />
- <result property="delFlag" column="del_flag" />
- <result property="loginIp" column="login_ip" />
- <result property="loginDate" column="login_date" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="remark" column="remark" />
- <result property="deptNames" column="dept_names" />
- <result property="tenantId" column="tenant_id" />
- <association property="dept" javaType="com.ruoyi.project.system.domain.SysDept" resultMap="deptResult" />
- <collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
- </resultMap>
-
- <resultMap id="deptResult" type="com.ruoyi.project.system.domain.SysDept">
- <id property="deptId" column="dept_id" />
- <result property="parentId" column="parent_id" />
- <result property="deptName" column="dept_name" />
- <result property="ancestors" column="ancestors" />
- <result property="orderNum" column="order_num" />
- <result property="leader" column="leader" />
- <result property="status" column="dept_status" />
- </resultMap>
-
- <resultMap id="RoleResult" type="com.ruoyi.project.system.domain.SysRole">
- <id property="roleId" column="role_id" />
- <result property="roleName" column="role_name" />
- <result property="roleKey" column="role_key" />
- <result property="roleSort" column="role_sort" />
- <result property="dataScope" column="data_scope" />
- <result property="status" column="role_status" />
- </resultMap>
-
- <sql id="selectUserVo">
- select u.user_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
- r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.tenant_id
- from sys_user u
- left join sys_user_role ur on u.user_id = ur.user_id
- left join sys_role r on r.role_id = ur.role_id
- </sql>
-
- <select id="selectUserList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
- select u.user_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,T2.dept_names from sys_user u
- left join
- ( SELECT T1.user_id,GROUP_CONCAT(T2.dept_name SEPARATOR ', ') AS dept_names
- FROM
- sys_user_dept T1
- LEFT JOIN sys_dept T2 ON T1.dept_id = T2.dept_id
- <where>
- <if test="tenantId != null and tenantId != 0">
- T1.dept_id = #{tenantId}
- </if>
- </where>
- GROUP BY T1.user_id
- ) T2 on T2.user_id = u.user_id
- where u.del_flag = '0'
- <if test="userId != null and userId != 0">
- AND u.user_id = #{userId}
- </if>
- <if test="userName != null and userName != ''">
- AND u.user_name like concat('%', #{userName}, '%')
- </if>
- <if test="status != null and status != ''">
- AND u.status = #{status}
- </if>
- <if test="phonenumber != null and phonenumber != ''">
- AND u.phonenumber like concat('%', #{phonenumber}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- AND date_format(u.create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- AND date_format(u.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
- </if>
- <if test="params.deptId != null">
- AND u.user_id IN
- (
- SELECT user_id FROM sys_user_dept WHERE dept_id = #{deptId}
- )
- </if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
- </select>
-
- <select id="selectAllocatedList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
- from sys_user u
- left join sys_user_role ur on u.user_id = ur.user_id
- left join sys_role r on r.role_id = ur.role_id
- where u.del_flag = '0' and r.role_id = #{roleId}
- <if test="userName != null and userName != ''">
- AND u.user_name like concat('%', #{userName}, '%')
- </if>
- <if test="phonenumber != null and phonenumber != ''">
- AND u.phonenumber like concat('%', #{phonenumber}, '%')
- </if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
- </select>
-
- <select id="selectUnallocatedList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
- select distinct u.user_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
- from sys_user u
- left join sys_user_role ur on u.user_id = ur.user_id
- left join sys_role r on r.role_id = ur.role_id
- where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
- and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
- <if test="userName != null and userName != ''">
- AND u.user_name like concat('%', #{userName}, '%')
- </if>
- <if test="phonenumber != null and phonenumber != ''">
- AND u.phonenumber like concat('%', #{phonenumber}, '%')
- </if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
- </select>
-
- <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
- <include refid="selectUserVo"/>
- where u.user_name = #{userName} and u.del_flag = '0'
- </select>
-
- <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
- <include refid="selectUserVo"/>
- where u.user_id = #{userId}
- </select>
-
- <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
- </select>
-
- <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
- </select>
-
- <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
- </select>
- <select id="selectUserByIds" resultType="com.ruoyi.project.system.domain.SysUser">
- <include refid="selectUserVo"/>
- where u.user_id in <foreach collection="userIds" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
- </select>
- <select id="selectList" resultType="com.ruoyi.project.system.domain.SysUser">
- SELECT user_id, nick_name FROM sys_user
- <where>
- <if test="list != null and list.size() > 0">
- user_id IN
- <foreach item="id" collection="list" open="(" separator="," close=")">
- #{id}
- </foreach>
- </if>
- <if test="list == null or list.size() == 0">
- 1=0 <!-- 绌哄垪琛ㄦ椂杩斿洖绌虹粨鏋� -->
- </if>
- </where>
- </select>
- <select id="selectUsersByIds" resultType="com.ruoyi.project.system.domain.SysUser">
- SELECT user_id, nick_name
- FROM sys_user
- WHERE user_id IN
- <foreach collection="userIds" item="id" open="(" separator="," close=")">
- #{id}
- </foreach>
- </select>
-
- <insert id="insertUser" parameterType="com.ruoyi.project.system.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
- insert into sys_user(
- <if test="userId != null and userId != 0">user_id,</if>
- <if test="deptId != null and deptId != 0">dept_id,</if>
- <if test="userName != null and userName != ''">user_name,</if>
- <if test="nickName != null and nickName != ''">nick_name,</if>
- <if test="email != null and email != ''">email,</if>
- <if test="avatar != null and avatar != ''">avatar,</if>
- <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
- <if test="sex != null and sex != ''">sex,</if>
- <if test="password != null and password != ''">password,</if>
- <if test="status != null and status != ''">status,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="tenantId != null ">tenant_id,</if>
- create_time
- )values(
- <if test="userId != null and userId != ''">#{userId},</if>
- <if test="deptId != null and deptId != ''">#{deptId},</if>
- <if test="userName != null and userName != ''">#{userName},</if>
- <if test="nickName != null and nickName != ''">#{nickName},</if>
- <if test="email != null and email != ''">#{email},</if>
- <if test="avatar != null and avatar != ''">#{avatar},</if>
- <if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
- <if test="sex != null and sex != ''">#{sex},</if>
- <if test="password != null and password != ''">#{password},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="tenantId != null ">#{tenantId},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateUser" parameterType="com.ruoyi.project.system.domain.SysUser">
- update sys_user
- <set>
- <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
- <if test="email != null ">email = #{email},</if>
- <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
- <if test="sex != null and sex != ''">sex = #{sex},</if>
- <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
- <if test="password != null and password != ''">password = #{password},</if>
- <if test="status != null and status != ''">status = #{status},</if>
- <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
- <if test="loginDate != null">login_date = #{loginDate},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- <if test="remark != null">remark = #{remark},</if>
- <if test="tenantId != null">tenant_id = #{tenantId},</if>
- update_time = sysdate()
- </set>
- where user_id = #{userId}
- </update>
-
- <update id="updateUserStatus" parameterType="com.ruoyi.project.system.domain.SysUser">
- update sys_user set status = #{status} where user_id = #{userId}
- </update>
-
- <update id="updateUserAvatar" parameterType="com.ruoyi.project.system.domain.SysUser">
- update sys_user set avatar = #{avatar} where user_name = #{userName}
- </update>
-
- <update id="resetUserPwd" parameterType="com.ruoyi.project.system.domain.SysUser">
- update sys_user set password = #{password} where user_name = #{userName}
- </update>
-
- <delete id="deleteUserById" parameterType="Long">
- update sys_user set del_flag = '2' where user_id = #{userId}
- </delete>
-
- <delete id="deleteUserByIds" parameterType="Long">
- update sys_user set del_flag = '2' where user_id in
- <foreach collection="array" item="userId" open="(" separator="," close=")">
- #{userId}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysUserPostMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysUserPostMapper.xml"
deleted file mode 100644
index 2a0ba15..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysUserPostMapper.xml"
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysUserPostMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysUserPost" id="SysUserPostResult">
- <result property="userId" column="user_id" />
- <result property="postId" column="post_id" />
- </resultMap>
-
- <delete id="deleteUserPostByUserId" parameterType="Long">
- delete from sys_user_post where user_id=#{userId}
- </delete>
-
- <select id="countUserPostById" resultType="Integer">
- select count(1) from sys_user_post where post_id=#{postId}
- </select>
-
- <delete id="deleteUserPost" parameterType="Long">
- delete from sys_user_post where user_id in
- <foreach collection="array" item="userId" open="(" separator="," close=")">
- #{userId}
- </foreach>
- </delete>
-
- <insert id="batchUserPost">
- insert into sys_user_post(user_id, post_id) values
- <foreach item="item" index="index" collection="list" separator=",">
- (#{item.userId},#{item.postId})
- </foreach>
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysUserRoleMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysUserRoleMapper.xml"
deleted file mode 100644
index 238f77b..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/system/SysUserRoleMapper.xml"
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysUserRoleMapper">
-
- <resultMap type="com.ruoyi.project.system.domain.SysUserRole" id="SysUserRoleResult">
- <result property="userId" column="user_id" />
- <result property="roleId" column="role_id" />
- </resultMap>
-
- <delete id="deleteUserRoleByUserId" parameterType="Long">
- delete from sys_user_role where user_id=#{userId}
- </delete>
-
- <select id="countUserRoleByRoleId" resultType="Integer">
- select count(1) from sys_user_role where role_id=#{roleId}
- </select>
-
- <delete id="deleteUserRole" parameterType="Long">
- delete from sys_user_role where user_id in
- <foreach collection="array" item="userId" open="(" separator="," close=")">
- #{userId}
- </foreach>
- </delete>
-
- <insert id="batchUserRole">
- insert into sys_user_role(user_id, role_id) values
- <foreach item="item" index="index" collection="list" separator=",">
- (#{item.userId},#{item.roleId})
- </foreach>
- </insert>
-
- <delete id="deleteUserRoleInfo" parameterType="com.ruoyi.project.system.domain.SysUserRole">
- delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
- </delete>
-
- <delete id="deleteUserRoleInfos">
- delete from sys_user_role where role_id=#{roleId} and user_id in
- <foreach collection="userIds" item="userId" open="(" separator="," close=")">
- #{userId}
- </foreach>
- </delete>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/tool/GenTableColumnMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/tool/GenTableColumnMapper.xml"
deleted file mode 100644
index 93bc80c..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/tool/GenTableColumnMapper.xml"
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper">
-
- <resultMap type="com.ruoyi.project.tool.gen.domain.GenTableColumn" id="GenTableColumnResult">
- <id property="columnId" column="column_id" />
- <result property="tableId" column="table_id" />
- <result property="columnName" column="column_name" />
- <result property="columnComment" column="column_comment" />
- <result property="columnType" column="column_type" />
- <result property="javaType" column="java_type" />
- <result property="javaField" column="java_field" />
- <result property="isPk" column="is_pk" />
- <result property="isIncrement" column="is_increment" />
- <result property="isRequired" column="is_required" />
- <result property="isInsert" column="is_insert" />
- <result property="isEdit" column="is_edit" />
- <result property="isList" column="is_list" />
- <result property="isQuery" column="is_query" />
- <result property="queryType" column="query_type" />
- <result property="htmlType" column="html_type" />
- <result property="dictType" column="dict_type" />
- <result property="sort" column="sort" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- </resultMap>
-
- <sql id="selectGenTableColumnVo">
- select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
- </sql>
-
- <select id="selectGenTableColumnListByTableId" parameterType="Long" resultMap="GenTableColumnResult">
- <include refid="selectGenTableColumnVo"/>
- where table_id = #{tableId}
- order by sort
- </select>
-
- <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
- select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else '0' end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
- from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
- order by ordinal_position
- </select>
-
- <insert id="insertGenTableColumn" parameterType="com.ruoyi.project.tool.gen.domain.GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
- insert into gen_table_column (
- <if test="tableId != null and tableId != ''">table_id,</if>
- <if test="columnName != null and columnName != ''">column_name,</if>
- <if test="columnComment != null and columnComment != ''">column_comment,</if>
- <if test="columnType != null and columnType != ''">column_type,</if>
- <if test="javaType != null and javaType != ''">java_type,</if>
- <if test="javaField != null and javaField != ''">java_field,</if>
- <if test="isPk != null and isPk != ''">is_pk,</if>
- <if test="isIncrement != null and isIncrement != ''">is_increment,</if>
- <if test="isRequired != null and isRequired != ''">is_required,</if>
- <if test="isInsert != null and isInsert != ''">is_insert,</if>
- <if test="isEdit != null and isEdit != ''">is_edit,</if>
- <if test="isList != null and isList != ''">is_list,</if>
- <if test="isQuery != null and isQuery != ''">is_query,</if>
- <if test="queryType != null and queryType != ''">query_type,</if>
- <if test="htmlType != null and htmlType != ''">html_type,</if>
- <if test="dictType != null and dictType != ''">dict_type,</if>
- <if test="sort != null">sort,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="tableId != null and tableId != ''">#{tableId},</if>
- <if test="columnName != null and columnName != ''">#{columnName},</if>
- <if test="columnComment != null and columnComment != ''">#{columnComment},</if>
- <if test="columnType != null and columnType != ''">#{columnType},</if>
- <if test="javaType != null and javaType != ''">#{javaType},</if>
- <if test="javaField != null and javaField != ''">#{javaField},</if>
- <if test="isPk != null and isPk != ''">#{isPk},</if>
- <if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
- <if test="isRequired != null and isRequired != ''">#{isRequired},</if>
- <if test="isInsert != null and isInsert != ''">#{isInsert},</if>
- <if test="isEdit != null and isEdit != ''">#{isEdit},</if>
- <if test="isList != null and isList != ''">#{isList},</if>
- <if test="isQuery != null and isQuery != ''">#{isQuery},</if>
- <if test="queryType != null and queryType != ''">#{queryType},</if>
- <if test="htmlType != null and htmlType != ''">#{htmlType},</if>
- <if test="dictType != null and dictType != ''">#{dictType},</if>
- <if test="sort != null">#{sort},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateGenTableColumn" parameterType="com.ruoyi.project.tool.gen.domain.GenTableColumn">
- update gen_table_column
- <set>
- <if test="columnComment != null">column_comment = #{columnComment},</if>
- <if test="javaType != null">java_type = #{javaType},</if>
- <if test="javaField != null">java_field = #{javaField},</if>
- <if test="isInsert != null">is_insert = #{isInsert},</if>
- <if test="isEdit != null">is_edit = #{isEdit},</if>
- <if test="isList != null">is_list = #{isList},</if>
- <if test="isQuery != null">is_query = #{isQuery},</if>
- <if test="isRequired != null">is_required = #{isRequired},</if>
- <if test="queryType != null">query_type = #{queryType},</if>
- <if test="htmlType != null">html_type = #{htmlType},</if>
- <if test="dictType != null">dict_type = #{dictType},</if>
- <if test="sort != null">sort = #{sort},</if>
- <if test="updateBy != null">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where column_id = #{columnId}
- </update>
-
- <delete id="deleteGenTableColumnByIds" parameterType="Long">
- delete from gen_table_column where table_id in
- <foreach collection="array" item="tableId" open="(" separator="," close=")">
- #{tableId}
- </foreach>
- </delete>
-
- <delete id="deleteGenTableColumns">
- delete from gen_table_column where column_id in
- <foreach collection="list" item="item" open="(" separator="," close=")">
- #{item.columnId}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/tool/GenTableMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/tool/GenTableMapper.xml"
deleted file mode 100644
index 9fe471c..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/tool/GenTableMapper.xml"
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.tool.gen.mapper.GenTableMapper">
-
- <resultMap type="com.ruoyi.project.tool.gen.domain.GenTable" id="GenTableResult">
- <id property="tableId" column="table_id" />
- <result property="tableName" column="table_name" />
- <result property="tableComment" column="table_comment" />
- <result property="subTableName" column="sub_table_name" />
- <result property="subTableFkName" column="sub_table_fk_name" />
- <result property="className" column="class_name" />
- <result property="tplCategory" column="tpl_category" />
- <result property="tplWebType" column="tpl_web_type" />
- <result property="packageName" column="package_name" />
- <result property="moduleName" column="module_name" />
- <result property="businessName" column="business_name" />
- <result property="functionName" column="function_name" />
- <result property="functionAuthor" column="function_author" />
- <result property="genType" column="gen_type" />
- <result property="genPath" column="gen_path" />
- <result property="options" column="options" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="remark" column="remark" />
- <collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult" />
- </resultMap>
-
- <resultMap type="com.ruoyi.project.tool.gen.domain.GenTableColumn" id="GenTableColumnResult">
- <id property="columnId" column="column_id" />
- <result property="tableId" column="table_id" />
- <result property="columnName" column="column_name" />
- <result property="columnComment" column="column_comment" />
- <result property="columnType" column="column_type" />
- <result property="javaType" column="java_type" />
- <result property="javaField" column="java_field" />
- <result property="isPk" column="is_pk" />
- <result property="isIncrement" column="is_increment" />
- <result property="isRequired" column="is_required" />
- <result property="isInsert" column="is_insert" />
- <result property="isEdit" column="is_edit" />
- <result property="isList" column="is_list" />
- <result property="isQuery" column="is_query" />
- <result property="queryType" column="query_type" />
- <result property="htmlType" column="html_type" />
- <result property="dictType" column="dict_type" />
- <result property="sort" column="sort" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- </resultMap>
-
- <sql id="selectGenTableVo">
- select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
- </sql>
-
- <select id="selectGenTableList" parameterType="com.ruoyi.project.tool.gen.domain.GenTable" resultMap="GenTableResult">
- <include refid="selectGenTableVo"/>
- <where>
- <if test="tableName != null and tableName != ''">
- AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
- </if>
- <if test="tableComment != null and tableComment != ''">
- AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- AND date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- AND date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
- </if>
- </where>
- </select>
-
- <select id="selectDbTableList" parameterType="com.ruoyi.project.tool.gen.domain.GenTable" resultMap="GenTableResult">
- select table_name, table_comment, create_time, update_time from information_schema.tables
- where table_schema = (select database())
- AND table_name NOT LIKE 'qrtz\_%' AND table_name NOT LIKE 'gen\_%'
- AND table_name NOT IN (select table_name from gen_table)
- <if test="tableName != null and tableName != ''">
- AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
- </if>
- <if test="tableComment != null and tableComment != ''">
- AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- AND date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- AND date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
- </if>
- order by create_time desc
- </select>
-
- <select id="selectDbTableListByNames" resultMap="GenTableResult">
- select table_name, table_comment, create_time, update_time from information_schema.tables
- where table_name NOT LIKE 'qrtz\_%' and table_name NOT LIKE 'gen\_%' and table_schema = (select database())
- and table_name in
- <foreach collection="array" item="name" open="(" separator="," close=")">
- #{name}
- </foreach>
- </select>
-
- <select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
- select table_name, table_comment, create_time, update_time from information_schema.tables
- where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
- and table_name = #{tableName}
- </select>
-
- <select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
- SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
- c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
- FROM gen_table t
- LEFT JOIN gen_table_column c ON t.table_id = c.table_id
- where t.table_id = #{tableId} order by c.sort
- </select>
-
- <select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
- SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
- c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
- FROM gen_table t
- LEFT JOIN gen_table_column c ON t.table_id = c.table_id
- where t.table_name = #{tableName} order by c.sort
- </select>
-
- <select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
- SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
- c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
- FROM gen_table t
- LEFT JOIN gen_table_column c ON t.table_id = c.table_id
- order by c.sort
- </select>
-
- <insert id="insertGenTable" parameterType="com.ruoyi.project.tool.gen.domain.GenTable" useGeneratedKeys="true" keyProperty="tableId">
- insert into gen_table (
- <if test="tableName != null">table_name,</if>
- <if test="tableComment != null and tableComment != ''">table_comment,</if>
- <if test="className != null and className != ''">class_name,</if>
- <if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
- <if test="tplWebType != null and tplWebType != ''">tpl_web_type,</if>
- <if test="packageName != null and packageName != ''">package_name,</if>
- <if test="moduleName != null and moduleName != ''">module_name,</if>
- <if test="businessName != null and businessName != ''">business_name,</if>
- <if test="functionName != null and functionName != ''">function_name,</if>
- <if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
- <if test="genType != null and genType != ''">gen_type,</if>
- <if test="genPath != null and genPath != ''">gen_path,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="tableName != null">#{tableName},</if>
- <if test="tableComment != null and tableComment != ''">#{tableComment},</if>
- <if test="className != null and className != ''">#{className},</if>
- <if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
- <if test="tplWebType != null and tplWebType != ''">#{tplWebType},</if>
- <if test="packageName != null and packageName != ''">#{packageName},</if>
- <if test="moduleName != null and moduleName != ''">#{moduleName},</if>
- <if test="businessName != null and businessName != ''">#{businessName},</if>
- <if test="functionName != null and functionName != ''">#{functionName},</if>
- <if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
- <if test="genType != null and genType != ''">#{genType},</if>
- <if test="genPath != null and genPath != ''">#{genPath},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <update id="createTable">
- ${sql}
- </update>
-
- <update id="updateGenTable" parameterType="com.ruoyi.project.tool.gen.domain.GenTable">
- update gen_table
- <set>
- <if test="tableName != null">table_name = #{tableName},</if>
- <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
- <if test="subTableName != null">sub_table_name = #{subTableName},</if>
- <if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</if>
- <if test="className != null and className != ''">class_name = #{className},</if>
- <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
- <if test="genType != null and genType != ''">gen_type = #{genType},</if>
- <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
- <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>
- <if test="tplWebType != null and tplWebType != ''">tpl_web_type = #{tplWebType},</if>
- <if test="packageName != null and packageName != ''">package_name = #{packageName},</if>
- <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
- <if test="businessName != null and businessName != ''">business_name = #{businessName},</if>
- <if test="functionName != null and functionName != ''">function_name = #{functionName},</if>
- <if test="options != null and options != ''">options = #{options},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- <if test="remark != null">remark = #{remark},</if>
- update_time = sysdate()
- </set>
- where table_id = #{tableId}
- </update>
-
- <delete id="deleteGenTableByIds" parameterType="Long">
- delete from gen_table where table_id in
- <foreach collection="array" item="tableId" open="(" separator="," close=")">
- #{tableId}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/DocumentClassificationMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/DocumentClassificationMapper.xml"
deleted file mode 100644
index e758e4f..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/DocumentClassificationMapper.xml"
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouse.mapper.DocumentClassificationMapper">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.DocumentClassification">
- <id property="id" column="id" />
- <result property="category" column="category" />
- <result property="parentId" column="parent_id" />
- <result property="createTime" column="create_time" />
- <result property="createUser" column="create_user" />
- <result property="updateTime" column="update_time" />
- <result property="updateUser" column="update_user" />
- <result property="tenantId" column="tenant_id" />
- </resultMap>
-
- <sql id="Base_Column_List">
- id,category,parent_id,
- create_time,create_user,update_time,
- update_user,tenant_id
- </sql>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml"
deleted file mode 100644
index 18b2082..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml"
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper">
-
-<!-- <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.DocumentationBorrowManagement">-->
-<!-- <id property="id" column="id"/>-->
-<!-- <result property="documentationId" column="documentation_id" />-->
-<!-- <result property="borrowerId" column="borrower_id" />-->
-<!-- <result property="borrowPurpose" column="borrow_purpose" />-->
-<!-- <result property="borrowDate" column="borrow_date"/>-->
-<!-- <result property="dueReturnDate" column="due_return_date" />-->
-<!-- <result property="returnDate" column="return_date"/>-->
-<!-- <result property="borrowStatus" column="borrow_status" />-->
-<!-- <result property="remark" column="remark"/>-->
-<!-- <result property="createTime" column="create_time"/>-->
-<!-- <result property="createUser" column="create_user"/>-->
-<!-- <result property="updateTime" column="update_time"/>-->
-<!-- <result property="updateUser" column="update_user"/>-->
-<!-- <result property="tenantId" column="tenant_id"/>-->
-<!-- </resultMap>-->
-
-<!-- <sql id="Base_Column_List">-->
-<!-- id,documentation_id,borrower_id,-->
-<!-- borrow_purpose,borrow_date,due_return_date,-->
-<!-- return_date,borrow_status,remark,-->
-<!-- create_time,create_user,update_time,-->
-<!-- update_user,tenant_id-->
-<!-- </sql>-->
- <select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
- select dbm.*,doc.doc_name
- from documentation_borrow_management dbm
- LEFT JOIN documentation doc on doc.id = dbm.documentation_id
- where 1=1
- <if test="documentationBorrowManagement.borrowStatus != null">
- and borrow_status = #{documentationBorrowManagement.borrowStatus}
- </if>
- <if test="documentationBorrowManagement.documentationId != null">
- and documentation_id = #{documentationBorrowManagement.documentationId}
- </if>
- <if test="documentationBorrowManagement.borrower != null">
- and borrower like concat('%',#{documentationBorrowManagement.borrower},'%')
- </if>
- <if test="documentationBorrowManagement.returner != null">
- and returner like concat('%',#{documentationBorrowManagement.returner},'%')
- </if>
- <if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''">
- and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="documentationBorrowManagement.entryDateEnd != null and documentationBorrowManagement.entryDateEnd != ''">
- and borrow_date <= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
- <select id="export" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
- select dbm.*,doc.doc_name
- from documentation_borrow_management dbm
- LEFT JOIN documentation doc on doc.id = dbm.documentation_id
- where 1=1
- <if test="documentationBorrowManagement.borrowStatus != null">
- and borrow_status = #{documentationBorrowManagement.borrowStatus}
- </if>
- <if test="documentationBorrowManagement.documentationId != null">
- and documentation_id = #{documentationBorrowManagement.documentationId}
- </if>
- <if test="documentationBorrowManagement.borrower != null">
- and borrower like concat('%',#{documentationBorrowManagement.borrower},'%')
- </if>
- <if test="documentationBorrowManagement.returner != null">
- and returner like concat('%',#{documentationBorrowManagement.returner},'%')
- </if>
- <if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''">
- and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="documentationBorrowManagement.entryDateEnd != null and documentationBorrowManagement.entryDateEnd != ''">
- and borrow_date <= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
- <select id="list" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
- select dbm.*,doc.doc_name
- from documentation_borrow_management dbm
- LEFT JOIN documentation doc on doc.id = dbm.documentation_id
- <if test="ew != null">
- ${ew.customSqlSegment}
- </if>
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/DocumentationFileMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/DocumentationFileMapper.xml"
deleted file mode 100644
index a8b74f9..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/DocumentationFileMapper.xml"
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.warehouse.mapper.DocumentationFileMapper">
- <select id="documentationFileListPage" resultType="com.ruoyi.warehouse.pojo.DocumentationFile">
- SELECT
- *
- FROM documentation_file
- where
- 1=1
- <if test="documentationFile.name != null and documentationFile.name != '' ">
- AND name = #{documentationFile.name}
- </if>
- <if test="documentationFile.documentationId != null">
- AND documentation_id = #{documentationFile.documentationId}
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/DocumentationMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/DocumentationMapper.xml"
deleted file mode 100644
index 91f17a9..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/DocumentationMapper.xml"
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouse.mapper.DocumentationMapper">
-
- <select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
- SELECT
- doc.*,
- dc.category,
- CONCAT(
- w.warehouse_name, '-',
- wgs.name, '-',
- wgsr.row, '灞�-',
- wgsr.col, '鍒�'
- ) AS location_info -- 鍚堝苟鍚庣殑瀛楁鍚�
- FROM documentation doc
- LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
- LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- where 1=1
- <if test="documentation.documentClassificationId != null">
- and doc.document_classification_id = #{documentation.documentClassificationId}
- </if>
- <if test="documentation.docName != null">
- and doc.doc_name = #{documentation.docName}
- </if>
- <if test="documentation.docNumber != null">
- and doc.doc_number = #{documentation.docNumber}
- </if>
- <if test="documentation.id != null">
- and doc.id = #{documentation.id}
- </if>
- </select>
- <select id="listByDocumentClassificationId" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
- SELECT
- doc.*,
- dc.category,
- CONCAT(
- w.warehouse_name, '-',
- wgs.name, '-',
- wgsr.row, '灞�-',
- wgsr.col, '鍒�'
- ) AS location_info -- 鍚堝苟鍚庣殑瀛楁鍚�
- FROM documentation doc
- LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
- LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- where doc.document_classification_id = #{documentClassificationId}
- </select>
- <select id="list" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
- SELECT
- doc.*,
- dc.category,
- CONCAT(
- w.warehouse_name, '-',
- wgs.name, '-',
- wgsr.row, '灞�-',
- wgsr.col, '鍒�'
- ) AS location_info -- 鍚堝苟鍚庣殑瀛楁鍚�
- FROM documentation doc
- LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
- LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- </select>
- <select id="listBywarehouseGoodsShelvesRowcolId" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
- SELECT
- doc.*,
- dc.category,
- CONCAT(
- w.warehouse_name, '-',
- wgs.name, '-',
- wgsr.row, '灞�-',
- wgsr.col, '鍒�'
- ) AS location_info -- 鍚堝苟鍚庣殑瀛楁鍚�
- FROM documentation doc
- LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
- LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- where doc.warehouse_goods_shelves_rowcol_id = #{warehouseGoodsShelvesRowcolId}
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml"
deleted file mode 100644
index 06202f8..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/DocumentationReturnManagementMapper.xml"
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouse.mapper.DocumentationReturnManagementMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationReturnManagementDto">
- select dbm.*,doc.doc_name
- from documentation_return_management dbm
- LEFT JOIN documentation doc on doc.id = dbm.documentation_id
- where 1=1
- <if test="documentationReturnManagement.borrowStatus != null">
- and borrow_status = #{documentationReturnManagement.borrowStatus}
- </if>
- <if test="documentationReturnManagement.documentationId != null">
- and documentation_id = #{documentationReturnManagement.documentationId}
- </if>
- <if test="documentationReturnManagement.borrower != null">
- and borrower like concat('%',#{documentationReturnManagement.borrower},'%')
- </if>
- <if test="documentationReturnManagement.returner != null">
- and returner like concat('%',#{documentationReturnManagement.returner},'%')
- </if>
- <if test="documentationReturnManagement.entryDateStart != null and documentationReturnManagement.entryDateStart != ''">
- and return_date >= DATE_FORMAT(#{documentationReturnManagement.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="documentationReturnManagement.entryDateEnd != null and documentationReturnManagement.entryDateEnd != ''">
- and return_date <= DATE_FORMAT(#{documentationReturnManagement.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
-
- <select id="exportrevent" resultType="com.ruoyi.warehouse.dto.ReturnExportDto">
- select dbm.*,doc.doc_name
- from documentation_return_management dbm
- LEFT JOIN documentation doc on doc.id = dbm.documentation_id
- where dbm.returner IS NOT NULL
- <if test="documentationReturnManagement.borrowStatus != null">
- and borrow_status = #{documentationReturnManagement.borrowStatus}
- </if>
- <if test="documentationReturnManagement.documentationId != null">
- and documentation_id = #{documentationReturnManagement.documentationId}
- </if>
- <if test="documentationReturnManagement.borrower != null">
- and borrower like concat('%',#{documentationReturnManagement.borrower},'%')
- </if>
- <if test="documentationReturnManagement.returner != null">
- and returner like concat('%',#{documentationReturnManagement.returner},'%')
- </if>
- <if test="documentationReturnManagement.entryDateStart != null and documentationReturnManagement.entryDateStart != ''">
- and return_date >= DATE_FORMAT(#{documentationReturnManagement.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="documentationReturnManagement.entryDateEnd != null and documentationReturnManagement.entryDateEnd != ''">
- and return_date <= DATE_FORMAT(#{documentationReturnManagement.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml"
deleted file mode 100644
index 8493e2d..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml"
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesMapper">
-
-
- <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto">
- SELECT
- doc.doc_name,
- doc.doc_number,
- wgs.*,
- w.warehouse_name,
- dc.category
- FROM warehouse_goods_shelves_rowcol wgsr
- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- LEFT JOIN documentation doc ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id
- LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
- <where>
- 1=1
- <if test="warehouseGoodsShelves.goodsShelvesName != null and warehouseGoodsShelves.goodsShelvesName != ''">
- and wgs.goods_shelves_name like concat('%',#{warehouseGoodsShelves.goodsShelvesName},'%')
- </if>
- <if test="warehouseGoodsShelves.warehouseId != null">
- and wgs.warehouse_id = #{warehouseGoodsShelves.warehouseId}
- </if>
- <if test="warehouseGoodsShelves.id != null">
- and wgs.id = #{warehouseGoodsShelves.id}
- </if>
- </where>
- </select>
- <select id="listAll" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto">
- select wgs.*,w.warehouse_name from warehouse_goods_shelves wgs
- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- <where>
- 1=1
- <if test="warehouseGoodsShelves.goodsShelvesName != null and warehouseGoodsShelves.goodsShelvesName != ''">
- and goods_shelves_name like concat('%',#{warehouseGoodsShelves.goodsShelvesName},'%')
- </if>
- <if test="warehouseGoodsShelves.warehouseId != null">
- and warehouse_id = #{warehouseGoodsShelves.warehouseId}
- </if>
- <if test="warehouseGoodsShelves.id != null">
- and id = #{warehouseGoodsShelves.id}
- </if>
- </where>
- </select>
-
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml"
deleted file mode 100644
index 87dfa32..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml"
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesRowcolMapper">
- <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesRowcolDto">
--- SELECT
--- wgsr.*,
--- w.warehouse_name,
--- wgs.name,
--- dc.category
--- FROM warehouse_goods_shelves_rowcol wgsr
--- LEFT JOIN documentation doc ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id
--- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
--- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
--- LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
- SELECT
- wgsr.*,
- w.warehouse_name,
- wgs.name
- FROM warehouse_goods_shelves_rowcol wgsr
- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- <where>
- 1=1
- <if test="warehouseGoodsShelvesRowcol.row != null">
- and wgsr.row = #{warehouseGoodsShelvesRowcol.row}
- </if>
- <if test="warehouseGoodsShelvesRowcol.col != null">
- and wgsr.col = #{warehouseGoodsShelvesRowcol.col}
- </if>
- <if test="warehouseGoodsShelvesRowcol.warehouseGoodsShelvesId != null">
- and wgsr.warehouse_goods_shelves_id = #{warehouseGoodsShelvesRowcol.warehouseGoodsShelvesId}
- </if>
- <if test="warehouseGoodsShelvesRowcol.id != null">
- and wgsr.id = #{warehouseGoodsShelvesRowcol.id}
- </if>
- </where>
- </select>
-
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/WarehouseMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/WarehouseMapper.xml"
deleted file mode 100644
index dd45695..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/warehouse/WarehouseMapper.xml"
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseMapper">
-
-
- <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseDto">
- SELECT
- w.*,
- wgs.name,
- doc.doc_name,
- doc.doc_number,
- dc.category
- FROM warehouse_goods_shelves_rowcol wgsr
- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
- LEFT JOIN documentation doc ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id
- LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
- <where>
- 1=1
- <if test="warehouse.warehouseName != null">
- and w.warehouse_name like concat('%',#{warehouse.warehouseName},'%')
- </if>
- <if test="warehouse.id != null">
- and w.id = #{warehouse.id}
- </if>
- </where>
- </select>
- <select id="listAll" resultType="com.ruoyi.warehouse.pojo.Warehouse">
- select * from warehouse
- <where>
- 1=1
- <if test="warehouse.warehouseName != null">
- and warehouse_name like concat('%',#{warehouse.warehouseName},'%')
- </if>
- <if test="warehouse.id != null">
- and w.id = #{warehouse.id}
- </if>
- </where>
- </select>
-</mapper>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mapper/waterrecord/WaterRecordMapper.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mapper/waterrecord/WaterRecordMapper.xml"
deleted file mode 100644
index e0a9135..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mapper/waterrecord/WaterRecordMapper.xml"
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.waterrecord.mapper.WaterRecordMapper">
-
- <select id="listPage" resultType="com.ruoyi.waterrecord.pojo.WaterRecord">
- select
- t1.*,
- t2.device_name
- from water_record t1
- left join device_ledger t2 on t1.device_model = t2.device_model
- <where>
- <if test="req.deviceName != null and req.deviceName != ''">
- and t2.device_name like concat('%',#{req.deviceName},'%')
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/mybatis/mybatis-config.xml" "b/$\173project.build.directory\175/classes/src/main/resources/mybatis/mybatis-config.xml"
deleted file mode 100644
index 3f4167d..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/mybatis/mybatis-config.xml"
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration
-PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-config.dtd">
-<configuration>
- <!-- 鍏ㄥ眬鍙傛暟 -->
- <settings>
- <!-- 浣垮叏灞�鐨勬槧灏勫櫒鍚敤鎴栫鐢ㄧ紦瀛� -->
- <setting name="cacheEnabled" value="true" />
- <!-- 鍏佽JDBC 鏀寔鑷姩鐢熸垚涓婚敭 -->
- <setting name="useGeneratedKeys" value="true" />
- <!-- 閰嶇疆榛樿鐨勬墽琛屽櫒.SIMPLE灏辨槸鏅�氭墽琛屽櫒;REUSE鎵ц鍣ㄤ細閲嶇敤棰勫鐞嗚鍙�(prepared statements);BATCH鎵ц鍣ㄥ皢閲嶇敤璇彞骞舵墽琛屾壒閲忔洿鏂� -->
- <setting name="defaultExecutorType" value="SIMPLE" />
- <!-- 鎸囧畾 MyBatis 鎵�鐢ㄦ棩蹇楃殑鍏蜂綋瀹炵幇 -->
- <setting name="logImpl" value="SLF4J" />
-<!-- <setting name="logImpl" value="org.apache.ibatis.logging.stdout.StdOutImpl" />-->
- <!-- 浣跨敤椹煎嘲鍛藉悕娉曡浆鎹㈠瓧娈� -->
- <!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
- </settings>
-
-</configuration>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/static/report-template.docx" "b/$\173project.build.directory\175/classes/src/main/resources/static/report-template.docx"
deleted file mode 100644
index 6824a62..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/static/report-template.docx"
+++ /dev/null
Binary files differ
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/vm/java/controller.java.vm" "b/$\173project.build.directory\175/classes/src/main/resources/vm/java/controller.java.vm"
deleted file mode 100644
index f72e991..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/vm/java/controller.java.vm"
+++ /dev/null
@@ -1,115 +0,0 @@
-package ${packageName}.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import ${packageName}.domain.${ClassName};
-import ${packageName}.service.I${ClassName}Service;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-#if($table.crud || $table.sub)
-import com.ruoyi.framework.web.page.TableDataInfo;
-#elseif($table.tree)
-#end
-
-/**
- * ${functionName}Controller
- *
- * @author ${author}
- * @date ${datetime}
- */
-@RestController
-@RequestMapping("/${moduleName}/${businessName}")
-public class ${ClassName}Controller extends BaseController
-{
- @Autowired
- private I${ClassName}Service ${className}Service;
-
- /**
- * 鏌ヨ${functionName}鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
- @GetMapping("/list")
-#if($table.crud || $table.sub)
- public TableDataInfo list(${ClassName} ${className})
- {
- startPage();
- List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
- return getDataTable(list);
- }
-#elseif($table.tree)
- public AjaxResult list(${ClassName} ${className})
- {
- List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
- return success(list);
- }
-#end
-
- /**
- * 瀵煎嚭${functionName}鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
- @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, ${ClassName} ${className})
- {
- List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
- ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
- util.exportExcel(response, list, "${functionName}鏁版嵁");
- }
-
- /**
- * 鑾峰彇${functionName}璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
- @GetMapping(value = "/{${pkColumn.javaField}}")
- public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
- {
- return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
- }
-
- /**
- * 鏂板${functionName}
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
- @Log(title = "${functionName}", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody ${ClassName} ${className})
- {
- return toAjax(${className}Service.insert${ClassName}(${className}));
- }
-
- /**
- * 淇敼${functionName}
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
- @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody ${ClassName} ${className})
- {
- return toAjax(${className}Service.update${ClassName}(${className}));
- }
-
- /**
- * 鍒犻櫎${functionName}
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
- @Log(title = "${functionName}", businessType = BusinessType.DELETE)
- @DeleteMapping("/{${pkColumn.javaField}s}")
- public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
- {
- return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
- }
-}
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/vm/java/domain.java.vm" "b/$\173project.build.directory\175/classes/src/main/resources/vm/java/domain.java.vm"
deleted file mode 100644
index 1339c3a..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/vm/java/domain.java.vm"
+++ /dev/null
@@ -1,112 +0,0 @@
-package ${packageName}.domain;
-
-#foreach ($import in $importList)
-import ${import};
-#end
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.rchuing.sis.common.annotation.Excel;
-#if($table.crud || $table.sub)
-import com.rchuing.sis.common.core.domain.BaseEntity;
-#elseif($table.tree)
-import com.fenghuang.common.core.domain.TreeEntity;
-#end
-
-/**
- * ${functionName}瀵硅薄 ${tableName}
- *
- * @author ${author}
- * @date ${datetime}
- */
-#if($table.crud || $table.sub)
- #set($Entity="BaseEntity")
-#elseif($table.tree)
- #set($Entity="TreeEntity")
-#end
-@TableName(resultMap = "${packageName}.mapper.${ClassName}Mapper.${ClassName}Result")
-public class ${ClassName} extends ${Entity}
- {
-private static final long serialVersionUID = 1L;
-
-#foreach ($column in $columns)
- #if(!$table.isSuperColumn($column.javaField))
- /** $column.columnComment */
- #if($column.list)
- #set($parentheseIndex=$column.columnComment.indexOf("锛�"))
- #if($parentheseIndex != -1)
- #set($comment=$column.columnComment.substring(0, $parentheseIndex))
- #else
- #set($comment=$column.columnComment)
- #end
- #if($parentheseIndex != -1)
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- #elseif($column.javaType == 'Date')
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
- #else
- @Excel(name = "${comment}")
- #end
- #end
- #if($column.isPk == 1)
- @TableId(value = "$column.columnName",type = IdType.AUTO)
- #end
- private $column.javaType $column.javaField;
-
- #end
-#end
-#if($table.sub)
-/** $table.subTable.functionName淇℃伅 */
-private List<${subClassName}> ${subclassName}List;
-
-#end
-#foreach ($column in $columns)
- #if(!$table.isSuperColumn($column.javaField))
- #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
- #set($AttrName=$column.javaField)
- #else
- #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- #end
- public void set${AttrName}($column.javaType $column.javaField)
- {
- this.$column.javaField = $column.javaField;
- }
-
- public $column.javaType get${AttrName}()
- {
- return $column.javaField;
- }
- #end
-#end
-
-#if($table.sub)
-public List<${subClassName}> get${subClassName}List()
- {
- return ${subclassName}List;
- }
-
-public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
- {
- this.${subclassName}List = ${subclassName}List;
- }
-
-#end
-@Override
-public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- #foreach ($column in $columns)
- #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
- #set($AttrName=$column.javaField)
- #else
- #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- #end
- .append("${column.javaField}", get${AttrName}())
- #end
- #if($table.sub)
- .append("${subclassName}List", get${subClassName}List())
- #end
- .toString();
- }
- }
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/vm/java/mapper.java.vm" "b/$\173project.build.directory\175/classes/src/main/resources/vm/java/mapper.java.vm"
deleted file mode 100644
index 1435b4e..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/vm/java/mapper.java.vm"
+++ /dev/null
@@ -1,91 +0,0 @@
-package ${packageName}.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import ${packageName}.domain.${ClassName};
-#if($table.sub)
-import ${packageName}.domain.${subClassName};
-#end
-
-/**
- * ${functionName}Mapper鎺ュ彛
- *
- * @author ${author}
- * @date ${datetime}
- */
-public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> {
- /**
- * 鏌ヨ${functionName}
- *
- * @param ${pkColumn.javaField} ${functionName}涓婚敭
- * @return ${functionName}
- */
- public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
-
- /**
- * 鏌ヨ${functionName}鍒楄〃
- *
- * @param ${className} ${functionName}
- * @return ${functionName}闆嗗悎
- */
- public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
-
- /**
- * 鏂板${functionName}
- *
- * @param ${className} ${functionName}
- * @return 缁撴灉
- */
- public int insert${ClassName}(${ClassName} ${className});
-
- /**
- * 淇敼${functionName}
- *
- * @param ${className} ${functionName}
- * @return 缁撴灉
- */
- public int update${ClassName}(${ClassName} ${className});
-
- /**
- * 鍒犻櫎${functionName}
- *
- * @param ${pkColumn.javaField} ${functionName}涓婚敭
- * @return 缁撴灉
- */
- public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
-
- /**
- * 鎵归噺鍒犻櫎${functionName}
- *
- * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
- #if($table.sub)
-
- /**
- * 鎵归噺鍒犻櫎${subTable.functionName}
- *
- * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
-
- /**
- * 鎵归噺鏂板${subTable.functionName}
- *
- * @param ${subclassName}List ${subTable.functionName}鍒楄〃
- * @return 缁撴灉
- */
- public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
-
-
- /**
- * 閫氳繃${functionName}涓婚敭鍒犻櫎${subTable.functionName}淇℃伅
- *
- * @param ${pkColumn.javaField} ${functionName}ID
- * @return 缁撴灉
- */
- public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
- #end
-}
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/vm/java/service.java.vm" "b/$\173project.build.directory\175/classes/src/main/resources/vm/java/service.java.vm"
deleted file mode 100644
index 149a552..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/vm/java/service.java.vm"
+++ /dev/null
@@ -1,61 +0,0 @@
-package ${packageName}.service;
-
-import java.util.List;
-import ${packageName}.domain.${ClassName};
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * ${functionName}Service鎺ュ彛
- *
- * @author ${author}
- * @date ${datetime}
- */
-public interface I${ClassName}Service extends IService<${ClassName}> {
- /**
- * 鏌ヨ${functionName}
- *
- * @param ${pkColumn.javaField} ${functionName}涓婚敭
- * @return ${functionName}
- */
- public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
-
- /**
- * 鏌ヨ${functionName}鍒楄〃
- *
- * @param ${className} ${functionName}
- * @return ${functionName}闆嗗悎
- */
- public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
-
- /**
- * 鏂板${functionName}
- *
- * @param ${className} ${functionName}
- * @return 缁撴灉
- */
- public int insert${ClassName}(${ClassName} ${className});
-
- /**
- * 淇敼${functionName}
- *
- * @param ${className} ${functionName}
- * @return 缁撴灉
- */
- public int update${ClassName}(${ClassName} ${className});
-
- /**
- * 鎵归噺鍒犻櫎${functionName}
- *
- * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑${functionName}涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
-
- /**
- * 鍒犻櫎${functionName}淇℃伅
- *
- * @param ${pkColumn.javaField} ${functionName}涓婚敭
- * @return 缁撴灉
- */
- public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
-}
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/vm/java/serviceImpl.java.vm" "b/$\173project.build.directory\175/classes/src/main/resources/vm/java/serviceImpl.java.vm"
deleted file mode 100644
index e16007f..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/vm/java/serviceImpl.java.vm"
+++ /dev/null
@@ -1,162 +0,0 @@
-package ${packageName}.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.util.List;
- #foreach ($column in $columns)
- #if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
- import com.rchuing.common.utils.DateUtils;
- #break
- #end
- #end
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
- #if($table.sub)
- import java.util.ArrayList;
- import com.rchuing.common.utils.StringUtils;
- import org.springframework.transaction.annotation.Transactional;
- import ${packageName}.domain.${subClassName};
- #end
-import ${packageName}.mapper.${ClassName}Mapper;
-import ${packageName}.domain.${ClassName};
-import ${packageName}.service.I${ClassName}Service;
-
-/**
- * ${functionName}Service涓氬姟灞傚鐞�
- *
- * @author ${author}
- * @date ${datetime}
- */
-@Service
-public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service {
- @Autowired
- private ${ClassName}Mapper ${className}Mapper;
-
- /**
- * 鏌ヨ${functionName}
- *
- * @param ${pkColumn.javaField} ${functionName}涓婚敭
- * @return ${functionName}
- */
- @Override
- public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
- return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
- }
-
- /**
- * 鏌ヨ${functionName}鍒楄〃
- *
- * @param ${className} ${functionName}
- * @return ${functionName}
- */
- @Override
- public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) {
- return ${className}Mapper.select${ClassName}List(${className});
- }
-
- /**
- * 鏂板${functionName}
- *
- * @param ${className} ${functionName}
- * @return 缁撴灉
- */
- #if($table.sub)
- @Transactional
- #end
- @Override
- public int insert${ClassName}(${ClassName} ${className}) {
- #foreach ($column in $columns)
- #if($column.javaField == 'createTime')
- ${className}.setCreateTime(DateUtils.getNowDate());
- #end
- #end
- #if($table.sub)
- int rows = ${className}Mapper.insert${ClassName}(${className});
- insert${subClassName}(${className});
- return rows;
- #else
- return ${className}Mapper.insert${ClassName}(${className});
- #end
- }
-
- /**
- * 淇敼${functionName}
- *
- * @param ${className} ${functionName}
- * @return 缁撴灉
- */
- #if($table.sub)
- @Transactional
- #end
- @Override
- public int update${ClassName}(${ClassName} ${className}) {
- #foreach ($column in $columns)
- #if($column.javaField == 'updateTime')
- ${className}.setUpdateTime(DateUtils.getNowDate());
- #end
- #end
- #if($table.sub)
- ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
- insert${subClassName}(${className});
- #end
- return ${className}Mapper.update${ClassName}(${className});
- }
-
- /**
- * 鎵归噺鍒犻櫎${functionName}
- *
- * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑${functionName}涓婚敭
- * @return 缁撴灉
- */
- #if($table.sub)
- @Transactional
- #end
- @Override
- public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) {
- #if($table.sub)
- ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
- #end
- return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
- }
-
- /**
- * 鍒犻櫎${functionName}淇℃伅
- *
- * @param ${pkColumn.javaField} ${functionName}涓婚敭
- * @return 缁撴灉
- */
- #if($table.sub)
- @Transactional
- #end
- @Override
- public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
- #if($table.sub)
- ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
- #end
- return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
- }
- #if($table.sub)
-
- /**
- * 鏂板${subTable.functionName}淇℃伅
- *
- * @param ${className} ${functionName}瀵硅薄
- */
- public void insert${subClassName}(${ClassName} ${className}) {
- List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
- ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
- if (StringUtils.isNotNull(${subclassName}List))
- {
- List<${subClassName}> list = new ArrayList<${subClassName}>();
- for (${subClassName} ${subclassName} : ${subclassName}List)
- {
- ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField});
- list.add(${subclassName});
- }
- if (list.size() > 0)
- {
- ${className}Mapper.batch${subClassName}(list);
- }
- }
- }
- #end
-}
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/vm/java/sub-domain.java.vm" "b/$\173project.build.directory\175/classes/src/main/resources/vm/java/sub-domain.java.vm"
deleted file mode 100644
index bd6247d..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/vm/java/sub-domain.java.vm"
+++ /dev/null
@@ -1,73 +0,0 @@
-package ${packageName}.domain;
-
- #foreach ($import in $subImportList)
- import ${import};
- #end
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.rchuing.common.annotation.Excel;
-import com.rchuing.common.core.domain.BaseEntity;
-
-/**
- * ${subTable.functionName}瀵硅薄 ${subTableName}
- *
- * @author ${author}
- * @date ${datetime}
- */
-public class ${subClassName} extends BaseEntity {
-private static final long serialVersionUID = 1L;
-
-#foreach ($column in $subTable.columns)
- #if(!$table.isSuperColumn($column.javaField))
- /** $column.columnComment */
- #if($column.list)
- #set($parentheseIndex=$column.columnComment.indexOf("锛�"))
- #if($parentheseIndex != -1)
- #set($comment=$column.columnComment.substring(0, $parentheseIndex))
- #else
- #set($comment=$column.columnComment)
- #end
- #if($parentheseIndex != -1)
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- #elseif($column.javaType == 'Date')
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
- #else
- @Excel(name = "${comment}")
- #end
- #end
- private $column.javaType $column.javaField;
-
- #end
-#end
-#foreach ($column in $subTable.columns)
- #if(!$table.isSuperColumn($column.javaField))
- #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
- #set($AttrName=$column.javaField)
- #else
- #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- #end
- public void set${AttrName}($column.javaType $column.javaField) {
- this.$column.javaField = $column.javaField;
- }
-
- public $column.javaType get${AttrName}() {
- return $column.javaField;
- }
- #end
-#end
-
-@Override
-public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- #foreach ($column in $subTable.columns)
- #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
- #set($AttrName=$column.javaField)
- #else
- #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- #end
- .append("${column.javaField}", get${AttrName}())
- #end
- .toString();
- }
- }
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/vm/js/api.js.vm" "b/$\173project.build.directory\175/classes/src/main/resources/vm/js/api.js.vm"
deleted file mode 100644
index 9295524..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/vm/js/api.js.vm"
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 鏌ヨ${functionName}鍒楄〃
-export function list${BusinessName}(query) {
- return request({
- url: '/${moduleName}/${businessName}/list',
- method: 'get',
- params: query
- })
-}
-
-// 鏌ヨ${functionName}璇︾粏
-export function get${BusinessName}(${pkColumn.javaField}) {
- return request({
- url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
- method: 'get'
- })
-}
-
-// 鏂板${functionName}
-export function add${BusinessName}(data) {
- return request({
- url: '/${moduleName}/${businessName}',
- method: 'post',
- data: data
- })
-}
-
-// 淇敼${functionName}
-export function update${BusinessName}(data) {
- return request({
- url: '/${moduleName}/${businessName}',
- method: 'put',
- data: data
- })
-}
-
-// 鍒犻櫎${functionName}
-export function del${BusinessName}(${pkColumn.javaField}) {
- return request({
- url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
- method: 'delete'
- })
-}
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/vm/sql/sql.vm" "b/$\173project.build.directory\175/classes/src/main/resources/vm/sql/sql.vm"
deleted file mode 100644
index 0575583..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/vm/sql/sql.vm"
+++ /dev/null
@@ -1,22 +0,0 @@
--- 鑿滃崟 SQL
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, '${functionName}鑿滃崟');
-
--- 鎸夐挳鐖惰彍鍗旾D
-SELECT @parentId := LAST_INSERT_ID();
-
--- 鎸夐挳 SQL
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}鏌ヨ', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', sysdate(), '', null, '');
-
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}鏂板', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', sysdate(), '', null, '');
-
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}淇敼', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', sysdate(), '', null, '');
-
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}鍒犻櫎', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', sysdate(), '', null, '');
-
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}瀵煎嚭', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', sysdate(), '', null, '');
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/vm/vue/index-tree.vue.vm" "b/$\173project.build.directory\175/classes/src/main/resources/vm/vue/index-tree.vue.vm"
deleted file mode 100644
index 4e35fc9..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/vm/vue/index-tree.vue.vm"
+++ /dev/null
@@ -1,505 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-input
- v-model="queryParams.${column.javaField}"
- placeholder="璇疯緭鍏�${comment}"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
- <el-option
- v-for="dict in dict.type.${dictType}"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-date-picker clearable
- v-model="queryParams.${column.javaField}"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="閫夋嫨${comment}">
- </el-date-picker>
- </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- <el-form-item label="${comment}">
- <el-date-picker
- v-model="daterange${AttrName}"
- style="width: 240px"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
- </el-form-item>
-#end
-#end
-#end
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['${permissionPrefix}:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="info"
- plain
- icon="el-icon-sort"
- size="mini"
- @click="toggleExpandAll"
- >灞曞紑/鎶樺彔</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table
- v-if="refreshTable"
- v-loading="loading"
- :data="${businessName}List"
- row-key="${treeCode}"
- :default-expand-all="isExpandAll"
- :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
- >
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
-#elseif($column.list && $column.htmlType == "datetime")
- <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
- <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
- <template slot-scope="scope">
- <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
- </template>
- </el-table-column>
-#elseif($column.list && "" != $column.dictType)
- <el-table-column label="${comment}" align="center" prop="${javaField}">
- <template slot-scope="scope">
-#if($column.htmlType == "checkbox")
- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
-#end
- </template>
- </el-table-column>
-#elseif($column.list && "" != $javaField)
-#if(${foreach.index} == 1)
- <el-table-column label="${comment}" prop="${javaField}" />
-#else
- <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#end
-#end
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['${permissionPrefix}:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-plus"
- @click="handleAdd(scope.row)"
- v-hasPermi="['${permissionPrefix}:add']"
- >鏂板</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['${permissionPrefix}:remove']"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <!-- 娣诲姞鎴栦慨鏀�${functionName}瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$column.pk)
-#if(($column.usableColumn) || (!$column.superColumn))
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if("" != $treeParentCode && $column.javaField == $treeParentCode)
- <el-form-item label="${comment}" prop="${treeParentCode}">
- <treeselect v-model="form.${treeParentCode}" :options="${businessName}Options" :normalizer="normalizer" placeholder="璇烽�夋嫨${comment}" />
- </el-form-item>
-#elseif($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" placeholder="璇疯緭鍏�${comment}" />
- </el-form-item>
-#elseif($column.htmlType == "imageUpload")
- <el-form-item label="${comment}" prop="${field}">
- <image-upload v-model="form.${field}"/>
- </el-form-item>
-#elseif($column.htmlType == "fileUpload")
- <el-form-item label="${comment}" prop="${field}">
- <file-upload v-model="form.${field}"/>
- </el-form-item>
-#elseif($column.htmlType == "editor")
- <el-form-item label="${comment}">
- <editor v-model="form.${field}" :min-height="192"/>
- </el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
- <el-option
- v-for="dict in dict.type.${dictType}"
- :key="dict.value"
- :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
- :value="parseInt(dict.value)"
-#else
- :value="dict.value"
-#end
- ></el-option>
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox
- v-for="dict in dict.type.${dictType}"
- :key="dict.value"
- :label="dict.value">
- {{dict.label}}
- </el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "checkbox" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox>璇烽�夋嫨瀛楀吀鐢熸垚</el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "radio" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-radio-group v-model="form.${field}">
- <el-radio
- v-for="dict in dict.type.${dictType}"
- :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
- :label="parseInt(dict.value)"
-#else
- :label="dict.value"
-#end
- >{{dict.label}}</el-radio>
- </el-radio-group>
- </el-form-item>
-#elseif($column.htmlType == "radio" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-radio-group v-model="form.${field}">
- <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
- </el-radio-group>
- </el-form-item>
-#elseif($column.htmlType == "datetime")
- <el-form-item label="${comment}" prop="${field}">
- <el-date-picker clearable
- v-model="form.${field}"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="閫夋嫨${comment}">
- </el-date-picker>
- </el-form-item>
-#elseif($column.htmlType == "textarea")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
-#end
-#end
-#end
-#end
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-import Treeselect from "@riophae/vue-treeselect"
-import "@riophae/vue-treeselect/dist/vue-treeselect.css"
-
-export default {
- name: "${BusinessName}",
-#if(${dicts} != '')
- dicts: [${dicts}],
-#end
- components: {
- Treeselect
- },
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // ${functionName}琛ㄦ牸鏁版嵁
- ${businessName}List: [],
- // ${functionName}鏍戦�夐」
- ${businessName}Options: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 鏄惁灞曞紑锛岄粯璁ゅ叏閮ㄥ睍寮�
- isExpandAll: true,
- // 閲嶆柊娓叉煋琛ㄦ牸鐘舵��
- refreshTable: true,
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- // $comment鏃堕棿鑼冨洿
- daterange${AttrName}: [],
-#end
-#end
- // 鏌ヨ鍙傛暟
- queryParams: {
-#foreach ($column in $columns)
-#if($column.query)
- $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
-#foreach ($column in $columns)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
- $column.javaField: [
- { required: true, message: "$comment涓嶈兘涓虹┖", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
- ]#if($foreach.count != $columns.size()),#end
-#end
-#end
- }
- }
- },
- created() {
- this.getList()
- },
- methods: {
- /** 鏌ヨ${functionName}鍒楄〃 */
- getList() {
- this.loading = true
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- this.queryParams.params = {}
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
- this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0]
- this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1]
- }
-#end
-#end
- list${BusinessName}(this.queryParams).then(response => {
- this.${businessName}List = this.handleTree(response.data, "${treeCode}", "${treeParentCode}")
- this.loading = false
- })
- },
- /** 杞崲${functionName}鏁版嵁缁撴瀯 */
- normalizer(node) {
- if (node.children && !node.children.length) {
- delete node.children
- }
- return {
- id: node.${treeCode},
- label: node.${treeName},
- children: node.children
- }
- },
- /** 鏌ヨ${functionName}涓嬫媺鏍戠粨鏋� */
- getTreeselect() {
- list${BusinessName}().then(response => {
- this.${businessName}Options = []
- const data = { ${treeCode}: 0, ${treeName}: '椤剁骇鑺傜偣', children: [] }
- data.children = this.handleTree(response.data, "${treeCode}", "${treeParentCode}")
- this.${businessName}Options.push(data)
- })
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false
- this.reset()
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- $column.javaField: []#if($foreach.count != $columns.size()),#end
-#else
- $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
- }
- this.resetForm("form")
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.getList()
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- this.daterange${AttrName} = []
-#end
-#end
- this.resetForm("queryForm")
- this.handleQuery()
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd(row) {
- this.reset()
- this.getTreeselect()
- if (row != null && row.${treeCode}) {
- this.form.${treeParentCode} = row.${treeCode}
- } else {
- this.form.${treeParentCode} = 0
- }
- this.open = true
- this.title = "娣诲姞${functionName}"
- },
- /** 灞曞紑/鎶樺彔鎿嶄綔 */
- toggleExpandAll() {
- this.refreshTable = false
- this.isExpandAll = !this.isExpandAll
- this.$nextTick(() => {
- this.refreshTable = true
- })
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset()
- this.getTreeselect()
- if (row != null) {
- this.form.${treeParentCode} = row.${treeParentCode}
- }
- get${BusinessName}(row.${pkColumn.javaField}).then(response => {
- this.form = response.data
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- this.form.$column.javaField = this.form.${column.javaField}.split(",")
-#end
-#end
- this.open = true
- this.title = "淇敼${functionName}"
- })
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.#[[$]]#refs["form"].validate(valid => {
- if (valid) {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- this.form.$column.javaField = this.form.${column.javaField}.join(",")
-#end
-#end
- if (this.form.${pkColumn.javaField} != null) {
- update${BusinessName}(this.form).then(response => {
- this.#[[$modal]]#.msgSuccess("淇敼鎴愬姛")
- this.open = false
- this.getList()
- })
- } else {
- add${BusinessName}(this.form).then(response => {
- this.#[[$modal]]#.msgSuccess("鏂板鎴愬姛")
- this.open = false
- this.getList()
- })
- }
- }
- })
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- this.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + row.${pkColumn.javaField} + '"鐨勬暟鎹」锛�').then(function() {
- return del${BusinessName}(row.${pkColumn.javaField})
- }).then(() => {
- this.getList()
- this.#[[$modal]]#.msgSuccess("鍒犻櫎鎴愬姛")
- }).catch(() => {})
- }
- }
-}
-</script>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/vm/vue/index.vue.vm" "b/$\173project.build.directory\175/classes/src/main/resources/vm/vue/index.vue.vm"
deleted file mode 100644
index 04ebe16..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/vm/vue/index.vue.vm"
+++ /dev/null
@@ -1,602 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-input
- v-model="queryParams.${column.javaField}"
- placeholder="璇疯緭鍏�${comment}"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
- <el-option
- v-for="dict in dict.type.${dictType}"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-date-picker clearable
- v-model="queryParams.${column.javaField}"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨${comment}">
- </el-date-picker>
- </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- <el-form-item label="${comment}">
- <el-date-picker
- v-model="daterange${AttrName}"
- style="width: 240px"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
- </el-form-item>
-#end
-#end
-#end
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['${permissionPrefix}:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['${permissionPrefix}:edit']"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['${permissionPrefix}:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['${permissionPrefix}:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
- <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#elseif($column.list && $column.htmlType == "datetime")
- <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
- <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
- <template slot-scope="scope">
- <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
- </template>
- </el-table-column>
-#elseif($column.list && "" != $column.dictType)
- <el-table-column label="${comment}" align="center" prop="${javaField}">
- <template slot-scope="scope">
-#if($column.htmlType == "checkbox")
- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
-#end
- </template>
- </el-table-column>
-#elseif($column.list && "" != $javaField)
- <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#end
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['${permissionPrefix}:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['${permissionPrefix}:remove']"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
-
- <!-- 娣诲姞鎴栦慨鏀�${functionName}瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$column.pk)
-#if(($column.usableColumn) || (!$column.superColumn))
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" placeholder="璇疯緭鍏�${comment}" />
- </el-form-item>
-#elseif($column.htmlType == "imageUpload")
- <el-form-item label="${comment}" prop="${field}">
- <image-upload v-model="form.${field}"/>
- </el-form-item>
-#elseif($column.htmlType == "fileUpload")
- <el-form-item label="${comment}" prop="${field}">
- <file-upload v-model="form.${field}"/>
- </el-form-item>
-#elseif($column.htmlType == "editor")
- <el-form-item label="${comment}">
- <editor v-model="form.${field}" :min-height="192"/>
- </el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
- <el-option
- v-for="dict in dict.type.${dictType}"
- :key="dict.value"
- :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
- :value="parseInt(dict.value)"
-#else
- :value="dict.value"
-#end
- ></el-option>
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox
- v-for="dict in dict.type.${dictType}"
- :key="dict.value"
- :label="dict.value">
- {{dict.label}}
- </el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "checkbox" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox>璇烽�夋嫨瀛楀吀鐢熸垚</el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "radio" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-radio-group v-model="form.${field}">
- <el-radio
- v-for="dict in dict.type.${dictType}"
- :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
- :label="parseInt(dict.value)"
-#else
- :label="dict.value"
-#end
- >{{dict.label}}</el-radio>
- </el-radio-group>
- </el-form-item>
-#elseif($column.htmlType == "radio" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-radio-group v-model="form.${field}">
- <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
- </el-radio-group>
- </el-form-item>
-#elseif($column.htmlType == "datetime")
- <el-form-item label="${comment}" prop="${field}">
- <el-date-picker clearable
- v-model="form.${field}"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨${comment}">
- </el-date-picker>
- </el-form-item>
-#elseif($column.htmlType == "textarea")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
-#end
-#end
-#end
-#end
-#if($table.sub)
- <el-divider content-position="center">${subTable.functionName}淇℃伅</el-divider>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}">娣诲姞</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete${subClassName}">鍒犻櫎</el-button>
- </el-col>
- </el-row>
- <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
- <el-table-column type="selection" width="50" align="center" />
- <el-table-column label="搴忓彿" align="center" prop="index" width="50"/>
-#foreach($column in $subTable.columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk || $javaField == ${subTableFkclassName})
-#elseif($column.list && $column.htmlType == "input")
- <el-table-column label="$comment" prop="${javaField}" width="150">
- <template slot-scope="scope">
- <el-input v-model="scope.row.$javaField" placeholder="璇疯緭鍏�$comment" />
- </template>
- </el-table-column>
-#elseif($column.list && $column.htmlType == "datetime")
- <el-table-column label="$comment" prop="${javaField}" width="240">
- <template slot-scope="scope">
- <el-date-picker clearable v-model="scope.row.$javaField" type="date" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨$comment" />
- </template>
- </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType)
- <el-table-column label="$comment" prop="${javaField}" width="150">
- <template slot-scope="scope">
- <el-select v-model="scope.row.$javaField" placeholder="璇烽�夋嫨$comment">
- <el-option
- v-for="dict in dict.type.$column.dictType"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </template>
- </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType)
- <el-table-column label="$comment" prop="${javaField}" width="150">
- <template slot-scope="scope">
- <el-select v-model="scope.row.$javaField" placeholder="璇烽�夋嫨$comment">
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </template>
- </el-table-column>
-#end
-#end
- </el-table>
-#end
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-
-export default {
- name: "${BusinessName}",
-#if(${dicts} != '')
- dicts: [${dicts}],
-#end
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
-#if($table.sub)
- // 瀛愯〃閫変腑鏁版嵁
- checked${subClassName}: [],
-#end
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // ${functionName}琛ㄦ牸鏁版嵁
- ${businessName}List: [],
-#if($table.sub)
- // ${subTable.functionName}琛ㄦ牸鏁版嵁
- ${subclassName}List: [],
-#end
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- // $comment鏃堕棿鑼冨洿
- daterange${AttrName}: [],
-#end
-#end
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
-#foreach ($column in $columns)
-#if($column.query)
- $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
-#foreach ($column in $columns)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
- $column.javaField: [
- { required: true, message: "$comment涓嶈兘涓虹┖", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
- ]#if($foreach.count != $columns.size()),#end
-#end
-#end
- }
- }
- },
- created() {
- this.getList()
- },
- methods: {
- /** 鏌ヨ${functionName}鍒楄〃 */
- getList() {
- this.loading = true
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- this.queryParams.params = {}
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
- this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0]
- this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1]
- }
-#end
-#end
- list${BusinessName}(this.queryParams).then(response => {
- this.${businessName}List = response.rows
- this.total = response.total
- this.loading = false
- })
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false
- this.reset()
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- $column.javaField: []#if($foreach.count != $columns.size()),#end
-#else
- $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
- }
-#if($table.sub)
- this.${subclassName}List = []
-#end
- this.resetForm("form")
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1
- this.getList()
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- this.daterange${AttrName} = []
-#end
-#end
- this.resetForm("queryForm")
- this.handleQuery()
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.${pkColumn.javaField})
- this.single = selection.length!==1
- this.multiple = !selection.length
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset()
- this.open = true
- this.title = "娣诲姞${functionName}"
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset()
- const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
- get${BusinessName}(${pkColumn.javaField}).then(response => {
- this.form = response.data
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- this.form.$column.javaField = this.form.${column.javaField}.split(",")
-#end
-#end
-#if($table.sub)
- this.${subclassName}List = response.data.${subclassName}List
-#end
- this.open = true
- this.title = "淇敼${functionName}"
- })
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.#[[$]]#refs["form"].validate(valid => {
- if (valid) {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- this.form.$column.javaField = this.form.${column.javaField}.join(",")
-#end
-#end
-#if($table.sub)
- this.form.${subclassName}List = this.${subclassName}List
-#end
- if (this.form.${pkColumn.javaField} != null) {
- update${BusinessName}(this.form).then(response => {
- this.#[[$modal]]#.msgSuccess("淇敼鎴愬姛")
- this.open = false
- this.getList()
- })
- } else {
- add${BusinessName}(this.form).then(response => {
- this.#[[$modal]]#.msgSuccess("鏂板鎴愬姛")
- this.open = false
- this.getList()
- })
- }
- }
- })
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids
- this.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + ${pkColumn.javaField}s + '"鐨勬暟鎹」锛�').then(function() {
- return del${BusinessName}(${pkColumn.javaField}s)
- }).then(() => {
- this.getList()
- this.#[[$modal]]#.msgSuccess("鍒犻櫎鎴愬姛")
- }).catch(() => {})
- },
-#if($table.sub)
- /** ${subTable.functionName}搴忓彿 */
- row${subClassName}Index({ row, rowIndex }) {
- row.index = rowIndex + 1
- },
- /** ${subTable.functionName}娣诲姞鎸夐挳鎿嶄綔 */
- handleAdd${subClassName}() {
- let obj = {}
-#foreach($column in $subTable.columns)
-#if($column.pk || $column.javaField == ${subTableFkclassName})
-#elseif($column.list && "" != $javaField)
- obj.$column.javaField = ""
-#end
-#end
- this.${subclassName}List.push(obj)
- },
- /** ${subTable.functionName}鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete${subClassName}() {
- if (this.checked${subClassName}.length == 0) {
- this.#[[$modal]]#.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑${subTable.functionName}鏁版嵁")
- } else {
- const ${subclassName}List = this.${subclassName}List
- const checked${subClassName} = this.checked${subClassName}
- this.${subclassName}List = ${subclassName}List.filter(function(item) {
- return checked${subClassName}.indexOf(item.index) == -1
- })
- }
- },
- /** 澶嶉�夋閫変腑鏁版嵁 */
- handle${subClassName}SelectionChange(selection) {
- this.checked${subClassName} = selection.map(item => item.index)
- },
-#end
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('${moduleName}/${businessName}/export', {
- ...this.queryParams
- }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
- }
- }
-}
-</script>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/vm/vue/v3/index-tree.vue.vm" "b/$\173project.build.directory\175/classes/src/main/resources/vm/vue/v3/index-tree.vue.vm"
deleted file mode 100644
index 765a5e3..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/vm/vue/v3/index-tree.vue.vm"
+++ /dev/null
@@ -1,474 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-input
- v-model="queryParams.${column.javaField}"
- placeholder="璇疯緭鍏�${comment}"
- clearable
- @keyup.enter="handleQuery"
- />
- </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
- <el-option
- v-for="dict in ${dictType}"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-date-picker clearable
- v-model="queryParams.${column.javaField}"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="閫夋嫨${comment}">
- </el-date-picker>
- </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- <el-form-item label="${comment}" style="width: 308px">
- <el-date-picker
- v-model="daterange${AttrName}"
- value-format="YYYY-MM-DD"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
- </el-form-item>
-#end
-#end
-#end
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="handleAdd"
- v-hasPermi="['${permissionPrefix}:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="info"
- plain
- icon="Sort"
- @click="toggleExpandAll"
- >灞曞紑/鎶樺彔</el-button>
- </el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table
- v-if="refreshTable"
- v-loading="loading"
- :data="${businessName}List"
- row-key="${treeCode}"
- :default-expand-all="isExpandAll"
- :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
- >
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
-#elseif($column.list && $column.htmlType == "datetime")
- <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
- <template #default="scope">
- <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
- <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
- <template #default="scope">
- <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
- </template>
- </el-table-column>
-#elseif($column.list && "" != $column.dictType)
- <el-table-column label="${comment}" align="center" prop="${javaField}">
- <template #default="scope">
-#if($column.htmlType == "checkbox")
- <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
- <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
-#end
- </template>
- </el-table-column>
-#elseif($column.list && "" != $javaField)
-#if(${foreach.index} == 1)
- <el-table-column label="${comment}" prop="${javaField}" />
-#else
- <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#end
-#end
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template #default="scope">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">淇敼</el-button>
- <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['${permissionPrefix}:add']">鏂板</el-button>
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <!-- 娣诲姞鎴栦慨鏀�${functionName}瀵硅瘽妗� -->
- <el-dialog :title="title" v-model="open" width="500px" append-to-body>
- <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$column.pk)
-#if(($column.usableColumn) || (!$column.superColumn))
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if("" != $treeParentCode && $column.javaField == $treeParentCode)
- <el-form-item label="${comment}" prop="${treeParentCode}">
- <el-tree-select
- v-model="form.${treeParentCode}"
- :data="${businessName}Options"
- :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
- value-key="${treeCode}"
- placeholder="璇烽�夋嫨${comment}"
- check-strictly
- />
- </el-form-item>
-#elseif($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" placeholder="璇疯緭鍏�${comment}" />
- </el-form-item>
-#elseif($column.htmlType == "imageUpload")
- <el-form-item label="${comment}" prop="${field}">
- <image-upload v-model="form.${field}"/>
- </el-form-item>
-#elseif($column.htmlType == "fileUpload")
- <el-form-item label="${comment}" prop="${field}">
- <file-upload v-model="form.${field}"/>
- </el-form-item>
-#elseif($column.htmlType == "editor")
- <el-form-item label="${comment}">
- <editor v-model="form.${field}" :min-height="192"/>
- </el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
- <el-option
- v-for="dict in ${dictType}"
- :key="dict.value"
- :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
- :value="parseInt(dict.value)"
-#else
- :value="dict.value"
-#end
- ></el-option>
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox
- v-for="dict in ${dictType}"
- :key="dict.value"
- :label="dict.value">
- {{dict.label}}
- </el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "checkbox" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox>璇烽�夋嫨瀛楀吀鐢熸垚</el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "radio" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-radio-group v-model="form.${field}">
- <el-radio
- v-for="dict in ${dictType}"
- :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
- :label="parseInt(dict.value)"
-#else
- :label="dict.value"
-#end
- >{{dict.label}}</el-radio>
- </el-radio-group>
- </el-form-item>
-#elseif($column.htmlType == "radio" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-radio-group v-model="form.${field}">
- <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
- </el-radio-group>
- </el-form-item>
-#elseif($column.htmlType == "datetime")
- <el-form-item label="${comment}" prop="${field}">
- <el-date-picker clearable
- v-model="form.${field}"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="閫夋嫨${comment}">
- </el-date-picker>
- </el-form-item>
-#elseif($column.htmlType == "textarea")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
-#end
-#end
-#end
-#end
- </el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </template>
- </el-dialog>
- </div>
-</template>
-
-<script setup name="${BusinessName}">
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-
-const { proxy } = getCurrentInstance()
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
-#end
-
-const ${businessName}List = ref([])
-const ${businessName}Options = ref([])
-const open = ref(false)
-const loading = ref(true)
-const showSearch = ref(true)
-const title = ref("")
-const isExpandAll = ref(true)
-const refreshTable = ref(true)
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-const daterange${AttrName} = ref([])
-#end
-#end
-
-const data = reactive({
- form: {},
- queryParams: {
- #foreach ($column in $columns)
-#if($column.query)
- $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
- },
- rules: {
- #foreach ($column in $columns)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
- $column.javaField: [
- { required: true, message: "$comment涓嶈兘涓虹┖", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
- ]#if($foreach.count != $columns.size()),#end
-#end
-#end
- }
-})
-
-const { queryParams, form, rules } = toRefs(data)
-
-/** 鏌ヨ${functionName}鍒楄〃 */
-function getList() {
- loading.value = true
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- queryParams.value.params = {}
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- if (null != daterange${AttrName} && '' != daterange${AttrName}) {
- queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
- queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
- }
-#end
-#end
- list${BusinessName}(queryParams.value).then(response => {
- ${businessName}List.value = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}")
- loading.value = false
- })
-}
-
-/** 鏌ヨ${functionName}涓嬫媺鏍戠粨鏋� */
-function getTreeselect() {
- list${BusinessName}().then(response => {
- ${businessName}Options.value = []
- const data = { ${treeCode}: 0, ${treeName}: '椤剁骇鑺傜偣', children: [] }
- data.children = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}")
- ${businessName}Options.value.push(data)
- })
-}
-
-// 鍙栨秷鎸夐挳
-function cancel() {
- open.value = false
- reset()
-}
-
-// 琛ㄥ崟閲嶇疆
-function reset() {
- form.value = {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- $column.javaField: []#if($foreach.count != $columns.size()),#end
-#else
- $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
- }
- proxy.resetForm("${businessName}Ref")
-}
-
-/** 鎼滅储鎸夐挳鎿嶄綔 */
-function handleQuery() {
- getList()
-}
-
-/** 閲嶇疆鎸夐挳鎿嶄綔 */
-function resetQuery() {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- daterange${AttrName}.value = []
-#end
-#end
- proxy.resetForm("queryRef")
- handleQuery()
-}
-
-/** 鏂板鎸夐挳鎿嶄綔 */
-function handleAdd(row) {
- reset()
- getTreeselect()
- if (row != null && row.${treeCode}) {
- form.value.${treeParentCode} = row.${treeCode}
- } else {
- form.value.${treeParentCode} = 0
- }
- open.value = true
- title.value = "娣诲姞${functionName}"
-}
-
-/** 灞曞紑/鎶樺彔鎿嶄綔 */
-function toggleExpandAll() {
- refreshTable.value = false
- isExpandAll.value = !isExpandAll.value
- nextTick(() => {
- refreshTable.value = true
- })
-}
-
-/** 淇敼鎸夐挳鎿嶄綔 */
-async function handleUpdate(row) {
- reset()
- await getTreeselect()
- if (row != null) {
- form.value.${treeParentCode} = row.${treeParentCode}
- }
- get${BusinessName}(row.${pkColumn.javaField}).then(response => {
- form.value = response.data
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- form.value.$column.javaField = form.value.${column.javaField}.split(",")
-#end
-#end
- open.value = true
- title.value = "淇敼${functionName}"
- })
-}
-
-/** 鎻愪氦鎸夐挳 */
-function submitForm() {
- proxy.#[[$]]#refs["${businessName}Ref"].validate(valid => {
- if (valid) {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- form.value.$column.javaField = form.value.${column.javaField}.join(",")
-#end
-#end
- if (form.value.${pkColumn.javaField} != null) {
- update${BusinessName}(form.value).then(response => {
- proxy.#[[$modal]]#.msgSuccess("淇敼鎴愬姛")
- open.value = false
- getList()
- })
- } else {
- add${BusinessName}(form.value).then(response => {
- proxy.#[[$modal]]#.msgSuccess("鏂板鎴愬姛")
- open.value = false
- getList()
- })
- }
- }
- })
-}
-
-/** 鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete(row) {
- proxy.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + row.${pkColumn.javaField} + '"鐨勬暟鎹」锛�').then(function() {
- return del${BusinessName}(row.${pkColumn.javaField})
- }).then(() => {
- getList()
- proxy.#[[$modal]]#.msgSuccess("鍒犻櫎鎴愬姛")
- }).catch(() => {})
-}
-
-getList()
-</script>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/vm/vue/v3/index.vue.vm" "b/$\173project.build.directory\175/classes/src/main/resources/vm/vue/v3/index.vue.vm"
deleted file mode 100644
index 936b465..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/vm/vue/v3/index.vue.vm"
+++ /dev/null
@@ -1,590 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-input
- v-model="queryParams.${column.javaField}"
- placeholder="璇疯緭鍏�${comment}"
- clearable
- @keyup.enter="handleQuery"
- />
- </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
- <el-option
- v-for="dict in ${dictType}"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-date-picker clearable
- v-model="queryParams.${column.javaField}"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="璇烽�夋嫨${comment}">
- </el-date-picker>
- </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- <el-form-item label="${comment}" style="width: 308px">
- <el-date-picker
- v-model="daterange${AttrName}"
- value-format="YYYY-MM-DD"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
- </el-form-item>
-#end
-#end
-#end
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="handleAdd"
- v-hasPermi="['${permissionPrefix}:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="Edit"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['${permissionPrefix}:edit']"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="Delete"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['${permissionPrefix}:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="Download"
- @click="handleExport"
- v-hasPermi="['${permissionPrefix}:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
- <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#elseif($column.list && $column.htmlType == "datetime")
- <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
- <template #default="scope">
- <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
- <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
- <template #default="scope">
- <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
- </template>
- </el-table-column>
-#elseif($column.list && "" != $column.dictType)
- <el-table-column label="${comment}" align="center" prop="${javaField}">
- <template #default="scope">
-#if($column.htmlType == "checkbox")
- <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
- <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
-#end
- </template>
- </el-table-column>
-#elseif($column.list && "" != $javaField)
- <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#end
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template #default="scope">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">淇敼</el-button>
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize"
- @pagination="getList"
- />
-
- <!-- 娣诲姞鎴栦慨鏀�${functionName}瀵硅瘽妗� -->
- <el-dialog :title="title" v-model="open" width="500px" append-to-body>
- <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$column.pk)
-#if(($column.usableColumn) || (!$column.superColumn))
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" placeholder="璇疯緭鍏�${comment}" />
- </el-form-item>
-#elseif($column.htmlType == "imageUpload")
- <el-form-item label="${comment}" prop="${field}">
- <image-upload v-model="form.${field}"/>
- </el-form-item>
-#elseif($column.htmlType == "fileUpload")
- <el-form-item label="${comment}" prop="${field}">
- <file-upload v-model="form.${field}"/>
- </el-form-item>
-#elseif($column.htmlType == "editor")
- <el-form-item label="${comment}">
- <editor v-model="form.${field}" :min-height="192"/>
- </el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
- <el-option
- v-for="dict in ${dictType}"
- :key="dict.value"
- :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
- :value="parseInt(dict.value)"
-#else
- :value="dict.value"
-#end
- ></el-option>
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox
- v-for="dict in ${dictType}"
- :key="dict.value"
- :label="dict.value">
- {{dict.label}}
- </el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "checkbox" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox>璇烽�夋嫨瀛楀吀鐢熸垚</el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "radio" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-radio-group v-model="form.${field}">
- <el-radio
- v-for="dict in ${dictType}"
- :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
- :label="parseInt(dict.value)"
-#else
- :label="dict.value"
-#end
- >{{dict.label}}</el-radio>
- </el-radio-group>
- </el-form-item>
-#elseif($column.htmlType == "radio" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-radio-group v-model="form.${field}">
- <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
- </el-radio-group>
- </el-form-item>
-#elseif($column.htmlType == "datetime")
- <el-form-item label="${comment}" prop="${field}">
- <el-date-picker clearable
- v-model="form.${field}"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="璇烽�夋嫨${comment}">
- </el-date-picker>
- </el-form-item>
-#elseif($column.htmlType == "textarea")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
-#end
-#end
-#end
-#end
-#if($table.sub)
- <el-divider content-position="center">${subTable.functionName}淇℃伅</el-divider>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button type="primary" icon="Plus" @click="handleAdd${subClassName}">娣诲姞</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="danger" icon="Delete" @click="handleDelete${subClassName}">鍒犻櫎</el-button>
- </el-col>
- </el-row>
- <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
- <el-table-column type="selection" width="50" align="center" />
- <el-table-column label="搴忓彿" align="center" prop="index" width="50"/>
-#foreach($column in $subTable.columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk || $javaField == ${subTableFkclassName})
-#elseif($column.list && $column.htmlType == "input")
- <el-table-column label="$comment" prop="${javaField}" width="150">
- <template #default="scope">
- <el-input v-model="scope.row.$javaField" placeholder="璇疯緭鍏�$comment" />
- </template>
- </el-table-column>
-#elseif($column.list && $column.htmlType == "datetime")
- <el-table-column label="$comment" prop="${javaField}" width="240">
- <template #default="scope">
- <el-date-picker clearable
- v-model="scope.row.$javaField"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="璇烽�夋嫨$comment">
- </el-date-picker>
- </template>
- </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType)
- <el-table-column label="$comment" prop="${javaField}" width="150">
- <template #default="scope">
- <el-select v-model="scope.row.$javaField" placeholder="璇烽�夋嫨$comment">
- <el-option
- v-for="dict in $column.dictType"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </template>
- </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType)
- <el-table-column label="$comment" prop="${javaField}" width="150">
- <template #default="scope">
- <el-select v-model="scope.row.$javaField" placeholder="璇烽�夋嫨$comment">
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </template>
- </el-table-column>
-#end
-#end
- </el-table>
-#end
- </el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </template>
- </el-dialog>
- </div>
-</template>
-
-<script setup name="${BusinessName}">
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-
-const { proxy } = getCurrentInstance()
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
-#end
-
-const ${businessName}List = ref([])
-#if($table.sub)
-const ${subclassName}List = ref([])
-#end
-const open = ref(false)
-const loading = ref(true)
-const showSearch = ref(true)
-const ids = ref([])
-#if($table.sub)
-const checked${subClassName} = ref([])
-#end
-const single = ref(true)
-const multiple = ref(true)
-const total = ref(0)
-const title = ref("")
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-const daterange${AttrName} = ref([])
-#end
-#end
-
-const data = reactive({
- form: {},
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- #foreach ($column in $columns)
-#if($column.query)
- $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
- },
- rules: {
- #foreach ($column in $columns)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
- $column.javaField: [
- { required: true, message: "$comment涓嶈兘涓虹┖", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
- ]#if($foreach.count != $columns.size()),#end
-#end
-#end
- }
-})
-
-const { queryParams, form, rules } = toRefs(data)
-
-/** 鏌ヨ${functionName}鍒楄〃 */
-function getList() {
- loading.value = true
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- queryParams.value.params = {}
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- if (null != daterange${AttrName} && '' != daterange${AttrName}) {
- queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
- queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
- }
-#end
-#end
- list${BusinessName}(queryParams.value).then(response => {
- ${businessName}List.value = response.rows
- total.value = response.total
- loading.value = false
- })
-}
-
-// 鍙栨秷鎸夐挳
-function cancel() {
- open.value = false
- reset()
-}
-
-// 琛ㄥ崟閲嶇疆
-function reset() {
- form.value = {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- $column.javaField: []#if($foreach.count != $columns.size()),#end
-#else
- $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
- }
-#if($table.sub)
- ${subclassName}List.value = []
-#end
- proxy.resetForm("${businessName}Ref")
-}
-
-/** 鎼滅储鎸夐挳鎿嶄綔 */
-function handleQuery() {
- queryParams.value.pageNum = 1
- getList()
-}
-
-/** 閲嶇疆鎸夐挳鎿嶄綔 */
-function resetQuery() {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- daterange${AttrName}.value = []
-#end
-#end
- proxy.resetForm("queryRef")
- handleQuery()
-}
-
-// 澶氶�夋閫変腑鏁版嵁
-function handleSelectionChange(selection) {
- ids.value = selection.map(item => item.${pkColumn.javaField})
- single.value = selection.length != 1
- multiple.value = !selection.length
-}
-
-/** 鏂板鎸夐挳鎿嶄綔 */
-function handleAdd() {
- reset()
- open.value = true
- title.value = "娣诲姞${functionName}"
-}
-
-/** 淇敼鎸夐挳鎿嶄綔 */
-function handleUpdate(row) {
- reset()
- const _${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value
- get${BusinessName}(_${pkColumn.javaField}).then(response => {
- form.value = response.data
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- form.value.$column.javaField = form.value.${column.javaField}.split(",")
-#end
-#end
-#if($table.sub)
- ${subclassName}List.value = response.data.${subclassName}List
-#end
- open.value = true
- title.value = "淇敼${functionName}"
- })
-}
-
-/** 鎻愪氦鎸夐挳 */
-function submitForm() {
- proxy.#[[$]]#refs["${businessName}Ref"].validate(valid => {
- if (valid) {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- form.value.$column.javaField = form.value.${column.javaField}.join(",")
-#end
-#end
-#if($table.sub)
- form.value.${subclassName}List = ${subclassName}List.value
-#end
- if (form.value.${pkColumn.javaField} != null) {
- update${BusinessName}(form.value).then(response => {
- proxy.#[[$modal]]#.msgSuccess("淇敼鎴愬姛")
- open.value = false
- getList()
- })
- } else {
- add${BusinessName}(form.value).then(response => {
- proxy.#[[$modal]]#.msgSuccess("鏂板鎴愬姛")
- open.value = false
- getList()
- })
- }
- }
- })
-}
-
-/** 鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete(row) {
- const _${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value
- proxy.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + _${pkColumn.javaField}s + '"鐨勬暟鎹」锛�').then(function() {
- return del${BusinessName}(_${pkColumn.javaField}s)
- }).then(() => {
- getList()
- proxy.#[[$modal]]#.msgSuccess("鍒犻櫎鎴愬姛")
- }).catch(() => {})
-}
-
-#if($table.sub)
-/** ${subTable.functionName}搴忓彿 */
-function row${subClassName}Index({ row, rowIndex }) {
- row.index = rowIndex + 1
-}
-
-/** ${subTable.functionName}娣诲姞鎸夐挳鎿嶄綔 */
-function handleAdd${subClassName}() {
- let obj = {}
-#foreach($column in $subTable.columns)
-#if($column.pk || $column.javaField == ${subTableFkclassName})
-#elseif($column.list && "" != $javaField)
- obj.$column.javaField = ""
-#end
-#end
- ${subclassName}List.value.push(obj)
-}
-
-/** ${subTable.functionName}鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete${subClassName}() {
- if (checked${subClassName}.value.length == 0) {
- proxy.#[[$modal]]#.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑${subTable.functionName}鏁版嵁")
- } else {
- const ${subclassName}s = ${subclassName}List.value
- const checked${subClassName}s = checked${subClassName}.value
- ${subclassName}List.value = ${subclassName}s.filter(function(item) {
- return checked${subClassName}s.indexOf(item.index) == -1
- })
- }
-}
-
-/** 澶嶉�夋閫変腑鏁版嵁 */
-function handle${subClassName}SelectionChange(selection) {
- checked${subClassName}.value = selection.map(item => item.index)
-}
-
-#end
-/** 瀵煎嚭鎸夐挳鎿嶄綔 */
-function handleExport() {
- proxy.download('${moduleName}/${businessName}/export', {
- ...queryParams.value
- }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
-}
-
-getList()
-</script>
diff --git "a/$\173project.build.directory\175/classes/src/main/resources/vm/xml/mapper.xml.vm" "b/$\173project.build.directory\175/classes/src/main/resources/vm/xml/mapper.xml.vm"
deleted file mode 100644
index 456755b..0000000
--- "a/$\173project.build.directory\175/classes/src/main/resources/vm/xml/mapper.xml.vm"
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="${packageName}.mapper.${ClassName}Mapper">
-
- <resultMap type="${ClassName}" id="${ClassName}Result">
-#foreach ($column in $columns)
- <result property="${column.javaField}" column="${column.columnName}" />
-#end
- </resultMap>
-#if($table.sub)
-
- <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
- <collection property="${subclassName}List" ofType="${subClassName}" column="${pkColumn.columnName}" select="select${subClassName}List" />
- </resultMap>
-
- <resultMap type="${subClassName}" id="${subClassName}Result">
-#foreach ($column in $subTable.columns)
- <result property="${column.javaField}" column="${column.columnName}" />
-#end
- </resultMap>
-#end
-
- <sql id="select${ClassName}Vo">
- select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
- </sql>
-
- <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
- <include refid="select${ClassName}Vo"/>
- <where>
-#foreach($column in $columns)
-#set($queryType=$column.queryType)
-#set($javaField=$column.javaField)
-#set($javaType=$column.javaType)
-#set($columnName=$column.columnName)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#if($column.query)
-#if($column.queryType == "EQ")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName = #{$javaField}</if>
-#elseif($queryType == "NE")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName != #{$javaField}</if>
-#elseif($queryType == "GT")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName > #{$javaField}</if>
-#elseif($queryType == "GTE")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName >= #{$javaField}</if>
-#elseif($queryType == "LT")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName < #{$javaField}</if>
-#elseif($queryType == "LTE")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName <= #{$javaField}</if>
-#elseif($queryType == "LIKE")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName like concat('%', #{$javaField}, '%')</if>
-#elseif($queryType == "BETWEEN")
- <if test="params.begin$AttrName != null and params.begin$AttrName != '' and params.end$AttrName != null and params.end$AttrName != ''"> and $columnName between #{params.begin$AttrName} and #{params.end$AttrName}</if>
-#end
-#end
-#end
- </where>
- </select>
-
- <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
-#if($table.crud || $table.tree)
- <include refid="select${ClassName}Vo"/>
- where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-#elseif($table.sub)
- select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end
- from ${tableName}
- where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-#end
- </select>
-#if($table.sub)
-
- <select id="select${subClassName}List" resultMap="${subClassName}Result">
- select#foreach ($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
- from ${subTableName}
- where ${subTableFkName} = #{${subTableFkName}}
- </select>
-#end
-
- <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
- insert into ${tableName}
- <trim prefix="(" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
- <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName,</if>
-#end
-#end
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
- <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">#{$column.javaField},</if>
-#end
-#end
- </trim>
- </insert>
-
- <update id="update${ClassName}" parameterType="${ClassName}">
- update ${tableName}
- <trim prefix="SET" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName)
- <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName = #{$column.javaField},</if>
-#end
-#end
- </trim>
- where ${pkColumn.columnName} = #{${pkColumn.javaField}}
- </update>
-
- <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
- delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
- </delete>
-
- <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
- delete from ${tableName} where ${pkColumn.columnName} in
- <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">
- #{${pkColumn.javaField}}
- </foreach>
- </delete>
-#if($table.sub)
-
- <delete id="delete${subClassName}By${subTableFkClassName}s" parameterType="String">
- delete from ${subTableName} where ${subTableFkName} in
- <foreach item="${subTableFkclassName}" collection="array" open="(" separator="," close=")">
- #{${subTableFkclassName}}
- </foreach>
- </delete>
-
- <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}">
- delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}
- </delete>
-
- <insert id="batch${subClassName}">
- insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values
- <foreach item="item" index="index" collection="list" separator=",">
- (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end)
- </foreach>
- </insert>
-#end
-</mapper>
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/static/report-template.docx" "b/$\173project.build.directory\175/classes/static/report-template.docx"
deleted file mode 100644
index 6824a62..0000000
--- "a/$\173project.build.directory\175/classes/static/report-template.docx"
+++ /dev/null
Binary files differ
diff --git "a/$\173project.build.directory\175/classes/vm/java/controller.java.vm" "b/$\173project.build.directory\175/classes/vm/java/controller.java.vm"
deleted file mode 100644
index f72e991..0000000
--- "a/$\173project.build.directory\175/classes/vm/java/controller.java.vm"
+++ /dev/null
@@ -1,115 +0,0 @@
-package ${packageName}.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import ${packageName}.domain.${ClassName};
-import ${packageName}.service.I${ClassName}Service;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-#if($table.crud || $table.sub)
-import com.ruoyi.framework.web.page.TableDataInfo;
-#elseif($table.tree)
-#end
-
-/**
- * ${functionName}Controller
- *
- * @author ${author}
- * @date ${datetime}
- */
-@RestController
-@RequestMapping("/${moduleName}/${businessName}")
-public class ${ClassName}Controller extends BaseController
-{
- @Autowired
- private I${ClassName}Service ${className}Service;
-
- /**
- * 鏌ヨ${functionName}鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
- @GetMapping("/list")
-#if($table.crud || $table.sub)
- public TableDataInfo list(${ClassName} ${className})
- {
- startPage();
- List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
- return getDataTable(list);
- }
-#elseif($table.tree)
- public AjaxResult list(${ClassName} ${className})
- {
- List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
- return success(list);
- }
-#end
-
- /**
- * 瀵煎嚭${functionName}鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
- @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, ${ClassName} ${className})
- {
- List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
- ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
- util.exportExcel(response, list, "${functionName}鏁版嵁");
- }
-
- /**
- * 鑾峰彇${functionName}璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
- @GetMapping(value = "/{${pkColumn.javaField}}")
- public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
- {
- return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
- }
-
- /**
- * 鏂板${functionName}
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
- @Log(title = "${functionName}", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody ${ClassName} ${className})
- {
- return toAjax(${className}Service.insert${ClassName}(${className}));
- }
-
- /**
- * 淇敼${functionName}
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
- @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody ${ClassName} ${className})
- {
- return toAjax(${className}Service.update${ClassName}(${className}));
- }
-
- /**
- * 鍒犻櫎${functionName}
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
- @Log(title = "${functionName}", businessType = BusinessType.DELETE)
- @DeleteMapping("/{${pkColumn.javaField}s}")
- public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
- {
- return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
- }
-}
diff --git "a/$\173project.build.directory\175/classes/vm/java/domain.java.vm" "b/$\173project.build.directory\175/classes/vm/java/domain.java.vm"
deleted file mode 100644
index 1339c3a..0000000
--- "a/$\173project.build.directory\175/classes/vm/java/domain.java.vm"
+++ /dev/null
@@ -1,112 +0,0 @@
-package ${packageName}.domain;
-
-#foreach ($import in $importList)
-import ${import};
-#end
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.rchuing.sis.common.annotation.Excel;
-#if($table.crud || $table.sub)
-import com.rchuing.sis.common.core.domain.BaseEntity;
-#elseif($table.tree)
-import com.fenghuang.common.core.domain.TreeEntity;
-#end
-
-/**
- * ${functionName}瀵硅薄 ${tableName}
- *
- * @author ${author}
- * @date ${datetime}
- */
-#if($table.crud || $table.sub)
- #set($Entity="BaseEntity")
-#elseif($table.tree)
- #set($Entity="TreeEntity")
-#end
-@TableName(resultMap = "${packageName}.mapper.${ClassName}Mapper.${ClassName}Result")
-public class ${ClassName} extends ${Entity}
- {
-private static final long serialVersionUID = 1L;
-
-#foreach ($column in $columns)
- #if(!$table.isSuperColumn($column.javaField))
- /** $column.columnComment */
- #if($column.list)
- #set($parentheseIndex=$column.columnComment.indexOf("锛�"))
- #if($parentheseIndex != -1)
- #set($comment=$column.columnComment.substring(0, $parentheseIndex))
- #else
- #set($comment=$column.columnComment)
- #end
- #if($parentheseIndex != -1)
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- #elseif($column.javaType == 'Date')
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
- #else
- @Excel(name = "${comment}")
- #end
- #end
- #if($column.isPk == 1)
- @TableId(value = "$column.columnName",type = IdType.AUTO)
- #end
- private $column.javaType $column.javaField;
-
- #end
-#end
-#if($table.sub)
-/** $table.subTable.functionName淇℃伅 */
-private List<${subClassName}> ${subclassName}List;
-
-#end
-#foreach ($column in $columns)
- #if(!$table.isSuperColumn($column.javaField))
- #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
- #set($AttrName=$column.javaField)
- #else
- #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- #end
- public void set${AttrName}($column.javaType $column.javaField)
- {
- this.$column.javaField = $column.javaField;
- }
-
- public $column.javaType get${AttrName}()
- {
- return $column.javaField;
- }
- #end
-#end
-
-#if($table.sub)
-public List<${subClassName}> get${subClassName}List()
- {
- return ${subclassName}List;
- }
-
-public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
- {
- this.${subclassName}List = ${subclassName}List;
- }
-
-#end
-@Override
-public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- #foreach ($column in $columns)
- #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
- #set($AttrName=$column.javaField)
- #else
- #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- #end
- .append("${column.javaField}", get${AttrName}())
- #end
- #if($table.sub)
- .append("${subclassName}List", get${subClassName}List())
- #end
- .toString();
- }
- }
diff --git "a/$\173project.build.directory\175/classes/vm/java/mapper.java.vm" "b/$\173project.build.directory\175/classes/vm/java/mapper.java.vm"
deleted file mode 100644
index 1435b4e..0000000
--- "a/$\173project.build.directory\175/classes/vm/java/mapper.java.vm"
+++ /dev/null
@@ -1,91 +0,0 @@
-package ${packageName}.mapper;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import ${packageName}.domain.${ClassName};
-#if($table.sub)
-import ${packageName}.domain.${subClassName};
-#end
-
-/**
- * ${functionName}Mapper鎺ュ彛
- *
- * @author ${author}
- * @date ${datetime}
- */
-public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> {
- /**
- * 鏌ヨ${functionName}
- *
- * @param ${pkColumn.javaField} ${functionName}涓婚敭
- * @return ${functionName}
- */
- public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
-
- /**
- * 鏌ヨ${functionName}鍒楄〃
- *
- * @param ${className} ${functionName}
- * @return ${functionName}闆嗗悎
- */
- public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
-
- /**
- * 鏂板${functionName}
- *
- * @param ${className} ${functionName}
- * @return 缁撴灉
- */
- public int insert${ClassName}(${ClassName} ${className});
-
- /**
- * 淇敼${functionName}
- *
- * @param ${className} ${functionName}
- * @return 缁撴灉
- */
- public int update${ClassName}(${ClassName} ${className});
-
- /**
- * 鍒犻櫎${functionName}
- *
- * @param ${pkColumn.javaField} ${functionName}涓婚敭
- * @return 缁撴灉
- */
- public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
-
- /**
- * 鎵归噺鍒犻櫎${functionName}
- *
- * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
- #if($table.sub)
-
- /**
- * 鎵归噺鍒犻櫎${subTable.functionName}
- *
- * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
-
- /**
- * 鎵归噺鏂板${subTable.functionName}
- *
- * @param ${subclassName}List ${subTable.functionName}鍒楄〃
- * @return 缁撴灉
- */
- public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
-
-
- /**
- * 閫氳繃${functionName}涓婚敭鍒犻櫎${subTable.functionName}淇℃伅
- *
- * @param ${pkColumn.javaField} ${functionName}ID
- * @return 缁撴灉
- */
- public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
- #end
-}
diff --git "a/$\173project.build.directory\175/classes/vm/java/service.java.vm" "b/$\173project.build.directory\175/classes/vm/java/service.java.vm"
deleted file mode 100644
index 149a552..0000000
--- "a/$\173project.build.directory\175/classes/vm/java/service.java.vm"
+++ /dev/null
@@ -1,61 +0,0 @@
-package ${packageName}.service;
-
-import java.util.List;
-import ${packageName}.domain.${ClassName};
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * ${functionName}Service鎺ュ彛
- *
- * @author ${author}
- * @date ${datetime}
- */
-public interface I${ClassName}Service extends IService<${ClassName}> {
- /**
- * 鏌ヨ${functionName}
- *
- * @param ${pkColumn.javaField} ${functionName}涓婚敭
- * @return ${functionName}
- */
- public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
-
- /**
- * 鏌ヨ${functionName}鍒楄〃
- *
- * @param ${className} ${functionName}
- * @return ${functionName}闆嗗悎
- */
- public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
-
- /**
- * 鏂板${functionName}
- *
- * @param ${className} ${functionName}
- * @return 缁撴灉
- */
- public int insert${ClassName}(${ClassName} ${className});
-
- /**
- * 淇敼${functionName}
- *
- * @param ${className} ${functionName}
- * @return 缁撴灉
- */
- public int update${ClassName}(${ClassName} ${className});
-
- /**
- * 鎵归噺鍒犻櫎${functionName}
- *
- * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑${functionName}涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
-
- /**
- * 鍒犻櫎${functionName}淇℃伅
- *
- * @param ${pkColumn.javaField} ${functionName}涓婚敭
- * @return 缁撴灉
- */
- public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
-}
diff --git "a/$\173project.build.directory\175/classes/vm/java/serviceImpl.java.vm" "b/$\173project.build.directory\175/classes/vm/java/serviceImpl.java.vm"
deleted file mode 100644
index e16007f..0000000
--- "a/$\173project.build.directory\175/classes/vm/java/serviceImpl.java.vm"
+++ /dev/null
@@ -1,162 +0,0 @@
-package ${packageName}.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import java.util.List;
- #foreach ($column in $columns)
- #if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
- import com.rchuing.common.utils.DateUtils;
- #break
- #end
- #end
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
- #if($table.sub)
- import java.util.ArrayList;
- import com.rchuing.common.utils.StringUtils;
- import org.springframework.transaction.annotation.Transactional;
- import ${packageName}.domain.${subClassName};
- #end
-import ${packageName}.mapper.${ClassName}Mapper;
-import ${packageName}.domain.${ClassName};
-import ${packageName}.service.I${ClassName}Service;
-
-/**
- * ${functionName}Service涓氬姟灞傚鐞�
- *
- * @author ${author}
- * @date ${datetime}
- */
-@Service
-public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service {
- @Autowired
- private ${ClassName}Mapper ${className}Mapper;
-
- /**
- * 鏌ヨ${functionName}
- *
- * @param ${pkColumn.javaField} ${functionName}涓婚敭
- * @return ${functionName}
- */
- @Override
- public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
- return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
- }
-
- /**
- * 鏌ヨ${functionName}鍒楄〃
- *
- * @param ${className} ${functionName}
- * @return ${functionName}
- */
- @Override
- public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) {
- return ${className}Mapper.select${ClassName}List(${className});
- }
-
- /**
- * 鏂板${functionName}
- *
- * @param ${className} ${functionName}
- * @return 缁撴灉
- */
- #if($table.sub)
- @Transactional
- #end
- @Override
- public int insert${ClassName}(${ClassName} ${className}) {
- #foreach ($column in $columns)
- #if($column.javaField == 'createTime')
- ${className}.setCreateTime(DateUtils.getNowDate());
- #end
- #end
- #if($table.sub)
- int rows = ${className}Mapper.insert${ClassName}(${className});
- insert${subClassName}(${className});
- return rows;
- #else
- return ${className}Mapper.insert${ClassName}(${className});
- #end
- }
-
- /**
- * 淇敼${functionName}
- *
- * @param ${className} ${functionName}
- * @return 缁撴灉
- */
- #if($table.sub)
- @Transactional
- #end
- @Override
- public int update${ClassName}(${ClassName} ${className}) {
- #foreach ($column in $columns)
- #if($column.javaField == 'updateTime')
- ${className}.setUpdateTime(DateUtils.getNowDate());
- #end
- #end
- #if($table.sub)
- ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
- insert${subClassName}(${className});
- #end
- return ${className}Mapper.update${ClassName}(${className});
- }
-
- /**
- * 鎵归噺鍒犻櫎${functionName}
- *
- * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑${functionName}涓婚敭
- * @return 缁撴灉
- */
- #if($table.sub)
- @Transactional
- #end
- @Override
- public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) {
- #if($table.sub)
- ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
- #end
- return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
- }
-
- /**
- * 鍒犻櫎${functionName}淇℃伅
- *
- * @param ${pkColumn.javaField} ${functionName}涓婚敭
- * @return 缁撴灉
- */
- #if($table.sub)
- @Transactional
- #end
- @Override
- public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
- #if($table.sub)
- ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
- #end
- return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
- }
- #if($table.sub)
-
- /**
- * 鏂板${subTable.functionName}淇℃伅
- *
- * @param ${className} ${functionName}瀵硅薄
- */
- public void insert${subClassName}(${ClassName} ${className}) {
- List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
- ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
- if (StringUtils.isNotNull(${subclassName}List))
- {
- List<${subClassName}> list = new ArrayList<${subClassName}>();
- for (${subClassName} ${subclassName} : ${subclassName}List)
- {
- ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField});
- list.add(${subclassName});
- }
- if (list.size() > 0)
- {
- ${className}Mapper.batch${subClassName}(list);
- }
- }
- }
- #end
-}
diff --git "a/$\173project.build.directory\175/classes/vm/java/sub-domain.java.vm" "b/$\173project.build.directory\175/classes/vm/java/sub-domain.java.vm"
deleted file mode 100644
index bd6247d..0000000
--- "a/$\173project.build.directory\175/classes/vm/java/sub-domain.java.vm"
+++ /dev/null
@@ -1,73 +0,0 @@
-package ${packageName}.domain;
-
- #foreach ($import in $subImportList)
- import ${import};
- #end
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.rchuing.common.annotation.Excel;
-import com.rchuing.common.core.domain.BaseEntity;
-
-/**
- * ${subTable.functionName}瀵硅薄 ${subTableName}
- *
- * @author ${author}
- * @date ${datetime}
- */
-public class ${subClassName} extends BaseEntity {
-private static final long serialVersionUID = 1L;
-
-#foreach ($column in $subTable.columns)
- #if(!$table.isSuperColumn($column.javaField))
- /** $column.columnComment */
- #if($column.list)
- #set($parentheseIndex=$column.columnComment.indexOf("锛�"))
- #if($parentheseIndex != -1)
- #set($comment=$column.columnComment.substring(0, $parentheseIndex))
- #else
- #set($comment=$column.columnComment)
- #end
- #if($parentheseIndex != -1)
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- #elseif($column.javaType == 'Date')
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
- #else
- @Excel(name = "${comment}")
- #end
- #end
- private $column.javaType $column.javaField;
-
- #end
-#end
-#foreach ($column in $subTable.columns)
- #if(!$table.isSuperColumn($column.javaField))
- #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
- #set($AttrName=$column.javaField)
- #else
- #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- #end
- public void set${AttrName}($column.javaType $column.javaField) {
- this.$column.javaField = $column.javaField;
- }
-
- public $column.javaType get${AttrName}() {
- return $column.javaField;
- }
- #end
-#end
-
-@Override
-public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- #foreach ($column in $subTable.columns)
- #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
- #set($AttrName=$column.javaField)
- #else
- #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- #end
- .append("${column.javaField}", get${AttrName}())
- #end
- .toString();
- }
- }
diff --git "a/$\173project.build.directory\175/classes/vm/js/api.js.vm" "b/$\173project.build.directory\175/classes/vm/js/api.js.vm"
deleted file mode 100644
index 9295524..0000000
--- "a/$\173project.build.directory\175/classes/vm/js/api.js.vm"
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 鏌ヨ${functionName}鍒楄〃
-export function list${BusinessName}(query) {
- return request({
- url: '/${moduleName}/${businessName}/list',
- method: 'get',
- params: query
- })
-}
-
-// 鏌ヨ${functionName}璇︾粏
-export function get${BusinessName}(${pkColumn.javaField}) {
- return request({
- url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
- method: 'get'
- })
-}
-
-// 鏂板${functionName}
-export function add${BusinessName}(data) {
- return request({
- url: '/${moduleName}/${businessName}',
- method: 'post',
- data: data
- })
-}
-
-// 淇敼${functionName}
-export function update${BusinessName}(data) {
- return request({
- url: '/${moduleName}/${businessName}',
- method: 'put',
- data: data
- })
-}
-
-// 鍒犻櫎${functionName}
-export function del${BusinessName}(${pkColumn.javaField}) {
- return request({
- url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
- method: 'delete'
- })
-}
diff --git "a/$\173project.build.directory\175/classes/vm/sql/sql.vm" "b/$\173project.build.directory\175/classes/vm/sql/sql.vm"
deleted file mode 100644
index 0575583..0000000
--- "a/$\173project.build.directory\175/classes/vm/sql/sql.vm"
+++ /dev/null
@@ -1,22 +0,0 @@
--- 鑿滃崟 SQL
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, '${functionName}鑿滃崟');
-
--- 鎸夐挳鐖惰彍鍗旾D
-SELECT @parentId := LAST_INSERT_ID();
-
--- 鎸夐挳 SQL
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}鏌ヨ', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', sysdate(), '', null, '');
-
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}鏂板', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', sysdate(), '', null, '');
-
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}淇敼', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', sysdate(), '', null, '');
-
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}鍒犻櫎', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', sysdate(), '', null, '');
-
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}瀵煎嚭', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', sysdate(), '', null, '');
\ No newline at end of file
diff --git "a/$\173project.build.directory\175/classes/vm/vue/index-tree.vue.vm" "b/$\173project.build.directory\175/classes/vm/vue/index-tree.vue.vm"
deleted file mode 100644
index 4e35fc9..0000000
--- "a/$\173project.build.directory\175/classes/vm/vue/index-tree.vue.vm"
+++ /dev/null
@@ -1,505 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-input
- v-model="queryParams.${column.javaField}"
- placeholder="璇疯緭鍏�${comment}"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
- <el-option
- v-for="dict in dict.type.${dictType}"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-date-picker clearable
- v-model="queryParams.${column.javaField}"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="閫夋嫨${comment}">
- </el-date-picker>
- </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- <el-form-item label="${comment}">
- <el-date-picker
- v-model="daterange${AttrName}"
- style="width: 240px"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
- </el-form-item>
-#end
-#end
-#end
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['${permissionPrefix}:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="info"
- plain
- icon="el-icon-sort"
- size="mini"
- @click="toggleExpandAll"
- >灞曞紑/鎶樺彔</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table
- v-if="refreshTable"
- v-loading="loading"
- :data="${businessName}List"
- row-key="${treeCode}"
- :default-expand-all="isExpandAll"
- :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
- >
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
-#elseif($column.list && $column.htmlType == "datetime")
- <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
- <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
- <template slot-scope="scope">
- <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
- </template>
- </el-table-column>
-#elseif($column.list && "" != $column.dictType)
- <el-table-column label="${comment}" align="center" prop="${javaField}">
- <template slot-scope="scope">
-#if($column.htmlType == "checkbox")
- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
-#end
- </template>
- </el-table-column>
-#elseif($column.list && "" != $javaField)
-#if(${foreach.index} == 1)
- <el-table-column label="${comment}" prop="${javaField}" />
-#else
- <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#end
-#end
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['${permissionPrefix}:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-plus"
- @click="handleAdd(scope.row)"
- v-hasPermi="['${permissionPrefix}:add']"
- >鏂板</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['${permissionPrefix}:remove']"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <!-- 娣诲姞鎴栦慨鏀�${functionName}瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$column.pk)
-#if(($column.usableColumn) || (!$column.superColumn))
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if("" != $treeParentCode && $column.javaField == $treeParentCode)
- <el-form-item label="${comment}" prop="${treeParentCode}">
- <treeselect v-model="form.${treeParentCode}" :options="${businessName}Options" :normalizer="normalizer" placeholder="璇烽�夋嫨${comment}" />
- </el-form-item>
-#elseif($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" placeholder="璇疯緭鍏�${comment}" />
- </el-form-item>
-#elseif($column.htmlType == "imageUpload")
- <el-form-item label="${comment}" prop="${field}">
- <image-upload v-model="form.${field}"/>
- </el-form-item>
-#elseif($column.htmlType == "fileUpload")
- <el-form-item label="${comment}" prop="${field}">
- <file-upload v-model="form.${field}"/>
- </el-form-item>
-#elseif($column.htmlType == "editor")
- <el-form-item label="${comment}">
- <editor v-model="form.${field}" :min-height="192"/>
- </el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
- <el-option
- v-for="dict in dict.type.${dictType}"
- :key="dict.value"
- :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
- :value="parseInt(dict.value)"
-#else
- :value="dict.value"
-#end
- ></el-option>
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox
- v-for="dict in dict.type.${dictType}"
- :key="dict.value"
- :label="dict.value">
- {{dict.label}}
- </el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "checkbox" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox>璇烽�夋嫨瀛楀吀鐢熸垚</el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "radio" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-radio-group v-model="form.${field}">
- <el-radio
- v-for="dict in dict.type.${dictType}"
- :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
- :label="parseInt(dict.value)"
-#else
- :label="dict.value"
-#end
- >{{dict.label}}</el-radio>
- </el-radio-group>
- </el-form-item>
-#elseif($column.htmlType == "radio" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-radio-group v-model="form.${field}">
- <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
- </el-radio-group>
- </el-form-item>
-#elseif($column.htmlType == "datetime")
- <el-form-item label="${comment}" prop="${field}">
- <el-date-picker clearable
- v-model="form.${field}"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="閫夋嫨${comment}">
- </el-date-picker>
- </el-form-item>
-#elseif($column.htmlType == "textarea")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
-#end
-#end
-#end
-#end
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-import Treeselect from "@riophae/vue-treeselect"
-import "@riophae/vue-treeselect/dist/vue-treeselect.css"
-
-export default {
- name: "${BusinessName}",
-#if(${dicts} != '')
- dicts: [${dicts}],
-#end
- components: {
- Treeselect
- },
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // ${functionName}琛ㄦ牸鏁版嵁
- ${businessName}List: [],
- // ${functionName}鏍戦�夐」
- ${businessName}Options: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 鏄惁灞曞紑锛岄粯璁ゅ叏閮ㄥ睍寮�
- isExpandAll: true,
- // 閲嶆柊娓叉煋琛ㄦ牸鐘舵��
- refreshTable: true,
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- // $comment鏃堕棿鑼冨洿
- daterange${AttrName}: [],
-#end
-#end
- // 鏌ヨ鍙傛暟
- queryParams: {
-#foreach ($column in $columns)
-#if($column.query)
- $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
-#foreach ($column in $columns)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
- $column.javaField: [
- { required: true, message: "$comment涓嶈兘涓虹┖", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
- ]#if($foreach.count != $columns.size()),#end
-#end
-#end
- }
- }
- },
- created() {
- this.getList()
- },
- methods: {
- /** 鏌ヨ${functionName}鍒楄〃 */
- getList() {
- this.loading = true
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- this.queryParams.params = {}
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
- this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0]
- this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1]
- }
-#end
-#end
- list${BusinessName}(this.queryParams).then(response => {
- this.${businessName}List = this.handleTree(response.data, "${treeCode}", "${treeParentCode}")
- this.loading = false
- })
- },
- /** 杞崲${functionName}鏁版嵁缁撴瀯 */
- normalizer(node) {
- if (node.children && !node.children.length) {
- delete node.children
- }
- return {
- id: node.${treeCode},
- label: node.${treeName},
- children: node.children
- }
- },
- /** 鏌ヨ${functionName}涓嬫媺鏍戠粨鏋� */
- getTreeselect() {
- list${BusinessName}().then(response => {
- this.${businessName}Options = []
- const data = { ${treeCode}: 0, ${treeName}: '椤剁骇鑺傜偣', children: [] }
- data.children = this.handleTree(response.data, "${treeCode}", "${treeParentCode}")
- this.${businessName}Options.push(data)
- })
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false
- this.reset()
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- $column.javaField: []#if($foreach.count != $columns.size()),#end
-#else
- $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
- }
- this.resetForm("form")
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.getList()
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- this.daterange${AttrName} = []
-#end
-#end
- this.resetForm("queryForm")
- this.handleQuery()
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd(row) {
- this.reset()
- this.getTreeselect()
- if (row != null && row.${treeCode}) {
- this.form.${treeParentCode} = row.${treeCode}
- } else {
- this.form.${treeParentCode} = 0
- }
- this.open = true
- this.title = "娣诲姞${functionName}"
- },
- /** 灞曞紑/鎶樺彔鎿嶄綔 */
- toggleExpandAll() {
- this.refreshTable = false
- this.isExpandAll = !this.isExpandAll
- this.$nextTick(() => {
- this.refreshTable = true
- })
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset()
- this.getTreeselect()
- if (row != null) {
- this.form.${treeParentCode} = row.${treeParentCode}
- }
- get${BusinessName}(row.${pkColumn.javaField}).then(response => {
- this.form = response.data
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- this.form.$column.javaField = this.form.${column.javaField}.split(",")
-#end
-#end
- this.open = true
- this.title = "淇敼${functionName}"
- })
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.#[[$]]#refs["form"].validate(valid => {
- if (valid) {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- this.form.$column.javaField = this.form.${column.javaField}.join(",")
-#end
-#end
- if (this.form.${pkColumn.javaField} != null) {
- update${BusinessName}(this.form).then(response => {
- this.#[[$modal]]#.msgSuccess("淇敼鎴愬姛")
- this.open = false
- this.getList()
- })
- } else {
- add${BusinessName}(this.form).then(response => {
- this.#[[$modal]]#.msgSuccess("鏂板鎴愬姛")
- this.open = false
- this.getList()
- })
- }
- }
- })
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- this.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + row.${pkColumn.javaField} + '"鐨勬暟鎹」锛�').then(function() {
- return del${BusinessName}(row.${pkColumn.javaField})
- }).then(() => {
- this.getList()
- this.#[[$modal]]#.msgSuccess("鍒犻櫎鎴愬姛")
- }).catch(() => {})
- }
- }
-}
-</script>
diff --git "a/$\173project.build.directory\175/classes/vm/vue/index.vue.vm" "b/$\173project.build.directory\175/classes/vm/vue/index.vue.vm"
deleted file mode 100644
index 04ebe16..0000000
--- "a/$\173project.build.directory\175/classes/vm/vue/index.vue.vm"
+++ /dev/null
@@ -1,602 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-input
- v-model="queryParams.${column.javaField}"
- placeholder="璇疯緭鍏�${comment}"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
- <el-option
- v-for="dict in dict.type.${dictType}"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-date-picker clearable
- v-model="queryParams.${column.javaField}"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨${comment}">
- </el-date-picker>
- </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- <el-form-item label="${comment}">
- <el-date-picker
- v-model="daterange${AttrName}"
- style="width: 240px"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
- </el-form-item>
-#end
-#end
-#end
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['${permissionPrefix}:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['${permissionPrefix}:edit']"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['${permissionPrefix}:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['${permissionPrefix}:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
- <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#elseif($column.list && $column.htmlType == "datetime")
- <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
- <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
- <template slot-scope="scope">
- <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
- </template>
- </el-table-column>
-#elseif($column.list && "" != $column.dictType)
- <el-table-column label="${comment}" align="center" prop="${javaField}">
- <template slot-scope="scope">
-#if($column.htmlType == "checkbox")
- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
-#end
- </template>
- </el-table-column>
-#elseif($column.list && "" != $javaField)
- <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#end
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['${permissionPrefix}:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['${permissionPrefix}:remove']"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
-
- <!-- 娣诲姞鎴栦慨鏀�${functionName}瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$column.pk)
-#if(($column.usableColumn) || (!$column.superColumn))
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" placeholder="璇疯緭鍏�${comment}" />
- </el-form-item>
-#elseif($column.htmlType == "imageUpload")
- <el-form-item label="${comment}" prop="${field}">
- <image-upload v-model="form.${field}"/>
- </el-form-item>
-#elseif($column.htmlType == "fileUpload")
- <el-form-item label="${comment}" prop="${field}">
- <file-upload v-model="form.${field}"/>
- </el-form-item>
-#elseif($column.htmlType == "editor")
- <el-form-item label="${comment}">
- <editor v-model="form.${field}" :min-height="192"/>
- </el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
- <el-option
- v-for="dict in dict.type.${dictType}"
- :key="dict.value"
- :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
- :value="parseInt(dict.value)"
-#else
- :value="dict.value"
-#end
- ></el-option>
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox
- v-for="dict in dict.type.${dictType}"
- :key="dict.value"
- :label="dict.value">
- {{dict.label}}
- </el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "checkbox" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox>璇烽�夋嫨瀛楀吀鐢熸垚</el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "radio" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-radio-group v-model="form.${field}">
- <el-radio
- v-for="dict in dict.type.${dictType}"
- :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
- :label="parseInt(dict.value)"
-#else
- :label="dict.value"
-#end
- >{{dict.label}}</el-radio>
- </el-radio-group>
- </el-form-item>
-#elseif($column.htmlType == "radio" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-radio-group v-model="form.${field}">
- <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
- </el-radio-group>
- </el-form-item>
-#elseif($column.htmlType == "datetime")
- <el-form-item label="${comment}" prop="${field}">
- <el-date-picker clearable
- v-model="form.${field}"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨${comment}">
- </el-date-picker>
- </el-form-item>
-#elseif($column.htmlType == "textarea")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
-#end
-#end
-#end
-#end
-#if($table.sub)
- <el-divider content-position="center">${subTable.functionName}淇℃伅</el-divider>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}">娣诲姞</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete${subClassName}">鍒犻櫎</el-button>
- </el-col>
- </el-row>
- <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
- <el-table-column type="selection" width="50" align="center" />
- <el-table-column label="搴忓彿" align="center" prop="index" width="50"/>
-#foreach($column in $subTable.columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk || $javaField == ${subTableFkclassName})
-#elseif($column.list && $column.htmlType == "input")
- <el-table-column label="$comment" prop="${javaField}" width="150">
- <template slot-scope="scope">
- <el-input v-model="scope.row.$javaField" placeholder="璇疯緭鍏�$comment" />
- </template>
- </el-table-column>
-#elseif($column.list && $column.htmlType == "datetime")
- <el-table-column label="$comment" prop="${javaField}" width="240">
- <template slot-scope="scope">
- <el-date-picker clearable v-model="scope.row.$javaField" type="date" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨$comment" />
- </template>
- </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType)
- <el-table-column label="$comment" prop="${javaField}" width="150">
- <template slot-scope="scope">
- <el-select v-model="scope.row.$javaField" placeholder="璇烽�夋嫨$comment">
- <el-option
- v-for="dict in dict.type.$column.dictType"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </template>
- </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType)
- <el-table-column label="$comment" prop="${javaField}" width="150">
- <template slot-scope="scope">
- <el-select v-model="scope.row.$javaField" placeholder="璇烽�夋嫨$comment">
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </template>
- </el-table-column>
-#end
-#end
- </el-table>
-#end
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-
-export default {
- name: "${BusinessName}",
-#if(${dicts} != '')
- dicts: [${dicts}],
-#end
- data() {
- return {
- // 閬僵灞�
- loading: true,
- // 閫変腑鏁扮粍
- ids: [],
-#if($table.sub)
- // 瀛愯〃閫変腑鏁版嵁
- checked${subClassName}: [],
-#end
- // 闈炲崟涓鐢�
- single: true,
- // 闈炲涓鐢�
- multiple: true,
- // 鏄剧ず鎼滅储鏉′欢
- showSearch: true,
- // 鎬绘潯鏁�
- total: 0,
- // ${functionName}琛ㄦ牸鏁版嵁
- ${businessName}List: [],
-#if($table.sub)
- // ${subTable.functionName}琛ㄦ牸鏁版嵁
- ${subclassName}List: [],
-#end
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- // $comment鏃堕棿鑼冨洿
- daterange${AttrName}: [],
-#end
-#end
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
-#foreach ($column in $columns)
-#if($column.query)
- $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
- },
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
-#foreach ($column in $columns)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
- $column.javaField: [
- { required: true, message: "$comment涓嶈兘涓虹┖", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
- ]#if($foreach.count != $columns.size()),#end
-#end
-#end
- }
- }
- },
- created() {
- this.getList()
- },
- methods: {
- /** 鏌ヨ${functionName}鍒楄〃 */
- getList() {
- this.loading = true
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- this.queryParams.params = {}
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
- this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0]
- this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1]
- }
-#end
-#end
- list${BusinessName}(this.queryParams).then(response => {
- this.${businessName}List = response.rows
- this.total = response.total
- this.loading = false
- })
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false
- this.reset()
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- $column.javaField: []#if($foreach.count != $columns.size()),#end
-#else
- $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
- }
-#if($table.sub)
- this.${subclassName}List = []
-#end
- this.resetForm("form")
- },
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1
- this.getList()
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- this.daterange${AttrName} = []
-#end
-#end
- this.resetForm("queryForm")
- this.handleQuery()
- },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.${pkColumn.javaField})
- this.single = selection.length!==1
- this.multiple = !selection.length
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset()
- this.open = true
- this.title = "娣诲姞${functionName}"
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset()
- const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
- get${BusinessName}(${pkColumn.javaField}).then(response => {
- this.form = response.data
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- this.form.$column.javaField = this.form.${column.javaField}.split(",")
-#end
-#end
-#if($table.sub)
- this.${subclassName}List = response.data.${subclassName}List
-#end
- this.open = true
- this.title = "淇敼${functionName}"
- })
- },
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.#[[$]]#refs["form"].validate(valid => {
- if (valid) {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- this.form.$column.javaField = this.form.${column.javaField}.join(",")
-#end
-#end
-#if($table.sub)
- this.form.${subclassName}List = this.${subclassName}List
-#end
- if (this.form.${pkColumn.javaField} != null) {
- update${BusinessName}(this.form).then(response => {
- this.#[[$modal]]#.msgSuccess("淇敼鎴愬姛")
- this.open = false
- this.getList()
- })
- } else {
- add${BusinessName}(this.form).then(response => {
- this.#[[$modal]]#.msgSuccess("鏂板鎴愬姛")
- this.open = false
- this.getList()
- })
- }
- }
- })
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids
- this.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + ${pkColumn.javaField}s + '"鐨勬暟鎹」锛�').then(function() {
- return del${BusinessName}(${pkColumn.javaField}s)
- }).then(() => {
- this.getList()
- this.#[[$modal]]#.msgSuccess("鍒犻櫎鎴愬姛")
- }).catch(() => {})
- },
-#if($table.sub)
- /** ${subTable.functionName}搴忓彿 */
- row${subClassName}Index({ row, rowIndex }) {
- row.index = rowIndex + 1
- },
- /** ${subTable.functionName}娣诲姞鎸夐挳鎿嶄綔 */
- handleAdd${subClassName}() {
- let obj = {}
-#foreach($column in $subTable.columns)
-#if($column.pk || $column.javaField == ${subTableFkclassName})
-#elseif($column.list && "" != $javaField)
- obj.$column.javaField = ""
-#end
-#end
- this.${subclassName}List.push(obj)
- },
- /** ${subTable.functionName}鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete${subClassName}() {
- if (this.checked${subClassName}.length == 0) {
- this.#[[$modal]]#.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑${subTable.functionName}鏁版嵁")
- } else {
- const ${subclassName}List = this.${subclassName}List
- const checked${subClassName} = this.checked${subClassName}
- this.${subclassName}List = ${subclassName}List.filter(function(item) {
- return checked${subClassName}.indexOf(item.index) == -1
- })
- }
- },
- /** 澶嶉�夋閫変腑鏁版嵁 */
- handle${subClassName}SelectionChange(selection) {
- this.checked${subClassName} = selection.map(item => item.index)
- },
-#end
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('${moduleName}/${businessName}/export', {
- ...this.queryParams
- }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
- }
- }
-}
-</script>
diff --git "a/$\173project.build.directory\175/classes/vm/vue/v3/index-tree.vue.vm" "b/$\173project.build.directory\175/classes/vm/vue/v3/index-tree.vue.vm"
deleted file mode 100644
index 765a5e3..0000000
--- "a/$\173project.build.directory\175/classes/vm/vue/v3/index-tree.vue.vm"
+++ /dev/null
@@ -1,474 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-input
- v-model="queryParams.${column.javaField}"
- placeholder="璇疯緭鍏�${comment}"
- clearable
- @keyup.enter="handleQuery"
- />
- </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
- <el-option
- v-for="dict in ${dictType}"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-date-picker clearable
- v-model="queryParams.${column.javaField}"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="閫夋嫨${comment}">
- </el-date-picker>
- </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- <el-form-item label="${comment}" style="width: 308px">
- <el-date-picker
- v-model="daterange${AttrName}"
- value-format="YYYY-MM-DD"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
- </el-form-item>
-#end
-#end
-#end
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="handleAdd"
- v-hasPermi="['${permissionPrefix}:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="info"
- plain
- icon="Sort"
- @click="toggleExpandAll"
- >灞曞紑/鎶樺彔</el-button>
- </el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table
- v-if="refreshTable"
- v-loading="loading"
- :data="${businessName}List"
- row-key="${treeCode}"
- :default-expand-all="isExpandAll"
- :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
- >
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
-#elseif($column.list && $column.htmlType == "datetime")
- <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
- <template #default="scope">
- <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
- <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
- <template #default="scope">
- <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
- </template>
- </el-table-column>
-#elseif($column.list && "" != $column.dictType)
- <el-table-column label="${comment}" align="center" prop="${javaField}">
- <template #default="scope">
-#if($column.htmlType == "checkbox")
- <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
- <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
-#end
- </template>
- </el-table-column>
-#elseif($column.list && "" != $javaField)
-#if(${foreach.index} == 1)
- <el-table-column label="${comment}" prop="${javaField}" />
-#else
- <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#end
-#end
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template #default="scope">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">淇敼</el-button>
- <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['${permissionPrefix}:add']">鏂板</el-button>
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <!-- 娣诲姞鎴栦慨鏀�${functionName}瀵硅瘽妗� -->
- <el-dialog :title="title" v-model="open" width="500px" append-to-body>
- <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$column.pk)
-#if(($column.usableColumn) || (!$column.superColumn))
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if("" != $treeParentCode && $column.javaField == $treeParentCode)
- <el-form-item label="${comment}" prop="${treeParentCode}">
- <el-tree-select
- v-model="form.${treeParentCode}"
- :data="${businessName}Options"
- :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
- value-key="${treeCode}"
- placeholder="璇烽�夋嫨${comment}"
- check-strictly
- />
- </el-form-item>
-#elseif($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" placeholder="璇疯緭鍏�${comment}" />
- </el-form-item>
-#elseif($column.htmlType == "imageUpload")
- <el-form-item label="${comment}" prop="${field}">
- <image-upload v-model="form.${field}"/>
- </el-form-item>
-#elseif($column.htmlType == "fileUpload")
- <el-form-item label="${comment}" prop="${field}">
- <file-upload v-model="form.${field}"/>
- </el-form-item>
-#elseif($column.htmlType == "editor")
- <el-form-item label="${comment}">
- <editor v-model="form.${field}" :min-height="192"/>
- </el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
- <el-option
- v-for="dict in ${dictType}"
- :key="dict.value"
- :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
- :value="parseInt(dict.value)"
-#else
- :value="dict.value"
-#end
- ></el-option>
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox
- v-for="dict in ${dictType}"
- :key="dict.value"
- :label="dict.value">
- {{dict.label}}
- </el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "checkbox" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox>璇烽�夋嫨瀛楀吀鐢熸垚</el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "radio" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-radio-group v-model="form.${field}">
- <el-radio
- v-for="dict in ${dictType}"
- :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
- :label="parseInt(dict.value)"
-#else
- :label="dict.value"
-#end
- >{{dict.label}}</el-radio>
- </el-radio-group>
- </el-form-item>
-#elseif($column.htmlType == "radio" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-radio-group v-model="form.${field}">
- <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
- </el-radio-group>
- </el-form-item>
-#elseif($column.htmlType == "datetime")
- <el-form-item label="${comment}" prop="${field}">
- <el-date-picker clearable
- v-model="form.${field}"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="閫夋嫨${comment}">
- </el-date-picker>
- </el-form-item>
-#elseif($column.htmlType == "textarea")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
-#end
-#end
-#end
-#end
- </el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </template>
- </el-dialog>
- </div>
-</template>
-
-<script setup name="${BusinessName}">
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-
-const { proxy } = getCurrentInstance()
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
-#end
-
-const ${businessName}List = ref([])
-const ${businessName}Options = ref([])
-const open = ref(false)
-const loading = ref(true)
-const showSearch = ref(true)
-const title = ref("")
-const isExpandAll = ref(true)
-const refreshTable = ref(true)
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-const daterange${AttrName} = ref([])
-#end
-#end
-
-const data = reactive({
- form: {},
- queryParams: {
- #foreach ($column in $columns)
-#if($column.query)
- $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
- },
- rules: {
- #foreach ($column in $columns)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
- $column.javaField: [
- { required: true, message: "$comment涓嶈兘涓虹┖", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
- ]#if($foreach.count != $columns.size()),#end
-#end
-#end
- }
-})
-
-const { queryParams, form, rules } = toRefs(data)
-
-/** 鏌ヨ${functionName}鍒楄〃 */
-function getList() {
- loading.value = true
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- queryParams.value.params = {}
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- if (null != daterange${AttrName} && '' != daterange${AttrName}) {
- queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
- queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
- }
-#end
-#end
- list${BusinessName}(queryParams.value).then(response => {
- ${businessName}List.value = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}")
- loading.value = false
- })
-}
-
-/** 鏌ヨ${functionName}涓嬫媺鏍戠粨鏋� */
-function getTreeselect() {
- list${BusinessName}().then(response => {
- ${businessName}Options.value = []
- const data = { ${treeCode}: 0, ${treeName}: '椤剁骇鑺傜偣', children: [] }
- data.children = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}")
- ${businessName}Options.value.push(data)
- })
-}
-
-// 鍙栨秷鎸夐挳
-function cancel() {
- open.value = false
- reset()
-}
-
-// 琛ㄥ崟閲嶇疆
-function reset() {
- form.value = {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- $column.javaField: []#if($foreach.count != $columns.size()),#end
-#else
- $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
- }
- proxy.resetForm("${businessName}Ref")
-}
-
-/** 鎼滅储鎸夐挳鎿嶄綔 */
-function handleQuery() {
- getList()
-}
-
-/** 閲嶇疆鎸夐挳鎿嶄綔 */
-function resetQuery() {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- daterange${AttrName}.value = []
-#end
-#end
- proxy.resetForm("queryRef")
- handleQuery()
-}
-
-/** 鏂板鎸夐挳鎿嶄綔 */
-function handleAdd(row) {
- reset()
- getTreeselect()
- if (row != null && row.${treeCode}) {
- form.value.${treeParentCode} = row.${treeCode}
- } else {
- form.value.${treeParentCode} = 0
- }
- open.value = true
- title.value = "娣诲姞${functionName}"
-}
-
-/** 灞曞紑/鎶樺彔鎿嶄綔 */
-function toggleExpandAll() {
- refreshTable.value = false
- isExpandAll.value = !isExpandAll.value
- nextTick(() => {
- refreshTable.value = true
- })
-}
-
-/** 淇敼鎸夐挳鎿嶄綔 */
-async function handleUpdate(row) {
- reset()
- await getTreeselect()
- if (row != null) {
- form.value.${treeParentCode} = row.${treeParentCode}
- }
- get${BusinessName}(row.${pkColumn.javaField}).then(response => {
- form.value = response.data
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- form.value.$column.javaField = form.value.${column.javaField}.split(",")
-#end
-#end
- open.value = true
- title.value = "淇敼${functionName}"
- })
-}
-
-/** 鎻愪氦鎸夐挳 */
-function submitForm() {
- proxy.#[[$]]#refs["${businessName}Ref"].validate(valid => {
- if (valid) {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- form.value.$column.javaField = form.value.${column.javaField}.join(",")
-#end
-#end
- if (form.value.${pkColumn.javaField} != null) {
- update${BusinessName}(form.value).then(response => {
- proxy.#[[$modal]]#.msgSuccess("淇敼鎴愬姛")
- open.value = false
- getList()
- })
- } else {
- add${BusinessName}(form.value).then(response => {
- proxy.#[[$modal]]#.msgSuccess("鏂板鎴愬姛")
- open.value = false
- getList()
- })
- }
- }
- })
-}
-
-/** 鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete(row) {
- proxy.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + row.${pkColumn.javaField} + '"鐨勬暟鎹」锛�').then(function() {
- return del${BusinessName}(row.${pkColumn.javaField})
- }).then(() => {
- getList()
- proxy.#[[$modal]]#.msgSuccess("鍒犻櫎鎴愬姛")
- }).catch(() => {})
-}
-
-getList()
-</script>
diff --git "a/$\173project.build.directory\175/classes/vm/vue/v3/index.vue.vm" "b/$\173project.build.directory\175/classes/vm/vue/v3/index.vue.vm"
deleted file mode 100644
index 936b465..0000000
--- "a/$\173project.build.directory\175/classes/vm/vue/v3/index.vue.vm"
+++ /dev/null
@@ -1,590 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-input
- v-model="queryParams.${column.javaField}"
- placeholder="璇疯緭鍏�${comment}"
- clearable
- @keyup.enter="handleQuery"
- />
- </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
- <el-option
- v-for="dict in ${dictType}"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable>
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
- <el-form-item label="${comment}" prop="${column.javaField}">
- <el-date-picker clearable
- v-model="queryParams.${column.javaField}"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="璇烽�夋嫨${comment}">
- </el-date-picker>
- </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- <el-form-item label="${comment}" style="width: 308px">
- <el-date-picker
- v-model="daterange${AttrName}"
- value-format="YYYY-MM-DD"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
- </el-form-item>
-#end
-#end
-#end
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="handleAdd"
- v-hasPermi="['${permissionPrefix}:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="Edit"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['${permissionPrefix}:edit']"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="Delete"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['${permissionPrefix}:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="Download"
- @click="handleExport"
- v-hasPermi="['${permissionPrefix}:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
-
- <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
- <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#elseif($column.list && $column.htmlType == "datetime")
- <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
- <template #default="scope">
- <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
- <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
- <template #default="scope">
- <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
- </template>
- </el-table-column>
-#elseif($column.list && "" != $column.dictType)
- <el-table-column label="${comment}" align="center" prop="${javaField}">
- <template #default="scope">
-#if($column.htmlType == "checkbox")
- <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
- <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
-#end
- </template>
- </el-table-column>
-#elseif($column.list && "" != $javaField)
- <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#end
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template #default="scope">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">淇敼</el-button>
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total>0"
- :total="total"
- v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize"
- @pagination="getList"
- />
-
- <!-- 娣诲姞鎴栦慨鏀�${functionName}瀵硅瘽妗� -->
- <el-dialog :title="title" v-model="open" width="500px" append-to-body>
- <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$column.pk)
-#if(($column.usableColumn) || (!$column.superColumn))
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" placeholder="璇疯緭鍏�${comment}" />
- </el-form-item>
-#elseif($column.htmlType == "imageUpload")
- <el-form-item label="${comment}" prop="${field}">
- <image-upload v-model="form.${field}"/>
- </el-form-item>
-#elseif($column.htmlType == "fileUpload")
- <el-form-item label="${comment}" prop="${field}">
- <file-upload v-model="form.${field}"/>
- </el-form-item>
-#elseif($column.htmlType == "editor")
- <el-form-item label="${comment}">
- <editor v-model="form.${field}" :min-height="192"/>
- </el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
- <el-option
- v-for="dict in ${dictType}"
- :key="dict.value"
- :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
- :value="parseInt(dict.value)"
-#else
- :value="dict.value"
-#end
- ></el-option>
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox
- v-for="dict in ${dictType}"
- :key="dict.value"
- :label="dict.value">
- {{dict.label}}
- </el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "checkbox" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox>璇烽�夋嫨瀛楀吀鐢熸垚</el-checkbox>
- </el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "radio" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-radio-group v-model="form.${field}">
- <el-radio
- v-for="dict in ${dictType}"
- :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
- :label="parseInt(dict.value)"
-#else
- :label="dict.value"
-#end
- >{{dict.label}}</el-radio>
- </el-radio-group>
- </el-form-item>
-#elseif($column.htmlType == "radio" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-radio-group v-model="form.${field}">
- <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
- </el-radio-group>
- </el-form-item>
-#elseif($column.htmlType == "datetime")
- <el-form-item label="${comment}" prop="${field}">
- <el-date-picker clearable
- v-model="form.${field}"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="璇烽�夋嫨${comment}">
- </el-date-picker>
- </el-form-item>
-#elseif($column.htmlType == "textarea")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
-#end
-#end
-#end
-#end
-#if($table.sub)
- <el-divider content-position="center">${subTable.functionName}淇℃伅</el-divider>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button type="primary" icon="Plus" @click="handleAdd${subClassName}">娣诲姞</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="danger" icon="Delete" @click="handleDelete${subClassName}">鍒犻櫎</el-button>
- </el-col>
- </el-row>
- <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
- <el-table-column type="selection" width="50" align="center" />
- <el-table-column label="搴忓彿" align="center" prop="index" width="50"/>
-#foreach($column in $subTable.columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk || $javaField == ${subTableFkclassName})
-#elseif($column.list && $column.htmlType == "input")
- <el-table-column label="$comment" prop="${javaField}" width="150">
- <template #default="scope">
- <el-input v-model="scope.row.$javaField" placeholder="璇疯緭鍏�$comment" />
- </template>
- </el-table-column>
-#elseif($column.list && $column.htmlType == "datetime")
- <el-table-column label="$comment" prop="${javaField}" width="240">
- <template #default="scope">
- <el-date-picker clearable
- v-model="scope.row.$javaField"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="璇烽�夋嫨$comment">
- </el-date-picker>
- </template>
- </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType)
- <el-table-column label="$comment" prop="${javaField}" width="150">
- <template #default="scope">
- <el-select v-model="scope.row.$javaField" placeholder="璇烽�夋嫨$comment">
- <el-option
- v-for="dict in $column.dictType"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </template>
- </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType)
- <el-table-column label="$comment" prop="${javaField}" width="150">
- <template #default="scope">
- <el-select v-model="scope.row.$javaField" placeholder="璇烽�夋嫨$comment">
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </template>
- </el-table-column>
-#end
-#end
- </el-table>
-#end
- </el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </template>
- </el-dialog>
- </div>
-</template>
-
-<script setup name="${BusinessName}">
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-
-const { proxy } = getCurrentInstance()
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
-#end
-
-const ${businessName}List = ref([])
-#if($table.sub)
-const ${subclassName}List = ref([])
-#end
-const open = ref(false)
-const loading = ref(true)
-const showSearch = ref(true)
-const ids = ref([])
-#if($table.sub)
-const checked${subClassName} = ref([])
-#end
-const single = ref(true)
-const multiple = ref(true)
-const total = ref(0)
-const title = ref("")
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-const daterange${AttrName} = ref([])
-#end
-#end
-
-const data = reactive({
- form: {},
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- #foreach ($column in $columns)
-#if($column.query)
- $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
- },
- rules: {
- #foreach ($column in $columns)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
- $column.javaField: [
- { required: true, message: "$comment涓嶈兘涓虹┖", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
- ]#if($foreach.count != $columns.size()),#end
-#end
-#end
- }
-})
-
-const { queryParams, form, rules } = toRefs(data)
-
-/** 鏌ヨ${functionName}鍒楄〃 */
-function getList() {
- loading.value = true
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- queryParams.value.params = {}
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- if (null != daterange${AttrName} && '' != daterange${AttrName}) {
- queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
- queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
- }
-#end
-#end
- list${BusinessName}(queryParams.value).then(response => {
- ${businessName}List.value = response.rows
- total.value = response.total
- loading.value = false
- })
-}
-
-// 鍙栨秷鎸夐挳
-function cancel() {
- open.value = false
- reset()
-}
-
-// 琛ㄥ崟閲嶇疆
-function reset() {
- form.value = {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- $column.javaField: []#if($foreach.count != $columns.size()),#end
-#else
- $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
- }
-#if($table.sub)
- ${subclassName}List.value = []
-#end
- proxy.resetForm("${businessName}Ref")
-}
-
-/** 鎼滅储鎸夐挳鎿嶄綔 */
-function handleQuery() {
- queryParams.value.pageNum = 1
- getList()
-}
-
-/** 閲嶇疆鎸夐挳鎿嶄綔 */
-function resetQuery() {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- daterange${AttrName}.value = []
-#end
-#end
- proxy.resetForm("queryRef")
- handleQuery()
-}
-
-// 澶氶�夋閫変腑鏁版嵁
-function handleSelectionChange(selection) {
- ids.value = selection.map(item => item.${pkColumn.javaField})
- single.value = selection.length != 1
- multiple.value = !selection.length
-}
-
-/** 鏂板鎸夐挳鎿嶄綔 */
-function handleAdd() {
- reset()
- open.value = true
- title.value = "娣诲姞${functionName}"
-}
-
-/** 淇敼鎸夐挳鎿嶄綔 */
-function handleUpdate(row) {
- reset()
- const _${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value
- get${BusinessName}(_${pkColumn.javaField}).then(response => {
- form.value = response.data
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- form.value.$column.javaField = form.value.${column.javaField}.split(",")
-#end
-#end
-#if($table.sub)
- ${subclassName}List.value = response.data.${subclassName}List
-#end
- open.value = true
- title.value = "淇敼${functionName}"
- })
-}
-
-/** 鎻愪氦鎸夐挳 */
-function submitForm() {
- proxy.#[[$]]#refs["${businessName}Ref"].validate(valid => {
- if (valid) {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
- form.value.$column.javaField = form.value.${column.javaField}.join(",")
-#end
-#end
-#if($table.sub)
- form.value.${subclassName}List = ${subclassName}List.value
-#end
- if (form.value.${pkColumn.javaField} != null) {
- update${BusinessName}(form.value).then(response => {
- proxy.#[[$modal]]#.msgSuccess("淇敼鎴愬姛")
- open.value = false
- getList()
- })
- } else {
- add${BusinessName}(form.value).then(response => {
- proxy.#[[$modal]]#.msgSuccess("鏂板鎴愬姛")
- open.value = false
- getList()
- })
- }
- }
- })
-}
-
-/** 鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete(row) {
- const _${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value
- proxy.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + _${pkColumn.javaField}s + '"鐨勬暟鎹」锛�').then(function() {
- return del${BusinessName}(_${pkColumn.javaField}s)
- }).then(() => {
- getList()
- proxy.#[[$modal]]#.msgSuccess("鍒犻櫎鎴愬姛")
- }).catch(() => {})
-}
-
-#if($table.sub)
-/** ${subTable.functionName}搴忓彿 */
-function row${subClassName}Index({ row, rowIndex }) {
- row.index = rowIndex + 1
-}
-
-/** ${subTable.functionName}娣诲姞鎸夐挳鎿嶄綔 */
-function handleAdd${subClassName}() {
- let obj = {}
-#foreach($column in $subTable.columns)
-#if($column.pk || $column.javaField == ${subTableFkclassName})
-#elseif($column.list && "" != $javaField)
- obj.$column.javaField = ""
-#end
-#end
- ${subclassName}List.value.push(obj)
-}
-
-/** ${subTable.functionName}鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete${subClassName}() {
- if (checked${subClassName}.value.length == 0) {
- proxy.#[[$modal]]#.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑${subTable.functionName}鏁版嵁")
- } else {
- const ${subclassName}s = ${subclassName}List.value
- const checked${subClassName}s = checked${subClassName}.value
- ${subclassName}List.value = ${subclassName}s.filter(function(item) {
- return checked${subClassName}s.indexOf(item.index) == -1
- })
- }
-}
-
-/** 澶嶉�夋閫変腑鏁版嵁 */
-function handle${subClassName}SelectionChange(selection) {
- checked${subClassName}.value = selection.map(item => item.index)
-}
-
-#end
-/** 瀵煎嚭鎸夐挳鎿嶄綔 */
-function handleExport() {
- proxy.download('${moduleName}/${businessName}/export', {
- ...queryParams.value
- }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
-}
-
-getList()
-</script>
diff --git "a/$\173project.build.directory\175/classes/vm/xml/mapper.xml.vm" "b/$\173project.build.directory\175/classes/vm/xml/mapper.xml.vm"
deleted file mode 100644
index 456755b..0000000
--- "a/$\173project.build.directory\175/classes/vm/xml/mapper.xml.vm"
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="${packageName}.mapper.${ClassName}Mapper">
-
- <resultMap type="${ClassName}" id="${ClassName}Result">
-#foreach ($column in $columns)
- <result property="${column.javaField}" column="${column.columnName}" />
-#end
- </resultMap>
-#if($table.sub)
-
- <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
- <collection property="${subclassName}List" ofType="${subClassName}" column="${pkColumn.columnName}" select="select${subClassName}List" />
- </resultMap>
-
- <resultMap type="${subClassName}" id="${subClassName}Result">
-#foreach ($column in $subTable.columns)
- <result property="${column.javaField}" column="${column.columnName}" />
-#end
- </resultMap>
-#end
-
- <sql id="select${ClassName}Vo">
- select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
- </sql>
-
- <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
- <include refid="select${ClassName}Vo"/>
- <where>
-#foreach($column in $columns)
-#set($queryType=$column.queryType)
-#set($javaField=$column.javaField)
-#set($javaType=$column.javaType)
-#set($columnName=$column.columnName)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#if($column.query)
-#if($column.queryType == "EQ")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName = #{$javaField}</if>
-#elseif($queryType == "NE")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName != #{$javaField}</if>
-#elseif($queryType == "GT")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName > #{$javaField}</if>
-#elseif($queryType == "GTE")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName >= #{$javaField}</if>
-#elseif($queryType == "LT")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName < #{$javaField}</if>
-#elseif($queryType == "LTE")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName <= #{$javaField}</if>
-#elseif($queryType == "LIKE")
- <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $columnName like concat('%', #{$javaField}, '%')</if>
-#elseif($queryType == "BETWEEN")
- <if test="params.begin$AttrName != null and params.begin$AttrName != '' and params.end$AttrName != null and params.end$AttrName != ''"> and $columnName between #{params.begin$AttrName} and #{params.end$AttrName}</if>
-#end
-#end
-#end
- </where>
- </select>
-
- <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
-#if($table.crud || $table.tree)
- <include refid="select${ClassName}Vo"/>
- where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-#elseif($table.sub)
- select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end
- from ${tableName}
- where ${pkColumn.columnName} = #{${pkColumn.javaField}}
-#end
- </select>
-#if($table.sub)
-
- <select id="select${subClassName}List" resultMap="${subClassName}Result">
- select#foreach ($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
- from ${subTableName}
- where ${subTableFkName} = #{${subTableFkName}}
- </select>
-#end
-
- <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
- insert into ${tableName}
- <trim prefix="(" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
- <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName,</if>
-#end
-#end
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
- <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">#{$column.javaField},</if>
-#end
-#end
- </trim>
- </insert>
-
- <update id="update${ClassName}" parameterType="${ClassName}">
- update ${tableName}
- <trim prefix="SET" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName)
- <if test="$column.javaField != null#if($column.javaType == 'String' && $column.required) and $column.javaField != ''#end">$column.columnName = #{$column.javaField},</if>
-#end
-#end
- </trim>
- where ${pkColumn.columnName} = #{${pkColumn.javaField}}
- </update>
-
- <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
- delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
- </delete>
-
- <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
- delete from ${tableName} where ${pkColumn.columnName} in
- <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">
- #{${pkColumn.javaField}}
- </foreach>
- </delete>
-#if($table.sub)
-
- <delete id="delete${subClassName}By${subTableFkClassName}s" parameterType="String">
- delete from ${subTableName} where ${subTableFkName} in
- <foreach item="${subTableFkclassName}" collection="array" open="(" separator="," close=")">
- #{${subTableFkclassName}}
- </foreach>
- </delete>
-
- <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}">
- delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}
- </delete>
-
- <insert id="batch${subClassName}">
- insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values
- <foreach item="item" index="index" collection="list" separator=",">
- (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end)
- </foreach>
- </insert>
-#end
-</mapper>
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/sales/mapper/InvoiceLedgerMapper.java b/src/main/java/com/ruoyi/sales/mapper/InvoiceLedgerMapper.java
index a797024..6594640 100644
--- a/src/main/java/com/ruoyi/sales/mapper/InvoiceLedgerMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/InvoiceLedgerMapper.java
@@ -6,7 +6,6 @@
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
import com.ruoyi.sales.pojo.InvoiceLedger;
-import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -55,6 +54,6 @@
* @param salesLedgerIds
* @return
*/
- List<InvoiceLedgerDto> invoicedTotal(List<Long> salesLedgerIds);
+ List<InvoiceLedgerDto> invoicedTotal(@Param("salesLedgerIds") List<Long> salesLedgerIds);
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 6c8d683..42ecf7e 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -62,9 +62,9 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://localhost:3306/product-inventory-management-dhdc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://114.132.189.42:9099/product-inventory-management-dhdc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: 123456
+ password: xd@123456..
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -142,7 +142,7 @@
database: 0
# 瀵嗙爜
# password: root2022!
- password:
+ password: 123456
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
@@ -190,7 +190,7 @@
secret: abcdefghijklmnopqrstuvwxyz
# 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
expireTime: 450
-
+
# MyBatis Plus閰嶇疆
mybatis-plus:
# 鎼滅储鎸囧畾鍖呭埆鍚� 鏍规嵁鑷繁鐨勯」鐩潵
@@ -203,7 +203,7 @@
enable-sql-runner: true
db-config:
id-type: auto
-
+
# PageHelper鍒嗛〉鎻掍欢
pagehelper:
helperDialect: mysql
@@ -225,7 +225,7 @@
excludes: /system/notice
# 鍖归厤閾炬帴
urlPatterns: /system/*,/monitor/*,/tool/*
-
+
# 浠ｇ爜鐢熸垚
gen:
# 浣滆��
@@ -241,4 +241,4 @@
file:
temp-dir: D:/ruoyi/temp/uploads # 涓存椂鐩綍
- upload-dir: D:/ruoyi/prod/uploads # 姝ｅ紡鐩綍
\ No newline at end of file
+ upload-dir: D:/ruoyi/prod/uploads # 姝ｅ紡鐩綍
--
Gitblit v1.9.3