From 5d7b0a0bbcae6844e2296ef53c3f4c88293dacfe Mon Sep 17 00:00:00 2001
From: jinquanOu <1511349576@qq.com>
Date: 星期二, 11 六月 2024 18:18:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java |   98 ++++++++++++++++++++++++------------------------
 1 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java b/ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java
index b2c85b9..9ebe193 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java
@@ -19,55 +19,55 @@
 public class generatorTest {
     @Test
     public void test01() {
-        //鍒涘缓涓�涓唬鐮佺敓鎴愬櫒
-        FastAutoGenerator.create("jdbc:mysql://192.168.88.68:3306/mall_pms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8",
-                        "root", "root")
-                //鍏ㄥ眬閰嶇疆(GlobalConfig)
-                .globalConfig(builder -> {
-                    builder.author("ojq") // 璁剧疆浣滆�咃紝鍙互鍐欒嚜宸卞悕瀛�
-                            //.enableSwagger() // 寮�鍚� swagger 妯″紡锛岃繖涓槸鎺ュ彛鏂囨。鐢熸垚鍣紝濡傛灉寮�鍚殑璇濓紝灏辫繕闇�瑕佸鍏wagger渚濊禆
-                            .fileOverride() // 瑕嗙洊宸茬敓鎴愭枃浠�
-                            .dateType(DateType.TIME_PACK) //鏃堕棿绛栫暐
-                            .commentDate("yyyy-MM-dd") //娉ㄩ噴鏃ユ湡
-                            .outputDir("F:\\JavaProject\\mail-service\\mall-generator\\src\\main\\java"); // 鎸囧畾杈撳嚭鐩綍锛屼竴鑸寚瀹氬埌java鐩綍
-                })
-                //鍖呴厤缃�(PackageConfig)
-                .packageConfig(builder -> {
-                    builder.parent("com.ojq") // 璁剧疆鐖跺寘鍚�
-                            .moduleName("") // 璁剧疆鐖跺寘妯″潡鍚嶏紝杩欓噷涓�鑸笉璁剧疆
-                            .pathInfo(Collections.singletonMap(OutputFile.mapperXml, "F:\\JavaProject\\mail-service\\mall-generator\\src\\main\\resources\\com\\ojq\\mapper")); // 璁剧疆mapperXml鐢熸垚璺緞锛岃繖閲屾槸Mapper閰嶇疆鏂囦欢鐨勮矾寰勶紝寤鸿浣跨敤缁濆璺緞
-                })
-                //绛栫暐閰嶇疆(StrategyConfig)
-                .strategyConfig(builder -> {
-//                    builder.addInclude("zf_clean") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-//                            .addInclude("zf_collection") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-                    builder.addInclude("pms_attr") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-                            .addInclude("pms_attr_attrgroup_relation") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-                            .addInclude("pms_attr_group") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-                            .addInclude("pms_brand") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-                            .addInclude("pms_category") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-                            .addInclude("pms_category_brand") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-                            .addInclude("pms_comment_replay") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-                            .addInclude("pms_product_attr_value") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-                            .addInclude("pms_sku_images") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-                            .addInclude("pms_sku_info") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-                            .addInclude("pms_sku_sale_attr_value") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-                            .addInclude("pms_spu_comment") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-                            .addInclude("pms_spu_images") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-                            .addInclude("pms_spu_info") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-                            .addInclude("pms_spu_info_desc"); // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-
-                    builder.serviceBuilder()
-                            .formatServiceFileName("%sService") //璁剧疆service鐨勫懡鍚嶇瓥鐣�,娌℃湁杩欎釜閰嶇疆鐨勮瘽锛岀敓鎴愮殑service鍜宻erviceImpl绫诲墠闈細鏈変竴涓狪锛屾瘮濡侷UserService鍜孖UserServiceImpl
-                            .formatServiceImplFileName("%sServiceImpl"); //璁剧疆serviceImpl鐨勫懡鍚嶇瓥鐣�
-                    builder.controllerBuilder()
-                            .enableRestStyle(); // 寮�鍚敓鎴怈RestController 鎺у埗鍣紝涓嶉厤缃繖涓粯璁ゆ槸Controller娉ㄨВ锛孯estController鏄繑鍥濲son瀛楃涓茬殑锛屽鐢ㄤ簬鍓嶅悗绔垎绂婚」鐩��
-                    builder.mapperBuilder()
-                            .enableMapperAnnotation() ;//寮�鍚� @Mapper 娉ㄨВ锛屼篃灏辨槸鍦╠ao鎺ュ彛涓婃坊鍔犱竴涓狜Mapper娉ㄨВ锛岃繖涓敞瑙g殑浣滅敤鏄紑鍚敞瑙fā寮忥紝灏卞彲浠ュ湪鎺ュ彛鐨勬娊璞℃柟娉曚笂闈㈢洿鎺ヤ娇鐢ˊSelect鍜孈Insert鍜孈Update鍜孈Delete娉ㄨВ銆�
-                })
-//                .templateEngine(new FreemarkerTemplateEngine()) // 浣跨敤Freemarker寮曟搸妯℃澘锛岄粯璁ょ殑鏄疺elocity寮曟搸妯℃澘
-                .templateEngine(new VelocityTemplateEngine())
-                .execute(); //鎵ц浠ヤ笂閰嶇疆
+//        //鍒涘缓涓�涓唬鐮佺敓鎴愬櫒
+//        FastAutoGenerator.create("jdbc:mysql://192.168.88.68:3306/mall_pms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8",
+//                        "root", "root")
+//                //鍏ㄥ眬閰嶇疆(GlobalConfig)
+//                .globalConfig(builder -> {
+//                    builder.author("ojq") // 璁剧疆浣滆�咃紝鍙互鍐欒嚜宸卞悕瀛�
+//                            //.enableSwagger() // 寮�鍚� swagger 妯″紡锛岃繖涓槸鎺ュ彛鏂囨。鐢熸垚鍣紝濡傛灉寮�鍚殑璇濓紝灏辫繕闇�瑕佸鍏wagger渚濊禆
+//                            .fileOverride() // 瑕嗙洊宸茬敓鎴愭枃浠�
+//                            .dateType(DateType.TIME_PACK) //鏃堕棿绛栫暐
+//                            .commentDate("yyyy-MM-dd") //娉ㄩ噴鏃ユ湡
+//                            .outputDir("F:\\JavaProject\\mail-service\\mall-generator\\src\\main\\java"); // 鎸囧畾杈撳嚭鐩綍锛屼竴鑸寚瀹氬埌java鐩綍
+//                })
+//                //鍖呴厤缃�(PackageConfig)
+//                .packageConfig(builder -> {
+//                    builder.parent("com.ojq") // 璁剧疆鐖跺寘鍚�
+//                            .moduleName("") // 璁剧疆鐖跺寘妯″潡鍚嶏紝杩欓噷涓�鑸笉璁剧疆
+//                            .pathInfo(Collections.singletonMap(OutputFile.mapperXml, "F:\\JavaProject\\mail-service\\mall-generator\\src\\main\\resources\\com\\ojq\\mapper")); // 璁剧疆mapperXml鐢熸垚璺緞锛岃繖閲屾槸Mapper閰嶇疆鏂囦欢鐨勮矾寰勶紝寤鸿浣跨敤缁濆璺緞
+//                })
+//                //绛栫暐閰嶇疆(StrategyConfig)
+//                .strategyConfig(builder -> {
+////                    builder.addInclude("zf_clean") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+////                            .addInclude("zf_collection") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//                    builder.addInclude("pms_attr") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//                            .addInclude("pms_attr_attrgroup_relation") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//                            .addInclude("pms_attr_group") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//                            .addInclude("pms_brand") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//                            .addInclude("pms_category") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//                            .addInclude("pms_category_brand") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//                            .addInclude("pms_comment_replay") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//                            .addInclude("pms_product_attr_value") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//                            .addInclude("pms_sku_images") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//                            .addInclude("pms_sku_info") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//                            .addInclude("pms_sku_sale_attr_value") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//                            .addInclude("pms_spu_comment") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//                            .addInclude("pms_spu_images") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//                            .addInclude("pms_spu_info") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//                            .addInclude("pms_spu_info_desc"); // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//
+//                    builder.serviceBuilder()
+//                            .formatServiceFileName("%sService") //璁剧疆service鐨勫懡鍚嶇瓥鐣�,娌℃湁杩欎釜閰嶇疆鐨勮瘽锛岀敓鎴愮殑service鍜宻erviceImpl绫诲墠闈細鏈変竴涓狪锛屾瘮濡侷UserService鍜孖UserServiceImpl
+//                            .formatServiceImplFileName("%sServiceImpl"); //璁剧疆serviceImpl鐨勫懡鍚嶇瓥鐣�
+//                    builder.controllerBuilder()
+//                            .enableRestStyle(); // 寮�鍚敓鎴怈RestController 鎺у埗鍣紝涓嶉厤缃繖涓粯璁ゆ槸Controller娉ㄨВ锛孯estController鏄繑鍥濲son瀛楃涓茬殑锛屽鐢ㄤ簬鍓嶅悗绔垎绂婚」鐩��
+//                    builder.mapperBuilder()
+//                            .enableMapperAnnotation() ;//寮�鍚� @Mapper 娉ㄨВ锛屼篃灏辨槸鍦╠ao鎺ュ彛涓婃坊鍔犱竴涓狜Mapper娉ㄨВ锛岃繖涓敞瑙g殑浣滅敤鏄紑鍚敞瑙fā寮忥紝灏卞彲浠ュ湪鎺ュ彛鐨勬娊璞℃柟娉曚笂闈㈢洿鎺ヤ娇鐢ˊSelect鍜孈Insert鍜孈Update鍜孈Delete娉ㄨВ銆�
+//                })
+////                .templateEngine(new FreemarkerTemplateEngine()) // 浣跨敤Freemarker寮曟搸妯℃澘锛岄粯璁ょ殑鏄疺elocity寮曟搸妯℃澘
+//                .templateEngine(new VelocityTemplateEngine())
+//                .execute(); //鎵ц浠ヤ笂閰嶇疆
 
     }
 

--
Gitblit v1.9.1