Merge remote-tracking branch 'origin/master'

4dkankan-center-platform/src/main/java/com/fdkankan/TestController.java

@@ -0,0 +1,20 @@
+package com.fdkankan;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 代理商申请表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2021-12-23
+ */
+@RestController
+@RequestMapping("/test")
+public class TestController {
+
+}
+

4dkankan-center-platform/src/main/java/com/fdkankan/generate/AutoGenerate.java

@@ -3,6 +3,7 @@ package com.fdkankan.generate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.generator.FastAutoGenerator;
 import com.baomidou.mybatisplus.generator.config.OutputFile;
+import com.baomidou.mybatisplus.generator.config.rules.DateType;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -14,8 +15,14 @@ public class AutoGenerate {
     public static void main(String[] args) {
         String path ="H:\\project\\4dkankan-parent\\4dkankan-center-platform";
         List<String> tables = new ArrayList<>();
+        String moduleName ="agent";
         tables.add("t_agent");
-        String moduleName ="test";
+        tables.add("t_agent_audit");
+        tables.add("t_agent_framework");
+        tables.add("t_camera_space");
+        tables.add("t_camera_version");
+        tables.add("t_cart");
+        tables.add("t_commerce_order");
         FastAutoGenerator.create("jdbc:mysql://localhost:3306/4dkankan_center_application",
                 "root","123456")
                 .globalConfig(builder -> {
@@ -23,6 +30,7 @@ public class AutoGenerate {
                             .outputDir(path+"\\src\\main\\java")    //输出路径(写到java目录)
                             //.enableSwagger()           //开启swagger
                             .commentDate("yyyy-MM-dd")
+                            .dateType(DateType.ONLY_DATE)
                             .fileOverride();            //开启覆盖之前生成的文件
 
                 })
@@ -52,7 +60,7 @@ public class AutoGenerate {
                             .enableRestStyle()
                             .mapperBuilder()
                             .superClass(BaseMapper.class)
-                            .formatMapperFileName("%sMapper")
+                            .formatMapperFileName("I%sMapper")
                             .enableMapperAnnotation()
                             .formatXmlFileName("%sMapper");
                 })

4dkankan-center-platform/src/main/java/com/fdkankan/test/controller/AgentAuditController.java

@@ -1,32 +0,0 @@
-package com.fdkankan.test.controller;
-
-
-import com.fdkankan.common.rocketmq.producer.MqSendMessage;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- * 代理商申请表 前端控制器
- * </p>
- *
- * @author
- * @since 2021-12-23
- */
-@RestController
-@RequestMapping("/test/")
-public class AgentAuditController {
-
-    @Resource(name = "mqSendMessage")
-    MqSendMessage mqSendMessage;
-
-
-    @RequestMapping("send")
-    public String getOne(String msg){
-        mqSendMessage.sendMessage(msg);
-        return msg;
-    }
-}
-

4dkankan-center-platform/src/main/resources/application.yml

@@ -24,7 +24,7 @@ spring:
     name: platform
   datasource:
     name: test
-    url: jdbc:mysql://localhost:3306/4dkankan_center_application?useUnicode:true&characterEncoding:utf-8&useSSL:true&serverTimezone:UTC&allowMultiQueries:true
+    url: jdbc:mysql://localhost:3306/4dkankan_center_application?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC&allowMultiQueries=true
     username: root
     password: 123456
     type: com.alibaba.druid.pool.DruidDataSource
@@ -52,7 +52,7 @@ oss:
 
 
 rocketmq:
-  name-srv-addr: 127.0.0.1:9876 #集群地址，多个;隔开
+  name-srv-addr: 192.168.0.47:9876 #集群地址，多个;隔开
   producer:
     group:
       testGrop: test_grop

4dkankan-pom/src/test/java/AutoGenerate.java

@@ -1,6 +1,7 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.generator.FastAutoGenerator;
 import com.baomidou.mybatisplus.generator.config.OutputFile;
+import com.baomidou.mybatisplus.generator.config.rules.DateType;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
@@ -44,6 +45,7 @@ public class AutoGenerate {
                             .outputDir(path+"\\src\\main\\java")    //输出路径(写到java目录)
                             //.enableSwagger()           //开启swagger
                             .commentDate("yyyy-MM-dd")
+                            .dateType(DateType.ONLY_DATE)
                             .fileOverride();            //开启覆盖之前生成的文件
 
                 })
@@ -73,7 +75,7 @@ public class AutoGenerate {
                             .enableRestStyle()
                             .mapperBuilder()
                             .superClass(BaseMapper.class)
-                            .formatMapperFileName("%sMapper")
+                            .formatMapperFileName("I%sMapper")
                             .enableMapperAnnotation()
                             .formatXmlFileName("%sMapper");
                 })