From 1891dbc56684a039e6b00a8e943866809f93903b Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 19 七月 2021 10:04:56 +0800 Subject: [PATCH] fix 代码生成 queryType 重复勾选数据库无默认值问题 --- README.md | 204 ++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 177 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 244ef66..6fb00c1 100644 --- a/README.md +++ b/README.md @@ -1,39 +1,189 @@ -# RuoYi-Vue +## 骞冲彴绠�浠� +[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus) +[](https://github.com/JavaLionLi/RuoYi-Vue-Plus) +[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE) +[ +<br> +[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus) +[]() +[]() +[]() -#### 浠嬬粛 -{**浠ヤ笅鏄爜浜戝钩鍙拌鏄庯紝鎮ㄥ彲浠ユ浛鎹㈡绠�浠�** -鐮佷簯鏄� OSCHINA 鎺ㄥ嚭鐨勫熀浜� Git 鐨勪唬鐮佹墭绠″钩鍙帮紙鍚屾椂鏀寔 SVN锛夈�備笓涓哄紑鍙戣�呮彁渚涚ǔ瀹氥�侀珮鏁堛�佸畨鍏ㄧ殑浜戠杞欢寮�鍙戝崗浣滃钩鍙� -鏃犺鏄釜浜恒�佸洟闃熴�佹垨鏄紒涓氾紝閮借兘澶熺敤鐮佷簯瀹炵幇浠g爜鎵樼銆侀」鐩鐞嗐�佸崗浣滃紑鍙戙�備紒涓氶」鐩鐪� [https://gitee.com/enterprises](https://gitee.com/enterprises)} +RuoYi-Vue-Plus 鏄熀浜� RuoYi-Vue 閽堝 `鍒嗗竷寮忛泦缇 鍦烘櫙鍗囩骇 瀹氭湡涓� RuoYi-Vue 鍚屾 -#### 杞欢鏋舵瀯 -杞欢鏋舵瀯璇存槑 +闆嗘垚 Lock4j dynamic-datasource 绛夊垎甯冨紡鍦烘櫙瑙e喅鏂规 +闆嗘垚 Mybatis-Plus Lombok Hutool 绛変究鎹峰紑鍙戝伐鍏� 閫傞厤閲嶅啓鐩稿叧涓氬姟 渚夸簬寮�鍙� -#### 瀹夎鏁欑▼ +* 鍓嶇寮�鍙戞鏋� Vue銆丒lement UI +* 鍚庣寮�鍙戞鏋� Spring Boot銆丷edis +* 瀹瑰櫒妗嗘灦 Undertow 鍩轰簬 Netty 鐨勯珮鎬ц兘瀹瑰櫒 +* 鏉冮檺璁よ瘉妗嗘灦 Spring Security銆丣wt锛屾敮鎸佸缁堢璁よ瘉绯荤粺 +* 鍏崇郴鏁版嵁搴� MySQL 閫傞厤 8.X +* 缂撳瓨鏁版嵁搴� Redis 閫傞厤 6.X +* 鏁版嵁搴撳紑鍙戞鏋� Mybatis-Plus 蹇�� CRUD 澧炲姞寮�鍙戞晥鐜� 鎻掍欢鍖栨敮鎸佸悇绫婚渶姹� +* 缃戠粶妗嗘灦 Feign銆丱kHttp3 鎺ュ彛鍖栫鐞� HTTP 璇锋眰 +* 宸ュ叿绫绘鏋� Hutool銆丩ombok 鍑忓皯浠g爜鍐椾綑 澧炲姞瀹夊叏鎬� +* 鐩戞帶妗嗘灦 spring-boot-admin 鍏ㄦ柟浣嶆湇鍔$洃鎺� +* 鏍¢獙妗嗘灦 validation 澧炲己鎺ュ彛瀹夊叏鎬� 涓ヨ皑鎬� +* 鏂囨。妗嗘灦 knife4j 缇庡寲鎺ュ彛鏂囨。 +* 搴忓垪鍖栨鏋� 缁熶竴浣跨敤 jackson 楂樻晥鍙潬 +* 浠g爜鐢熸垚鍣� 涓�閿敓鎴愬墠鍚庣浠g爜 +* 澶氭暟鎹簮妗嗘灦 dynamic-datasource 鏀寔涓讳粠涓庡绉嶇被鏁版嵁搴撳紓鏋� +* Redis瀹㈡埛绔� 閲囩敤 Redisson 鎬ц兘鏇村己 +* 鍒嗗竷寮忛攣 Lock4j 娉ㄨВ閿併�佸伐鍏烽攣 澶氱澶氭牱 +* 閮ㄧ讲鏂瑰紡 Docker 瀹瑰櫒缂栨帓 涓�閿儴缃蹭笟鍔¢泦缇� -1. xxxx -2. xxxx -3. xxxx +## 鍙傝�冩枃妗� -#### 浣跨敤璇存槑 +浣跨敤妗嗘灦鍓嶈浠旂粏闃呰鏂囨。閲嶇偣娉ㄦ剰浜嬮」 +<br> +>[鍒濆鍖栭」鐩� 蹇呯湅](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/鍏充簬鍒濆鍖栭」鐩�?sort_id=4164117) +> +>[閮ㄧ讲椤圭洰 蹇呯湅](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/鍏充簬搴旂敤閮ㄧ讲?sort_id=4219382) +> +>[鍙傝�冩枃妗� Wiki](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages) -1. xxxx -2. xxxx -3. xxxx +## 鎻愰棶鍥涢儴鏇� +### 涓�銆佹煡闃厀iki +浼樺厛鍦╜wiki->閲嶇偣浜嬮」`锛屾煡鎵炬槸鍚︽湁鐩稿叧闂鍙婅В鍐虫柟妗堬紝灏ゅ叾鏄鏋舵洿鏂板悗浜х敓鐨勯棶棰橈紝澶氫細鍦╳iki涓彁鍙� -#### 鍙備笌璐$尞 +> [鍙傝�冩枃妗� Wiki](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages) -1. Fork 鏈粨搴� -2. 鏂板缓 Feat_xxx 鍒嗘敮 -3. 鎻愪氦浠g爜 -4. 鏂板缓 Pull Request +### 浜屻�佸�熷姪issues +灏濊瘯issues涓悳绱㈤棶棰樺叧閿瓧锛堣寰楅�夋嫨宸插畬鎴愶級锛岀湅鐪嬫槸鍚︽湁鍏朵粬浜烘彁鍑虹浉鍚岄棶棰� +- `濡傛灉鏈塦閭d箞渚濇嵁璇勮涓殑瑙e喅鏂规鑷灏濊瘯瑙e喅 +- `濡傛灉娌℃湁`閭d箞鎻愪氦涓�涓柊鐨刬ssues鎻忚堪娓呮浣犵殑闂锛岄渶瑕佸寘鍚互涓嬪唴瀹癸紙浼樿川鐨刬ssues锛岃兘澶熷府鍔╀綔鑰呮洿楂樻晥鐨勫府浣犺В鍐抽棶棰橈級锛� + - 鍑虹幇闂鐨勬ā鍧楁垨鍔熻兘鎴栫被锛屾�讳箣浣犺璇存竻妤氬湪鍝嚭鐨勯棶棰� + - 鎻忚堪浜х敓闂鐨勭浉鍏虫搷浣滄祦绋嬶紝浠ヤ究澶嶇幇蹇�熻В鍐� + - 鎶ラ敊鐨勬棩蹇楁埅鍥撅紝涓�瀹氭槸鎴浘锛屼笉瑕佸鍒朵竴鍫嗘姤閿欑殑鏂囨湰 +> [issues](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/issues) +### 涓夈�佺櫨搴� +澶у閮芥噦锛屼笉澶氭弿杩帮紝灏嗗叧閿殑鎶ラ敊淇℃伅CC->CV鍒扮櫨搴︿腑鐪嬬湅澶т浆浠�庝箞瑙e喅鐨� +> [鐧惧害](http://www.baidu.com) -#### 鐮佷簯鐗规妧 +### 鍥涖�佸姞缇� +浠ヤ笂涓夌偣宸茬粡鑳借В鍐冲ぇ瀹剁粷澶ч儴鍒嗛棶棰樹簡锛屽鏋滆繕鏈夐棶棰樻病鑳介�氳繃杩欏嚑绉嶆柟寮忚В鍐筹紝閭d箞鍔犵兢锛屽ぇ瀹朵竴璧峰湪缇ら噷鎺㈣涓�涓� -1. 浣跨敤 Readme\_XXX.md 鏉ユ敮鎸佷笉鍚岀殑璇█锛屼緥濡� Readme\_en.md, Readme\_zh.md -2. 鐮佷簯瀹樻柟鍗氬 [blog.gitee.com](https://blog.gitee.com) -3. 浣犲彲浠� [https://gitee.com/explore](https://gitee.com/explore) 杩欎釜鍦板潃鏉ヤ簡瑙g爜浜戜笂鐨勪紭绉�寮�婧愰」鐩� -4. [GVP](https://gitee.com/gvp) 鍏ㄧО鏄爜浜戞渶鏈変环鍊煎紑婧愰」鐩紝鏄爜浜戠患鍚堣瘎瀹氬嚭鐨勪紭绉�寮�婧愰」鐩� -5. 鐮佷簯瀹樻柟鎻愪緵鐨勪娇鐢ㄦ墜鍐� [https://gitee.com/help](https://gitee.com/help) -6. 鐮佷簯灏侀潰浜虹墿鏄竴妗g敤鏉ュ睍绀虹爜浜戜細鍛橀閲囩殑鏍忕洰 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) \ No newline at end of file +## 璐$尞浠g爜 + +娆㈣繋鍚勮矾鑻遍泟璞澃 `PR` 浠g爜 璇锋彁浜ゅ埌 `dev` 寮�鍙戝垎鏀� 缁熶竴娴嬭瘯鍙戠増 + +妗嗘灦瀹氫綅涓� `閫氱敤鍚庡彴绠$悊绯荤粺(鍒嗗竷寮忛泦缇ゅ己鍖�)` 鍘熷垯涓婁笉鎺ュ彈涓氬姟 `PR` + +## 淇敼RuoYi鍔熻兘 +### 渚濊禆鏀瑰姩 + +* ORM妗嗘灦 浣跨敤 Mybatis-Plus 绠�鍖朇RUD (涓嶆敮鎸佷富瀛愯〃) +* Bean绠�鍖� 浣跨敤 Lombok 绠�鍖� get set toString 绛夌瓑 +* 瀹瑰櫒鏀瑰姩 Tomcat 鏀逛负 骞跺彂鎬ц兘鏇村ソ鐨� undertow +* 鍒嗛〉绉婚櫎 pagehelper 鏀逛负 Mybatis-Plus 鍒嗛〉 +* 鍗囩骇 swagger 涓� knife4j +* 闆嗘垚 Hutool 5.X 骞堕噸鍐橰uoYi閮ㄥ垎鍔熻兘 +* 闆嗘垚 Feign 鎺ュ彛鍖栫鐞� Http 璇锋眰(濡備笁鏂硅姹� 鏀粯,鐭俊,鎺ㄩ�佺瓑) +* 绉婚櫎 鑷甫鏈嶅姟鐩戞帶 鏀逛负 spring-boot-admin 鍏ㄦ柟浣嶇洃鎺� +* 澧炲姞 demo 妯″潡绀轰緥(缁欎笉浼氬鍔犳ā鍧楃殑灏忎紮浼村仛鍙傝��) +* 澧炲姞 redisson 楂樻�ц兘 Redis 瀹㈡埛绔� +* 绉婚櫎 fastjson 缁熶竴浣跨敤 jackson 搴忓垪鍖� +* 闆嗘垚 dynamic-datasource 澶氭暟鎹簮(榛樿鏀寔MySQL,鍏朵粬绉嶇被闇�鑷閫傞厤) +* 闆嗘垚 Lock4j 瀹炵幇鍒嗗竷寮� 娉ㄨВ閿併�佸伐鍏烽攣 澶氱澶氭牱 +* 澧炲姞 Docker 瀹瑰櫒缂栨帓 鎵撳寘鎻掍欢涓庨儴缃茶剼鏈� + +### 浠g爜鏀瑰姩 + +* 鎵�鏈夊師鐢熷姛鑳戒娇鐢� Mybatis-Plus 涓� Lombok 閲嶅啓 +* 澧炲姞 IServicePlus 涓� BaseMapperPlus 鍙嚜瀹氫箟閫氱敤鏂规硶 +* 浠g爜鐢熸垚妯℃澘 鏀逛负閫傞厤 Mybatis-Plus 鐨勪唬鐮� +* 浠g爜鐢熸垚妯℃澘 鎷嗗垎鍑� Vo,QueryBo,AddBo,EditBo 绛夐鍩熷璞� +* 浠g爜鐢熸垚妯℃澘 澧炲姞 鏂囨。娉ㄨВ 涓� 鏍¢獙娉ㄨВ 绠�鍖栭�氱敤鎿嶄綔 +* 椤圭洰淇敼涓� maven澶氱幆澧冮厤缃� +* 椤圭洰閰嶇疆淇敼涓� application.yml 缁熶竴绠$悊 +* 鏁版嵁鏉冮檺淇敼涓� 閫傞厤鏀寔鍗曡〃銆佸琛� +* 浣跨敤 redisson 瀹炵幇 spring-cache 鏁村悎 +* 澧炲姞 mybatis-plus 浜岀骇缂撳瓨 redis 瀛樺偍 + +### 鍏朵粬 + +* 鍚屾鍗囩骇 RuoYi-Vue +* GitHub 鍦板潃 [RuoYi-Vue-Plus-github](https://github.com/JavaLionLi/RuoYi-Vue-Plus) +* 鍗曟ā鍧� fast 鍒嗘敮 [RuoYi-Vue-Plus-fast](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/fast/) +* Oracle 妯″潡 oracle 鍒嗘敮 [RuoYi-Vue-Plus-oracle](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/oracle/) + +## 鎵爜鍔犵兢 涓�璧蜂氦娴� + + +## 鎹愮尞浣滆�� +浣滆�呬负鍏艰亴鍋氬紑婧�,骞虫椂杩橀渶瑕佸伐浣�,濡傛灉甯埌浜嗘偍鍙互璇蜂綔鑰呭悆涓洅楗� +<img src="https://images.gitee.com/uploads/images/2021/0525/101654_451e4523_1766278.jpeg" width="300px" height="450px" /> +<img src="https://images.gitee.com/uploads/images/2021/0525/101713_3d18b119_1766278.jpeg" width="300px" height="450px" /> + +## 鍐呯疆鍔熻兘 + +1. 鐢ㄦ埛绠$悊锛氱敤鎴锋槸绯荤粺鎿嶄綔鑰咃紝璇ュ姛鑳戒富瑕佸畬鎴愮郴缁熺敤鎴烽厤缃�� +2. 閮ㄩ棬绠$悊锛氶厤缃郴缁熺粍缁囨満鏋勶紙鍏徃銆侀儴闂ㄣ�佸皬缁勶級锛屾爲缁撴瀯灞曠幇鏀寔鏁版嵁鏉冮檺銆� +3. 宀椾綅绠$悊锛氶厤缃郴缁熺敤鎴锋墍灞炴媴浠昏亴鍔°�� +4. 鑿滃崟绠$悊锛氶厤缃郴缁熻彍鍗曪紝鎿嶄綔鏉冮檺锛屾寜閽潈闄愭爣璇嗙瓑銆� +5. 瑙掕壊绠$悊锛氳鑹茶彍鍗曟潈闄愬垎閰嶃�佽缃鑹叉寜鏈烘瀯杩涜鏁版嵁鑼冨洿鏉冮檺鍒掑垎銆� +6. 瀛楀吀绠$悊锛氬绯荤粺涓粡甯镐娇鐢ㄧ殑涓�浜涜緝涓哄浐瀹氱殑鏁版嵁杩涜缁存姢銆� +7. 鍙傛暟绠$悊锛氬绯荤粺鍔ㄦ�侀厤缃父鐢ㄥ弬鏁般�� +8. 閫氱煡鍏憡锛氱郴缁熼�氱煡鍏憡淇℃伅鍙戝竷缁存姢銆� +9. 鎿嶄綔鏃ュ織锛氱郴缁熸甯告搷浣滄棩蹇楄褰曞拰鏌ヨ锛涚郴缁熷紓甯镐俊鎭棩蹇楄褰曞拰鏌ヨ銆� +10. 鐧诲綍鏃ュ織锛氱郴缁熺櫥褰曟棩蹇楄褰曟煡璇㈠寘鍚櫥褰曞紓甯搞�� +11. 鍦ㄧ嚎鐢ㄦ埛锛氬綋鍓嶇郴缁熶腑娲昏穬鐢ㄦ埛鐘舵�佺洃鎺с�� +12. 瀹氭椂浠诲姟锛氬湪绾匡紙娣诲姞銆佷慨鏀广�佸垹闄�)浠诲姟璋冨害鍖呭惈鎵ц缁撴灉鏃ュ織銆� +13. 浠g爜鐢熸垚锛氬墠鍚庣浠g爜鐨勭敓鎴愶紙java銆乭tml銆亁ml銆乻ql锛夋敮鎸丆RUD涓嬭浇 銆� +14. 绯荤粺鎺ュ彛锛氭牴鎹笟鍔′唬鐮佽嚜鍔ㄧ敓鎴愮浉鍏崇殑api鎺ュ彛鏂囨。銆� +15. 鏈嶅姟鐩戞帶锛氱洃瑙嗗綋鍓嶇郴缁烠PU銆佸唴瀛樸�佺鐩樸�佸爢鏍堢瓑鐩稿叧淇℃伅銆� +16. 缂撳瓨鐩戞帶锛氬绯荤粺鐨勭紦瀛樹俊鎭煡璇紝鍛戒护缁熻绛夈�� +17. 鍦ㄧ嚎鏋勫缓鍣細鎷栧姩琛ㄥ崟鍏冪礌鐢熸垚鐩稿簲鐨凥TML浠g爜銆� +18. 杩炴帴姹犵洃瑙嗭細鐩戣褰撳墠绯荤粺鏁版嵁搴撹繛鎺ユ睜鐘舵�侊紝鍙繘琛屽垎鏋怱QL鎵惧嚭绯荤粺鎬ц兘鐡堕銆� + +## 婕旂ず鍥句緥 + +<table border="1" cellpadding="1" cellspacing="1" style="width:500px"> + <tbody> + <tr> + <td><img src="https://oscimg.oschina.net/oscnet/up-972235bcbe3518dedd351ff0e2ee7d1031c.png" width="1920" /></td> + <td><img src="https://oscimg.oschina.net/oscnet/up-5e0097702fa91e2e36391de8127676a7fa1.png" width="1920" /></td> + </tr> + <tr> + <td> + <p><img src="https://oscimg.oschina.net/oscnet/up-e56e3828f48cd9886d88731766f06d5f3c1.png" width="1920" /></p> + </td> + <td><img src="https://oscimg.oschina.net/oscnet/up-0715990ea1a9f254ec2138fcd063c1f556a.png" width="1920" /></td> + </tr> + <tr> + <td><img src="https://oscimg.oschina.net/oscnet/up-eaf5417ccf921bb64abb959e3d8e290467f.png" width="1920" /></td> + <td><img src="https://oscimg.oschina.net/oscnet/up-fc285cf33095ebf8318de6999af0f473861.png" width="1920" /></td> + </tr> + <tr> + <td><img src="https://oscimg.oschina.net/oscnet/up-60c83fd8bd61c29df6dbf47c88355e9c272.png" width="1920" /></td> + <td><img src="https://oscimg.oschina.net/oscnet/up-7f731948c8b73c7d90f67f9e1c7a534d5c3.png" width="1920" /></td> + </tr> + <tr> + <td><img src="https://oscimg.oschina.net/oscnet/up-e4de89b5e2d20c52d3c3a47f9eb88eb8526.png" width="1920" /></td> + <td><img src="https://oscimg.oschina.net/oscnet/up-8791d823a508eb90e67c604f36f57491a67.png" width="1920" /></td> + </tr> + <tr> + <td><img src="https://oscimg.oschina.net/oscnet/up-4589afd99982ead331785299b894174feb6.png" width="1920" /></td> + <td><img src="https://oscimg.oschina.net/oscnet/up-8ea177cdacaea20995daf2f596b15232561.png" width="1920" /></td> + </tr> + <tr> + <td><img src="https://oscimg.oschina.net/oscnet/up-32d1d04c55c11f74c9129fbbc58399728c4.png" width="1920" /></td> + <td><img src="https://oscimg.oschina.net/oscnet/up-04fa118f7631b7ae6fd72299ca0a1430a63.png" width="1920" /></td> + </tr> + <tr> + <td><img src="https://oscimg.oschina.net/oscnet/up-fe7e85b65827802bfaadf3acd42568b58c7.png" width="1920" /></td> + <td><img src="https://oscimg.oschina.net/oscnet/up-eff2b02a54f8188022d8498cfe6af6fcc06.png" width="1920" /></td> + </tr> + </tbody> +</table> + +## 鍦ㄧ嚎浣撻獙 + +- admin/admin123 +- 闄嗛檰缁画鏀跺埌涓�浜涙墦璧忥紝涓轰簡鏇村ソ鐨勪綋楠屽凡鐢ㄤ簬婕旂ず鏈嶅姟鍣ㄥ崌绾с�傝阿璋㈠悇浣嶅皬浼欎即銆� + +婕旂ず鍦板潃锛歨ttp://vue.ruoyi.vip +鏂囨。鍦板潃锛歨ttp://doc.ruoyi.vip -- Gitblit v1.9.3