From 943c5905b7f4ff48c7ae87c41b41aeae854f8a20 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 08 Nov 2023 11:02:09 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 myBatisPlusGenerator/src/main/java/com/moral/CodeGenerator.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/myBatisPlusGenerator/src/main/java/com/moral/CodeGenerator.java b/myBatisPlusGenerator/src/main/java/com/moral/CodeGenerator.java
index 305c72e..a64c9bf 100644
--- a/myBatisPlusGenerator/src/main/java/com/moral/CodeGenerator.java
+++ b/myBatisPlusGenerator/src/main/java/com/moral/CodeGenerator.java
@@ -43,7 +43,7 @@
         // ������������
         GlobalConfig gc = new GlobalConfig();
         //String projectPath = System.getProperty("user.dir");
-        String projectPath="E:\\workspace\\moral\\screen-api";
+        String projectPath="D:\\gitproject\\newmoral\\screen-api";
         gc.setOutputDir(projectPath + "/src/main/java");
         gc.setAuthor("moral");
         gc.setOpen(false);
@@ -67,10 +67,11 @@
 
         // ���������������
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC");
+        dsc.setUrl("jdbc:mysql://121.199.44.85:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC");
+        //dsc.setUrl("jdbc:mysql://rm-bp1pr3rx9m3fnkwsk8o.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("123456");
+        dsc.setPassword("moral_123456");
         mpg.setDataSource(dsc);
 
         // ���������
@@ -123,7 +124,8 @@
         strategy.setColumnNaming(NamingStrategy.underline_to_camel);
         strategy.setEntityLombokModel(true);
         strategy.setRestControllerStyle(true);
-        //strategy.setInclude(scanner("���������������������������������").split(","));
+        //���������������������������������
+        strategy.setInclude(scanner("���������������������������������").split(","));
         strategy.setControllerMappingHyphenStyle(true);
        // strategy.setTablePrefix(pc.getModuleName() + "_");
         mpg.setStrategy(strategy);

--
Gitblit v1.8.0