diff --git a/maku-boot-learn/pom.xml b/maku-boot-learn/pom.xml
new file mode 100644
index 0000000..1200c4f
--- /dev/null
+++ b/maku-boot-learn/pom.xml
@@ -0,0 +1,94 @@
+
+
+ 4.0.0
+
+ net.maku
+ maku-boot
+ 4.3.0
+
+
+ maku-boot-learn
+
+
+
+ net.maku
+ maku-framework
+ ${revision}
+
+
+ net.maku
+ maku-boot-api
+ ${revision}
+
+
+ org.springframework.boot
+ spring-boot-configuration-processor
+ true
+
+
+ org.springframework.boot
+ spring-boot-starter-freemarker
+
+
+ com.aliyun.oss
+ aliyun-sdk-oss
+
+
+ com.qcloud
+ cos_api
+
+
+ com.qiniu
+ qiniu-java-sdk
+
+
+ com.huaweicloud
+ esdk-obs-java-bundle
+
+
+ io.minio
+ minio
+
+
+ com.github.whvcse
+ easy-captcha
+
+
+ me.zhyd.oauth
+ JustAuth
+
+
+ com.aliyun
+ dysmsapi20170525
+
+
+ com.squareup.okhttp3
+ okhttp
+
+
+ com.tencentcloudapi
+ tencentcloud-sdk-java
+
+
+
+ com.aliyun
+ dm20151123
+
+
+
+ com.tencentcloudapi
+ tencentcloud-sdk-java-ses
+
+
+ com.sun.mail
+ javax.mail
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/maku-boot-learn/src/main/resources/mapper/core/UserDao.xml b/maku-boot-learn/src/main/resources/mapper/core/UserDao.xml
new file mode 100644
index 0000000..27a2b03
--- /dev/null
+++ b/maku-boot-learn/src/main/resources/mapper/core/UserDao.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/maku-boot-new/src/main/java/net/maku/module/controller/TestController.java b/maku-boot-new/src/main/java/net/maku/module/controller/TestController.java
deleted file mode 100644
index 47b5605..0000000
--- a/maku-boot-new/src/main/java/net/maku/module/controller/TestController.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package net.maku.module.controller;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.AllArgsConstructor;
-import net.maku.framework.common.utils.Result;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 新模块测试
- *
- * @author 阿沐 babamu@126.com
- * MAKU
- */
-@RestController
-@RequestMapping("new/test")
-@Tag(name="新模块测试")
-@AllArgsConstructor
-public class TestController {
-
- @GetMapping()
- @Operation(summary = "测试接口")
- public Result test(){
-
- return Result.ok("测试数据");
- }
-}
diff --git a/maku-server/src/main/resources/application-dev.yml b/maku-server/src/main/resources/application-dev.yml
index db332d6..cccf1ff 100644
--- a/maku-server/src/main/resources/application-dev.yml
+++ b/maku-server/src/main/resources/application-dev.yml
@@ -1,10 +1,10 @@
spring:
data:
redis:
- database: 1
- host: localhost
+ database: 0
+ host: 127.0.0.1
port: 6379
- #password:
+ # password: wxbc5b16589b8f183e
#timeout: 6000ms # 连接超时时长(毫秒)
datasource:
dynamic:
@@ -20,9 +20,9 @@ spring:
master:
# MySQL8
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/maku_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
- username: maku
- password: 123456
+ url: jdbc:mysql://47.98.47.66:3306/book_dto?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+ username: root
+ password: Kh@#$1666026728
# 达梦
# driver-class-name: dm.jdbc.driver.DmDriver
# url: jdbc:dm://192.168.3.19:5236/maku_boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
diff --git a/pom.xml b/pom.xml
index f25066b..fa67b14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
maku-boot-api
maku-framework
maku-server
+ maku-boot-learn