From ad4063b2dca856fd351557015a7b0429207b4ac5 Mon Sep 17 00:00:00 2001
From: xxiaoccpm <3570544406@qq.com>
Date: Tue, 16 Jul 2024 11:01:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 maku-boot-learn/pom.xml                            | 94 ++++++++++++++++++++++
 .../src/main/resources/mapper/core/UserDao.xml     | 13 +++
 .../net/maku/module/controller/TestController.java | 29 -------
 maku-server/src/main/resources/application-dev.yml | 12 +--
 pom.xml                                            |  1 +
 5 files changed, 114 insertions(+), 35 deletions(-)
 create mode 100644 maku-boot-learn/pom.xml
 create mode 100644 maku-boot-learn/src/main/resources/mapper/core/UserDao.xml
 delete mode 100644 maku-boot-new/src/main/java/net/maku/module/controller/TestController.java

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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>net.maku</groupId>
+        <artifactId>maku-boot</artifactId>
+        <version>4.3.0</version>
+    </parent>
+
+    <artifactId>maku-boot-learn</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>net.maku</groupId>
+            <artifactId>maku-framework</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.maku</groupId>
+            <artifactId>maku-boot-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.qcloud</groupId>
+            <artifactId>cos_api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.qiniu</groupId>
+            <artifactId>qiniu-java-sdk</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.huaweicloud</groupId>
+            <artifactId>esdk-obs-java-bundle</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.whvcse</groupId>
+            <artifactId>easy-captcha</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>me.zhyd.oauth</groupId>
+            <artifactId>JustAuth</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dysmsapi20170525</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.tencentcloudapi</groupId>
+            <artifactId>tencentcloud-sdk-java</artifactId>
+        </dependency>
+        <!--阿里云邮件sdk-->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dm20151123</artifactId>
+        </dependency>
+        <!-- 腾讯云邮件sdk -->
+        <dependency>
+            <groupId>com.tencentcloudapi</groupId>
+            <artifactId>tencentcloud-sdk-java-ses</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
+        </dependency>
+    </dependencies>
+
+
+
+
+
+</project>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="core.dao.UserDao">
+
+    <resultMap type="core.entity.UserEntity" id="userMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="password" column="password"/>
+        <result property="curl" column="curl"/>
+    </resultMap>
+
+</mapper>
\ 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
- * <a href="https://maku.net">MAKU</a>
- */
-@RestController
-@RequestMapping("new/test")
-@Tag(name="新模块测试")
-@AllArgsConstructor
-public class TestController {
-
-    @GetMapping()
-    @Operation(summary = "测试接口")
-    public Result<String> 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 @@
         <module>maku-boot-api</module>
         <module>maku-framework</module>
         <module>maku-server</module>
+        <module>maku-boot-learn</module>
     </modules>
 
     <properties>