diff --git a/heima-leadnews-basic/heima-file-starter/pom.xml b/heima-leadnews-basic/heima-file-starter/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..286ffb68f29552559b268a6fc8aa3ec76399d7c3
--- /dev/null
+++ b/heima-leadnews-basic/heima-file-starter/pom.xml
@@ -0,0 +1,44 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews-basic</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>heima-file-starter</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>7.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </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-actuator</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/heima-leadnews-basic/heima-file-starter/src/main/java/com/heima/file/config/MinIOConfig.java b/heima-leadnews-basic/heima-file-starter/src/main/java/com/heima/file/config/MinIOConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..43c4823d71498ff33f609cf84eb3ffdd4b6467bf
--- /dev/null
+++ b/heima-leadnews-basic/heima-file-starter/src/main/java/com/heima/file/config/MinIOConfig.java
@@ -0,0 +1,31 @@
+package com.heima.file.config;
+
+import com.heima.file.service.FileStorageService;
+import io.minio.MinioClient;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+
+@Data
+@Configuration
+@EnableConfigurationProperties({MinIOConfigProperties.class})
+//当引入FileStorageService接口时
+@ConditionalOnClass(FileStorageService.class)
+public class MinIOConfig {
+
+    @Autowired
+    private MinIOConfigProperties minIOConfigProperties;
+
+    @Bean
+    public MinioClient minioClient() {
+        return MinioClient
+                .builder()
+                .credentials(minIOConfigProperties.getAccessKey(), minIOConfigProperties.getSecretKey())
+                .endpoint(minIOConfigProperties.getEndpoint())
+                .build();
+    }
+}
\ No newline at end of file
diff --git a/heima-leadnews-basic/heima-file-starter/src/main/java/com/heima/file/config/MinIOConfigProperties.java b/heima-leadnews-basic/heima-file-starter/src/main/java/com/heima/file/config/MinIOConfigProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..0d5b701791b418c242e77371edbf9233c50b4ba7
--- /dev/null
+++ b/heima-leadnews-basic/heima-file-starter/src/main/java/com/heima/file/config/MinIOConfigProperties.java
@@ -0,0 +1,18 @@
+package com.heima.file.config;
+
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.io.Serializable;
+
+@Data
+@ConfigurationProperties(prefix = "minio")  // 文件上传 配置前缀file.oss
+public class MinIOConfigProperties implements Serializable {
+
+    private String accessKey;
+    private String secretKey;
+    private String bucket;
+    private String endpoint;
+    private String readPath;
+}
diff --git a/heima-leadnews-basic/heima-file-starter/src/main/java/com/heima/file/service/FileStorageService.java b/heima-leadnews-basic/heima-file-starter/src/main/java/com/heima/file/service/FileStorageService.java
new file mode 100644
index 0000000000000000000000000000000000000000..a6cb3655f5fe568fb6a2e294e4bb670ffe8ee862
--- /dev/null
+++ b/heima-leadnews-basic/heima-file-starter/src/main/java/com/heima/file/service/FileStorageService.java
@@ -0,0 +1,43 @@
+package com.heima.file.service;
+
+import java.io.InputStream;
+
+/**
+ * @author itheima
+ */
+public interface FileStorageService {
+
+
+    /**
+     *  上传图片文件
+     * @param prefix  文件前缀
+     * @param filename  文件名
+     * @param inputStream 文件流
+     * @return  文件全路径
+     */
+    public String uploadImgFile(String prefix, String filename,InputStream inputStream);
+
+    /**
+     *  上传html文件
+     * @param prefix  文件前缀
+     * @param filename   文件名
+     * @param inputStream  文件流
+     * @return  文件全路径
+     */
+    public String uploadHtmlFile(String prefix, String filename,InputStream inputStream);
+
+    /**
+     * 删除文件
+     * @param pathUrl  文件全路径
+     */
+    public void delete(String pathUrl);
+
+    /**
+     * 下载文件
+     * @param pathUrl  文件全路径
+     * @return
+     *
+     */
+    public byte[]  downLoadFile(String pathUrl);
+
+}
diff --git a/heima-leadnews-basic/heima-file-starter/src/main/java/com/heima/file/service/impl/MinIOFileStorageService.java b/heima-leadnews-basic/heima-file-starter/src/main/java/com/heima/file/service/impl/MinIOFileStorageService.java
new file mode 100644
index 0000000000000000000000000000000000000000..ec2e094fceeebf088b898fcb84a1c2d06216dc9a
--- /dev/null
+++ b/heima-leadnews-basic/heima-file-starter/src/main/java/com/heima/file/service/impl/MinIOFileStorageService.java
@@ -0,0 +1,164 @@
+package com.heima.file.service.impl;
+
+
+import com.heima.file.config.MinIOConfig;
+import com.heima.file.config.MinIOConfigProperties;
+import com.heima.file.service.FileStorageService;
+import io.minio.GetObjectArgs;
+import io.minio.MinioClient;
+import io.minio.PutObjectArgs;
+import io.minio.RemoveObjectArgs;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Import;
+import org.springframework.util.StringUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Slf4j
+@EnableConfigurationProperties(MinIOConfigProperties.class)
+@Import(MinIOConfig.class)
+public class MinIOFileStorageService implements FileStorageService {
+
+    @Autowired
+    private MinioClient minioClient;
+
+    @Autowired
+    private MinIOConfigProperties minIOConfigProperties;
+
+    private final static String separator = "/";
+
+    /**
+     * @param dirPath
+     * @param filename  yyyy/mm/dd/file.jpg
+     * @return
+     */
+    public String builderFilePath(String dirPath,String filename) {
+        StringBuilder stringBuilder = new StringBuilder(50);
+        if(!StringUtils.isEmpty(dirPath)){
+            stringBuilder.append(dirPath).append(separator);
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
+        String todayStr = sdf.format(new Date());
+        stringBuilder.append(todayStr).append(separator);
+        stringBuilder.append(filename);
+        return stringBuilder.toString();
+    }
+
+    /**
+     *  上传图片文件
+     * @param prefix  文件前缀
+     * @param filename  文件名
+     * @param inputStream 文件流
+     * @return  文件全路径
+     */
+    @Override
+    public String uploadImgFile(String prefix, String filename,InputStream inputStream) {
+        String filePath = builderFilePath(prefix, filename);
+        try {
+            PutObjectArgs putObjectArgs = PutObjectArgs.builder()
+                    .object(filePath)
+                    .contentType("image/jpg")
+                    .bucket(minIOConfigProperties.getBucket()).stream(inputStream,inputStream.available(),-1)
+                    .build();
+            minioClient.putObject(putObjectArgs);
+            StringBuilder urlPath = new StringBuilder(minIOConfigProperties.getReadPath());
+            urlPath.append(separator+minIOConfigProperties.getBucket());
+            urlPath.append(separator);
+            urlPath.append(filePath);
+            return urlPath.toString();
+        }catch (Exception ex){
+            log.error("minio put file error.",ex);
+            throw new RuntimeException("上传文件失败");
+        }
+    }
+
+    /**
+     *  上传html文件
+     * @param prefix  文件前缀
+     * @param filename   文件名
+     * @param inputStream  文件流
+     * @return  文件全路径
+     */
+    @Override
+    public String uploadHtmlFile(String prefix, String filename,InputStream inputStream) {
+        String filePath = builderFilePath(prefix, filename);
+        try {
+            PutObjectArgs putObjectArgs = PutObjectArgs.builder()
+                    .object(filePath)
+                    .contentType("text/html")
+                    .bucket(minIOConfigProperties.getBucket()).stream(inputStream,inputStream.available(),-1)
+                    .build();
+            minioClient.putObject(putObjectArgs);
+            StringBuilder urlPath = new StringBuilder(minIOConfigProperties.getReadPath());
+            urlPath.append(separator+minIOConfigProperties.getBucket());
+            urlPath.append(separator);
+            urlPath.append(filePath);
+            return urlPath.toString();
+        }catch (Exception ex){
+            log.error("minio put file error.",ex);
+            ex.printStackTrace();
+            throw new RuntimeException("上传文件失败");
+        }
+    }
+
+    /**
+     * 删除文件
+     * @param pathUrl  文件全路径
+     */
+    @Override
+    public void delete(String pathUrl) {
+        String key = pathUrl.replace(minIOConfigProperties.getEndpoint()+"/","");
+        int index = key.indexOf(separator);
+        String bucket = key.substring(0,index);
+        String filePath = key.substring(index+1);
+        // 删除Objects
+        RemoveObjectArgs removeObjectArgs = RemoveObjectArgs.builder().bucket(bucket).object(filePath).build();
+        try {
+            minioClient.removeObject(removeObjectArgs);
+        } catch (Exception e) {
+            log.error("minio remove file error.  pathUrl:{}",pathUrl);
+            e.printStackTrace();
+        }
+    }
+
+
+    /**
+     * 下载文件
+     * @param pathUrl  文件全路径
+     * @return  文件流
+     *
+     */
+    @Override
+    public byte[] downLoadFile(String pathUrl)  {
+        String key = pathUrl.replace(minIOConfigProperties.getEndpoint()+"/","");
+        int index = key.indexOf(separator);
+        String bucket = key.substring(0,index);
+        String filePath = key.substring(index+1);
+        InputStream inputStream = null;
+        try {
+            inputStream = minioClient.getObject(GetObjectArgs.builder().bucket(minIOConfigProperties.getBucket()).object(filePath).build());
+        } catch (Exception e) {
+            log.error("minio down file error.  pathUrl:{}",pathUrl);
+            e.printStackTrace();
+        }
+
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        byte[] buff = new byte[100];
+        int rc = 0;
+        while (true) {
+            try {
+                if (!((rc = inputStream.read(buff, 0, 100)) > 0)) break;
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            byteArrayOutputStream.write(buff, 0, rc);
+        }
+        return byteArrayOutputStream.toByteArray();
+    }
+}
diff --git a/heima-leadnews-basic/heima-file-starter/src/main/resources/META-INF/spring.factories b/heima-leadnews-basic/heima-file-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000000000000000000000000000000000000..88924a4ca50fd6a755b2da4cc0fb01a8ff05415f
--- /dev/null
+++ b/heima-leadnews-basic/heima-file-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  com.heima.file.service.impl.MinIOFileStorageService
\ No newline at end of file
diff --git a/heima-leadnews-basic/pom.xml b/heima-leadnews-basic/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bf011cf7de05c5c07695539a88491b58ee295133
--- /dev/null
+++ b/heima-leadnews-basic/pom.xml
@@ -0,0 +1,23 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>heima-leadnews-basic</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>heima-file-starter</module>
+    </modules>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/heima-leadnews-common/pom.xml b/heima-leadnews-common/pom.xml
index fddcda5f827c378c251ecabe17075091ea032be4..eb0bbcc89c7b53586d6d25f0342b4d4ded346c38 100644
--- a/heima-leadnews-common/pom.xml
+++ b/heima-leadnews-common/pom.xml
@@ -13,6 +13,18 @@
     <name>heima-leadnews-common</name>
 
     <dependencies>
+
+        <dependency>
+            <groupId>net.sourceforge.tess4j</groupId>
+            <artifactId>tess4j</artifactId>
+            <version>4.1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.heima</groupId>
             <artifactId>heima-leadnews-utils</artifactId>
diff --git a/heima-leadnews-common/src/main/java/com/heima/common/aliyun/GreenImageScan.java b/heima-leadnews-common/src/main/java/com/heima/common/aliyun/GreenImageScan.java
new file mode 100644
index 0000000000000000000000000000000000000000..fcecab4d8460f698a417281ebe1e50b425942a61
--- /dev/null
+++ b/heima-leadnews-common/src/main/java/com/heima/common/aliyun/GreenImageScan.java
@@ -0,0 +1,157 @@
+package com.heima.common.aliyun;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.green.model.v20180509.ImageSyncScanRequest;
+import com.aliyuncs.http.FormatType;
+import com.aliyuncs.http.HttpResponse;
+import com.aliyuncs.http.MethodType;
+import com.aliyuncs.http.ProtocolType;
+import com.aliyuncs.profile.DefaultProfile;
+import com.aliyuncs.profile.IClientProfile;
+import com.heima.common.aliyun.util.ClientUploader;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "aliyun")
+public class GreenImageScan {
+
+    private String accessKeyId;
+    private String secret;
+    private String scenes;
+
+    /**
+     * 图片审核
+     * @param imageList
+     * @return
+     * @throws Exception
+     */
+    public Map imageScan(List<byte[]> imageList) throws Exception {
+        IClientProfile profile = DefaultProfile
+            .getProfile("cn-shanghai", accessKeyId, secret);
+        DefaultProfile
+            .addEndpoint("cn-shanghai", "cn-shanghai", "Green", "green.cn-shanghai.aliyuncs.com");
+        IAcsClient client = new DefaultAcsClient(profile);
+        ImageSyncScanRequest imageSyncScanRequest = new ImageSyncScanRequest();
+        // 指定api返回格式
+        imageSyncScanRequest.setAcceptFormat(FormatType.JSON);
+        // 指定请求方法
+        imageSyncScanRequest.setMethod(MethodType.POST);
+        imageSyncScanRequest.setEncoding("utf-8");
+        //支持http和https
+        imageSyncScanRequest.setProtocol(ProtocolType.HTTP);
+        JSONObject httpBody = new JSONObject();
+        /**
+         * 设置要检测的场景, 计费是按照该处传递的场景进行
+         * 一次请求中可以同时检测多张图片，每张图片可以同时检测多个风险场景，计费按照场景计算
+         * 例如：检测2张图片，场景传递porn、terrorism，计费会按照2张图片鉴黄，2张图片暴恐检测计算
+         * porn: porn表示色情场景检测
+         */
+
+        httpBody.put("scenes", Arrays.asList(scenes.split(",")));
+
+        /**
+         * 如果您要检测的文件存于本地服务器上，可以通过下述代码片生成url
+         * 再将返回的url作为图片地址传递到服务端进行检测
+         */
+        /**
+         * 设置待检测图片， 一张图片一个task
+         * 多张图片同时检测时，处理的时间由最后一个处理完的图片决定
+         * 通常情况下批量检测的平均rt比单张检测的要长, 一次批量提交的图片数越多，rt被拉长的概率越高
+         * 这里以单张图片检测作为示例, 如果是批量图片检测，请自行构建多个task
+         */
+        ClientUploader clientUploader = ClientUploader.getImageClientUploader(profile, false);
+        String url = null;
+        List<JSONObject> urlList = new ArrayList<JSONObject>();
+        for (byte[] bytes : imageList) {
+            url = clientUploader.uploadBytes(bytes);
+            JSONObject task = new JSONObject();
+            task.put("dataId", UUID.randomUUID().toString());
+            //设置图片链接为上传后的url
+            task.put("url", url);
+            task.put("time", new Date());
+            urlList.add(task);
+        }
+        httpBody.put("tasks", urlList);
+        imageSyncScanRequest.setHttpContent(org.apache.commons.codec.binary.StringUtils.getBytesUtf8(httpBody.toJSONString()),
+            "UTF-8", FormatType.JSON);
+        /**
+         * 请设置超时时间, 服务端全链路处理超时时间为10秒，请做相应设置
+         * 如果您设置的ReadTimeout小于服务端处理的时间，程序中会获得一个read timeout异常
+         */
+        imageSyncScanRequest.setConnectTimeout(3000);
+        imageSyncScanRequest.setReadTimeout(10000);
+        HttpResponse httpResponse = null;
+        try {
+            httpResponse = client.doAction(imageSyncScanRequest);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        Map<String, String> resultMap = new HashMap<>();
+
+        //服务端接收到请求，并完成处理返回的结果
+        if (httpResponse != null && httpResponse.isSuccess()) {
+            JSONObject scrResponse = JSON.parseObject(org.apache.commons.codec.binary.StringUtils.newStringUtf8(httpResponse.getHttpContent()));
+            System.out.println(JSON.toJSONString(scrResponse, true));
+            int requestCode = scrResponse.getIntValue("code");
+            //每一张图片的检测结果
+            JSONArray taskResults = scrResponse.getJSONArray("data");
+            if (200 == requestCode) {
+                for (Object taskResult : taskResults) {
+                    //单张图片的处理结果
+                    int taskCode = ((JSONObject) taskResult).getIntValue("code");
+                    //图片要检测的场景的处理结果, 如果是多个场景，则会有每个场景的结果
+                    JSONArray sceneResults = ((JSONObject) taskResult).getJSONArray("results");
+                    if (200 == taskCode) {
+                        for (Object sceneResult : sceneResults) {
+                            String scene = ((JSONObject) sceneResult).getString("scene");
+                            String label = ((JSONObject) sceneResult).getString("label");
+                            String suggestion = ((JSONObject) sceneResult).getString("suggestion");
+                            //根据scene和suggetion做相关处理
+                            //do something
+                            System.out.println("scene = [" + scene + "]");
+                            System.out.println("suggestion = [" + suggestion + "]");
+                            System.out.println("suggestion = [" + label + "]");
+                            if (!suggestion.equals("pass")) {
+                                resultMap.put("suggestion", suggestion);
+                                resultMap.put("label", label);
+                                return resultMap;
+                            }
+                        }
+
+                    } else {
+                        //单张图片处理失败, 原因视具体的情况详细分析
+                        System.out.println("task process fail. task response:" + JSON.toJSONString(taskResult));
+                        return null;
+                    }
+                }
+                resultMap.put("suggestion","pass");
+                return resultMap;
+            } else {
+                /**
+                 * 表明请求整体处理失败，原因视具体的情况详细分析
+                 */
+                System.out.println("the whole image scan request failed. response:" + JSON.toJSONString(scrResponse));
+                return null;
+            }
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/heima-leadnews-common/src/main/java/com/heima/common/aliyun/GreenTextScan.java b/heima-leadnews-common/src/main/java/com/heima/common/aliyun/GreenTextScan.java
new file mode 100644
index 0000000000000000000000000000000000000000..50cab59e451486fc48867876190684cd60604af4
--- /dev/null
+++ b/heima-leadnews-common/src/main/java/com/heima/common/aliyun/GreenTextScan.java
@@ -0,0 +1,121 @@
+package com.heima.common.aliyun;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.exceptions.ServerException;
+import com.aliyuncs.green.model.v20180509.TextScanRequest;
+import com.aliyuncs.http.FormatType;
+import com.aliyuncs.http.HttpResponse;
+import com.aliyuncs.profile.DefaultProfile;
+import com.aliyuncs.profile.IClientProfile;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "aliyun")
+public class GreenTextScan {
+
+    private String accessKeyId;
+    private String secret;
+
+    /**
+     * 文本审核接口
+     * @param content
+     * @return
+     * @throws Exception
+     */
+    public Map greenTextScan(String content) throws Exception {
+        System.out.println(accessKeyId);
+        IClientProfile profile = DefaultProfile
+                .getProfile("cn-shanghai", accessKeyId, secret);
+        DefaultProfile.addEndpoint("cn-shanghai", "cn-shanghai", "Green", "green.cn-shanghai.aliyuncs.com");
+        IAcsClient client = new DefaultAcsClient(profile);
+        TextScanRequest textScanRequest = new TextScanRequest();
+        textScanRequest.setAcceptFormat(FormatType.JSON); // 指定api返回格式
+        textScanRequest.setHttpContentType(FormatType.JSON);
+        textScanRequest.setMethod(com.aliyuncs.http.MethodType.POST); // 指定请求方法
+        textScanRequest.setEncoding("UTF-8");
+        textScanRequest.setRegionId("cn-shanghai");
+        List<Map<String, Object>> tasks = new ArrayList<Map<String, Object>>();
+        Map<String, Object> task1 = new LinkedHashMap<String, Object>();
+        task1.put("dataId", UUID.randomUUID().toString());
+        /**
+         * 待检测的文本，长度不超过10000个字符
+         */
+        task1.put("content", content);
+        tasks.add(task1);
+        JSONObject data = new JSONObject();
+
+        /**
+         * 检测场景，文本垃圾检测传递：antispam
+         **/
+        data.put("scenes", Arrays.asList("antispam"));
+        data.put("tasks", tasks);
+        System.out.println(JSON.toJSONString(data, true));
+        textScanRequest.setHttpContent(data.toJSONString().getBytes("UTF-8"), "UTF-8", FormatType.JSON);
+        // 请务必设置超时时间
+        textScanRequest.setConnectTimeout(3000);
+        textScanRequest.setReadTimeout(6000);
+
+        Map<String, String> resultMap = new HashMap<>();
+        try {
+            HttpResponse httpResponse = client.doAction(textScanRequest);
+            if (httpResponse.isSuccess()) {
+                JSONObject scrResponse = JSON.parseObject(new String(httpResponse.getHttpContent(), "UTF-8"));
+                System.out.println(JSON.toJSONString(scrResponse, true));
+                if (200 == scrResponse.getInteger("code")) {
+                    JSONArray taskResults = scrResponse.getJSONArray("data");
+                    for (Object taskResult : taskResults) {
+                        if (200 == ((JSONObject) taskResult).getInteger("code")) {
+                            JSONArray sceneResults = ((JSONObject) taskResult).getJSONArray("results");
+                            for (Object sceneResult : sceneResults) {
+                                String scene = ((JSONObject) sceneResult).getString("scene");
+                                String label = ((JSONObject) sceneResult).getString("label");
+                                String suggestion = ((JSONObject) sceneResult).getString("suggestion");
+                                System.out.println("suggestion = [" + label + "]");
+                                if (!suggestion.equals("pass")) {
+                                    resultMap.put("suggestion", suggestion);
+                                    resultMap.put("label", label);
+                                    return resultMap;
+                                }
+
+                            }
+                        } else {
+                            return null;
+                        }
+                    }
+                    resultMap.put("suggestion", "pass");
+                    return resultMap;
+                } else {
+                    return null;
+                }
+            } else {
+                return null;
+            }
+        } catch (ServerException e) {
+            e.printStackTrace();
+        } catch (ClientException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-common/src/main/java/com/heima/common/aliyun/util/ClientUploader.java b/heima-leadnews-common/src/main/java/com/heima/common/aliyun/util/ClientUploader.java
new file mode 100644
index 0000000000000000000000000000000000000000..12aa7c35ae18bf376200c24f0154d0f90aead3e1
--- /dev/null
+++ b/heima-leadnews-common/src/main/java/com/heima/common/aliyun/util/ClientUploader.java
@@ -0,0 +1,195 @@
+package com.heima.common.aliyun.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.model.ObjectMetadata;
+import com.aliyun.oss.model.PutObjectResult;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.green.model.v20180509.UploadCredentialsRequest;
+import com.aliyuncs.http.FormatType;
+import com.aliyuncs.http.HttpResponse;
+import com.aliyuncs.http.ProtocolType;
+import com.aliyuncs.profile.IClientProfile;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 用于本地图片文件检测时，上传本地图片
+ */
+public class ClientUploader {
+
+    private IClientProfile profile;
+    private volatile UploadCredentials uploadCredentials;
+    private Map<String, String> headers;
+    private String prefix;
+
+    private boolean internal = false;
+
+    private Object lock = new Object();
+
+    private ClientUploader(IClientProfile profile, String prefix, boolean internal) {
+        this.profile = profile;
+        this.uploadCredentials = null;
+        this.headers = new HashMap<String, String>();
+        this.prefix = prefix;
+        this.internal = internal;
+    }
+
+
+    public static ClientUploader getImageClientUploader(IClientProfile profile, boolean internal){
+        return  new ClientUploader(profile, "images", internal);
+    }
+
+    public static ClientUploader getVideoClientUploader(IClientProfile profile, boolean internal){
+        return  new ClientUploader(profile, "videos", internal);
+    }
+
+    public static ClientUploader getVoiceClientUploader(IClientProfile profile, boolean internal){
+        return  new ClientUploader(profile, "voices", internal);
+    }
+
+    public static ClientUploader getFileClientUploader(IClientProfile profile, boolean internal){
+        return  new ClientUploader(profile, "files", internal);
+    }
+
+    /**
+     * 上传并获取上传后的图片链接
+     * @param filePath
+     * @return
+     */
+    public String uploadFile(String filePath){
+        FileInputStream inputStream = null;
+        OSSClient ossClient = null;
+        try {
+            File file = new File(filePath);
+            UploadCredentials uploadCredentials = getCredentials();
+            if(uploadCredentials == null){
+                throw new RuntimeException("can not get upload credentials");
+            }
+            ObjectMetadata meta = new ObjectMetadata();
+            meta.setContentLength(file.length());
+            inputStream = new FileInputStream(file);
+
+            ossClient = new OSSClient(getOssEndpoint(uploadCredentials), uploadCredentials.getAccessKeyId(), uploadCredentials.getAccessKeySecret(), uploadCredentials.getSecurityToken());
+
+            String object = uploadCredentials.getUploadFolder() + '/' + this.prefix + '/' + String.valueOf(filePath.hashCode());
+            PutObjectResult ret = ossClient.putObject(uploadCredentials.getUploadBucket(), object, inputStream, meta);
+            return "oss://" + uploadCredentials.getUploadBucket() + "/" + object;
+        } catch (Exception e) {
+            throw new RuntimeException("upload file fail.", e);
+        } finally {
+            if(ossClient != null){
+                ossClient.shutdown();
+            }
+            if(inputStream != null){
+                try {
+                    inputStream.close();
+                }catch (Exception e){
+
+                }
+            }
+        }
+    }
+
+
+    private String getOssEndpoint(UploadCredentials uploadCredentials){
+        if(this.internal){
+            return uploadCredentials.getOssInternalEndpoint();
+        }else{
+            return uploadCredentials.getOssEndpoint();
+        }
+    }
+
+    /**
+     * 上传并获取上传后的图片链接
+     * @param bytes
+     * @return
+     */
+    public String uploadBytes(byte[] bytes){
+        OSSClient ossClient = null;
+        try {
+            UploadCredentials uploadCredentials = getCredentials();
+            if(uploadCredentials == null){
+                throw new RuntimeException("can not get upload credentials");
+            }
+
+            ossClient = new OSSClient(getOssEndpoint(uploadCredentials), uploadCredentials.getAccessKeyId(), uploadCredentials.getAccessKeySecret(), uploadCredentials.getSecurityToken());
+
+            String object = uploadCredentials.getUploadFolder() + '/' + this.prefix + '/' + UUID.randomUUID().toString();
+            PutObjectResult ret = ossClient.putObject(uploadCredentials.getUploadBucket(), object, new ByteArrayInputStream(bytes));
+            return "oss://" + uploadCredentials.getUploadBucket() + "/" + object;
+        } catch (Exception e) {
+            throw new RuntimeException("upload file fail.", e);
+        } finally {
+            if(ossClient != null){
+                ossClient.shutdown();
+            }
+        }
+    }
+
+
+    public void addHeader(String key, String value){
+        this.headers.put(key, value);
+    }
+
+
+    private UploadCredentials getCredentials() throws Exception{
+        if(this.uploadCredentials == null || this.uploadCredentials.getExpiredTime() < System.currentTimeMillis()){
+            synchronized(lock){
+                if(this.uploadCredentials == null || this.uploadCredentials.getExpiredTime() < System.currentTimeMillis()){
+                    this.uploadCredentials = getCredentialsFromServer();
+                }
+            }
+        }
+        return this.uploadCredentials;
+    }
+
+    /**
+     * 从服务器端获取上传凭证
+     * @return
+     * @throws Exception
+     */
+    private UploadCredentials getCredentialsFromServer() throws Exception{
+        UploadCredentialsRequest uploadCredentialsRequest =  new UploadCredentialsRequest();
+        uploadCredentialsRequest.setAcceptFormat(FormatType.JSON); // 指定api返回格式
+        uploadCredentialsRequest.setMethod(com.aliyuncs.http.MethodType.POST); // 指定请求方法
+        uploadCredentialsRequest.setEncoding("utf-8");
+        uploadCredentialsRequest.setProtocol(ProtocolType.HTTP);
+        for (Map.Entry<String, String> kv : this.headers.entrySet()) {
+            uploadCredentialsRequest.putHeaderParameter(kv.getKey(), kv.getValue());
+        }
+
+        uploadCredentialsRequest.setHttpContent(new JSONObject().toJSONString().getBytes("UTF-8"), "UTF-8", FormatType.JSON);
+
+        IAcsClient client = null;
+        try{
+            client = new DefaultAcsClient(profile);
+            HttpResponse httpResponse =  client.doAction(uploadCredentialsRequest);
+            if (httpResponse.isSuccess()) {
+                JSONObject scrResponse = JSON.parseObject(new String(httpResponse.getHttpContent(), "UTF-8"));
+                if (200 == scrResponse.getInteger("code")) {
+                    JSONObject data = scrResponse.getJSONObject("data");
+                    return new UploadCredentials(data.getString("accessKeyId"), data.getString("accessKeySecret"),
+                            data.getString("securityToken"), data.getLongValue("expiredTime"),
+                            data.getString("ossEndpoint"), data.getString("ossInternalEndpoint"), data.getString("uploadBucket"), data.getString("uploadFolder"));
+                }
+
+                String requestId = scrResponse.getString("requestId");
+                throw new RuntimeException("get upload credential from server fail. requestId:" + requestId + ", code:" + scrResponse.getInteger("code"));
+            }
+            throw new RuntimeException("get upload credential from server fail. http response status:" + httpResponse.getStatus());
+        }finally {
+            client.shutdown();
+        }
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-common/src/main/java/com/heima/common/aliyun/util/CustomLibUploader.java b/heima-leadnews-common/src/main/java/com/heima/common/aliyun/util/CustomLibUploader.java
new file mode 100644
index 0000000000000000000000000000000000000000..04e1e47ff5bd9b224f481cdb7797603b020fcc9f
--- /dev/null
+++ b/heima-leadnews-common/src/main/java/com/heima/common/aliyun/util/CustomLibUploader.java
@@ -0,0 +1,159 @@
+package com.heima.common.aliyun.util;
+
+
+import javax.activation.MimetypesFileTypeMap;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.*;
+
+/**
+ * 用于自定义图库上传图片
+ */
+public class CustomLibUploader {
+
+
+    public String uploadFile(String host, String uploadFolder, String ossAccessKeyId,
+                             String policy, String signature,
+                             String filepath) throws Exception {
+        LinkedHashMap<String, String> textMap = new LinkedHashMap<String, String>();
+        // key
+        String objectName = uploadFolder + "/imglib_" + UUID.randomUUID().toString() + ".jpg";
+        textMap.put("key", objectName);
+        // Content-Disposition
+        textMap.put("Content-Disposition", "attachment;filename="+filepath);
+        // OSSAccessKeyId
+        textMap.put("OSSAccessKeyId", ossAccessKeyId);
+        // policy
+        textMap.put("policy", policy);
+        // Signature
+        textMap.put("Signature", signature);
+
+        Map<String, String> fileMap = new HashMap<String, String>();
+        fileMap.put("file", filepath);
+
+        String ret = formUpload(host, textMap, fileMap);
+        System.out.println("[" + host + "] post_object:" + objectName);
+        System.out.println("post reponse:" + ret);
+        return objectName;
+    }
+
+    private static String formUpload(String urlStr, Map<String, String> textMap, Map<String, String> fileMap) throws Exception {
+        String res = "";
+        HttpURLConnection conn = null;
+        String BOUNDARY = "9431149156168";
+        try {
+            URL url = new URL(urlStr);
+            conn = (HttpURLConnection) url.openConnection();
+            conn.setConnectTimeout(5000);
+            conn.setReadTimeout(10000);
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+            conn.setRequestMethod("POST");
+            conn.setRequestProperty("User-Agent",
+                    "Mozilla/5.0 (Windows; U; Windows NT 6.1; zh-CN; rv:1.9.2.6)");
+            conn.setRequestProperty("Content-Type",
+                    "multipart/form-data; boundary=" + BOUNDARY);
+
+            OutputStream out = new DataOutputStream(conn.getOutputStream());
+            // text
+            if (textMap != null) {
+                StringBuffer strBuf = new StringBuffer();
+                Iterator iter = textMap.entrySet().iterator();
+                int i = 0;
+                while (iter.hasNext()) {
+                    Map.Entry entry = (Map.Entry) iter.next();
+                    String inputName = (String) entry.getKey();
+                    String inputValue = (String) entry.getValue();
+                    if (inputValue == null) {
+                        continue;
+                    }
+                    if (i == 0) {
+                        strBuf.append("--").append(BOUNDARY).append(
+                                "\r\n");
+                        strBuf.append("Content-Disposition: form-data; name=\""
+                                + inputName + "\"\r\n\r\n");
+                        strBuf.append(inputValue);
+                    } else {
+                        strBuf.append("\r\n").append("--").append(BOUNDARY).append(
+                                "\r\n");
+                        strBuf.append("Content-Disposition: form-data; name=\""
+                                + inputName + "\"\r\n\r\n");
+
+                        strBuf.append(inputValue);
+                    }
+
+                    i++;
+                }
+                out.write(strBuf.toString().getBytes());
+            }
+
+            // file
+            if (fileMap != null) {
+                Iterator iter = fileMap.entrySet().iterator();
+                while (iter.hasNext()) {
+                    Map.Entry entry = (Map.Entry) iter.next();
+                    String inputName = (String) entry.getKey();
+                    String inputValue = (String) entry.getValue();
+                    if (inputValue == null) {
+                        continue;
+                    }
+                    File file = new File(inputValue);
+                    String filename = file.getName();
+                    String contentType = new MimetypesFileTypeMap().getContentType(file);
+                    if (contentType == null || contentType.equals("")) {
+                        contentType = "application/octet-stream";
+                    }
+
+                    StringBuffer strBuf = new StringBuffer();
+                    strBuf.append("\r\n").append("--").append(BOUNDARY).append(
+                            "\r\n");
+                    strBuf.append("Content-Disposition: form-data; name=\""
+                            + inputName + "\"; filename=\"" + filename
+                            + "\"\r\n");
+                    strBuf.append("Content-Type: " + contentType + "\r\n\r\n");
+
+                    out.write(strBuf.toString().getBytes());
+
+                    DataInputStream in = new DataInputStream(new FileInputStream(file));
+                    int bytes = 0;
+                    byte[] bufferOut = new byte[1024];
+                    while ((bytes = in.read(bufferOut)) != -1) {
+                        out.write(bufferOut, 0, bytes);
+                    }
+                    in.close();
+                }
+                StringBuffer strBuf = new StringBuffer();
+                out.write(strBuf.toString().getBytes());
+            }
+
+            byte[] endData = ("\r\n--" + BOUNDARY + "--\r\n").getBytes();
+            out.write(endData);
+            out.flush();
+            out.close();
+
+            // 读取返回数据
+            StringBuffer strBuf = new StringBuffer();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(
+                    conn.getInputStream()));
+            String line = null;
+            while ((line = reader.readLine()) != null) {
+                strBuf.append(line).append("\n");
+            }
+            res = strBuf.toString();
+            reader.close();
+            reader = null;
+        } catch (Exception e) {
+            System.err.println("发送POST请求出错: " + urlStr);
+            throw e;
+        } finally {
+            if (conn != null) {
+                conn.disconnect();
+                conn = null;
+            }
+        }
+        return res;
+    }
+
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-common/src/main/java/com/heima/common/aliyun/util/UploadCredentials.java b/heima-leadnews-common/src/main/java/com/heima/common/aliyun/util/UploadCredentials.java
new file mode 100644
index 0000000000000000000000000000000000000000..14581078e088abf22fd6a23166c2fcdbeffb99ec
--- /dev/null
+++ b/heima-leadnews-common/src/main/java/com/heima/common/aliyun/util/UploadCredentials.java
@@ -0,0 +1,90 @@
+package com.heima.common.aliyun.util;
+
+import java.io.Serializable;
+
+public class UploadCredentials implements Serializable {
+
+    private String accessKeyId;
+    private String  accessKeySecret;
+    private String  securityToken;
+    private Long  expiredTime;
+    private String  ossEndpoint;
+    private String  ossInternalEndpoint;
+    private String  uploadBucket;
+    private String  uploadFolder;
+
+    public UploadCredentials(String accessKeyId, String accessKeySecret, String securityToken, Long expiredTime, String ossEndpoint, String ossInternalEndpoint, String uploadBucket, String uploadFolder) {
+        this.accessKeyId = accessKeyId;
+        this.accessKeySecret = accessKeySecret;
+        this.securityToken = securityToken;
+        this.expiredTime = expiredTime;
+        this.ossEndpoint = ossEndpoint;
+        this.ossInternalEndpoint = ossInternalEndpoint;
+        this.uploadBucket = uploadBucket;
+        this.uploadFolder = uploadFolder;
+    }
+
+    public String getAccessKeyId() {
+        return accessKeyId;
+    }
+
+    public void setAccessKeyId(String accessKeyId) {
+        this.accessKeyId = accessKeyId;
+    }
+
+    public String getAccessKeySecret() {
+        return accessKeySecret;
+    }
+
+    public void setAccessKeySecret(String accessKeySecret) {
+        this.accessKeySecret = accessKeySecret;
+    }
+
+    public String getSecurityToken() {
+        return securityToken;
+    }
+
+    public void setSecurityToken(String securityToken) {
+        this.securityToken = securityToken;
+    }
+
+    public Long getExpiredTime() {
+        return expiredTime;
+    }
+
+    public void setExpiredTime(Long expiredTime) {
+        this.expiredTime = expiredTime;
+    }
+
+    public String getOssEndpoint() {
+        return ossEndpoint;
+    }
+
+    public void setOssEndpoint(String ossEndpoint) {
+        this.ossEndpoint = ossEndpoint;
+    }
+
+    public String getUploadBucket() {
+        return uploadBucket;
+    }
+
+    public void setUploadBucket(String uploadBucket) {
+        this.uploadBucket = uploadBucket;
+    }
+
+    public String getUploadFolder() {
+        return uploadFolder;
+    }
+
+    public void setUploadFolder(String uploadFolder) {
+        this.uploadFolder = uploadFolder;
+    }
+
+    public String getOssInternalEndpoint() {
+        return ossInternalEndpoint;
+    }
+
+    public void setOssInternalEndpoint(String ossInternalEndpoint) {
+        this.ossInternalEndpoint = ossInternalEndpoint;
+    }
+}
diff --git a/heima-leadnews-common/src/main/java/com/heima/common/cache/CacheService.java b/heima-leadnews-common/src/main/java/com/heima/common/cache/CacheService.java
new file mode 100644
index 0000000000000000000000000000000000000000..ee420b889c74fa68e9af96937965ebca26ae13f4
--- /dev/null
+++ b/heima-leadnews-common/src/main/java/com/heima/common/cache/CacheService.java
@@ -0,0 +1,1466 @@
+package com.heima.common.cache;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.redis.connection.*;
+import org.springframework.data.redis.core.*;
+import org.springframework.data.redis.core.ZSetOperations.TypedTuple;
+import org.springframework.data.redis.core.types.Expiration;
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+@Component
+public class CacheService extends CachingConfigurerSupport {
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+
+    public StringRedisTemplate getstringRedisTemplate() {
+        return this.stringRedisTemplate;
+    }
+
+    /** -------------------key相关操作--------------------- */
+
+    /**
+     * 删除key
+     *
+     * @param key
+     */
+    public void delete(String key) {
+        stringRedisTemplate.delete(key);
+    }
+
+    /**
+     * 批量删除key
+     *
+     * @param keys
+     */
+    public void delete(Collection<String> keys) {
+        stringRedisTemplate.delete(keys);
+    }
+
+    /**
+     * 序列化key
+     *
+     * @param key
+     * @return
+     */
+    public byte[] dump(String key) {
+        return stringRedisTemplate.dump(key);
+    }
+
+    /**
+     * 是否存在key
+     *
+     * @param key
+     * @return
+     */
+    public Boolean exists(String key) {
+        return stringRedisTemplate.hasKey(key);
+    }
+
+    /**
+     * 设置过期时间
+     *
+     * @param key
+     * @param timeout
+     * @param unit
+     * @return
+     */
+    public Boolean expire(String key, long timeout, TimeUnit unit) {
+        return stringRedisTemplate.expire(key, timeout, unit);
+    }
+
+    /**
+     * 设置过期时间
+     *
+     * @param key
+     * @param date
+     * @return
+     */
+    public Boolean expireAt(String key, Date date) {
+        return stringRedisTemplate.expireAt(key, date);
+    }
+
+    /**
+     * 查找匹配的key
+     *
+     * @param pattern
+     * @return
+     */
+    public Set<String> keys(String pattern) {
+        return stringRedisTemplate.keys(pattern);
+    }
+
+    /**
+     * 将当前数据库的 key 移动到给定的数据库 db 当中
+     *
+     * @param key
+     * @param dbIndex
+     * @return
+     */
+    public Boolean move(String key, int dbIndex) {
+        return stringRedisTemplate.move(key, dbIndex);
+    }
+
+    /**
+     * 移除 key 的过期时间，key 将持久保持
+     *
+     * @param key
+     * @return
+     */
+    public Boolean persist(String key) {
+        return stringRedisTemplate.persist(key);
+    }
+
+    /**
+     * 返回 key 的剩余的过期时间
+     *
+     * @param key
+     * @param unit
+     * @return
+     */
+    public Long getExpire(String key, TimeUnit unit) {
+        return stringRedisTemplate.getExpire(key, unit);
+    }
+
+    /**
+     * 返回 key 的剩余的过期时间
+     *
+     * @param key
+     * @return
+     */
+    public Long getExpire(String key) {
+        return stringRedisTemplate.getExpire(key);
+    }
+
+    /**
+     * 从当前数据库中随机返回一个 key
+     *
+     * @return
+     */
+    public String randomKey() {
+        return stringRedisTemplate.randomKey();
+    }
+
+    /**
+     * 修改 key 的名称
+     *
+     * @param oldKey
+     * @param newKey
+     */
+    public void rename(String oldKey, String newKey) {
+        stringRedisTemplate.rename(oldKey, newKey);
+    }
+
+    /**
+     * 仅当 newkey 不存在时，将 oldKey 改名为 newkey
+     *
+     * @param oldKey
+     * @param newKey
+     * @return
+     */
+    public Boolean renameIfAbsent(String oldKey, String newKey) {
+        return stringRedisTemplate.renameIfAbsent(oldKey, newKey);
+    }
+
+    /**
+     * 返回 key 所储存的值的类型
+     *
+     * @param key
+     * @return
+     */
+    public DataType type(String key) {
+        return stringRedisTemplate.type(key);
+    }
+
+    /** -------------------string相关操作--------------------- */
+
+    /**
+     * 设置指定 key 的值
+     * @param key
+     * @param value
+     */
+    public void set(String key, String value) {
+        stringRedisTemplate.opsForValue().set(key, value);
+    }
+
+    /**
+     * 获取指定 key 的值
+     * @param key
+     * @return
+     */
+    public String get(String key) {
+        return stringRedisTemplate.opsForValue().get(key);
+    }
+
+    /**
+     * 返回 key 中字符串值的子字符
+     * @param key
+     * @param start
+     * @param end
+     * @return
+     */
+    public String getRange(String key, long start, long end) {
+        return stringRedisTemplate.opsForValue().get(key, start, end);
+    }
+
+    /**
+     * 将给定 key 的值设为 value ，并返回 key 的旧值(old value)
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public String getAndSet(String key, String value) {
+        return stringRedisTemplate.opsForValue().getAndSet(key, value);
+    }
+
+    /**
+     * 对 key 所储存的字符串值，获取指定偏移量上的位(bit)
+     *
+     * @param key
+     * @param offset
+     * @return
+     */
+    public Boolean getBit(String key, long offset) {
+        return stringRedisTemplate.opsForValue().getBit(key, offset);
+    }
+
+    /**
+     * 批量获取
+     *
+     * @param keys
+     * @return
+     */
+    public List<String> multiGet(Collection<String> keys) {
+        return stringRedisTemplate.opsForValue().multiGet(keys);
+    }
+
+    /**
+     * 设置ASCII码, 字符串'a'的ASCII码是97, 转为二进制是'01100001', 此方法是将二进制第offset位值变为value
+     *
+     * @param key
+     * @param
+     * @param value
+     *            值,true为1, false为0
+     * @return
+     */
+    public boolean setBit(String key, long offset, boolean value) {
+        return stringRedisTemplate.opsForValue().setBit(key, offset, value);
+    }
+
+    /**
+     * 将值 value 关联到 key ，并将 key 的过期时间设为 timeout
+     *
+     * @param key
+     * @param value
+     * @param timeout
+     *            过期时间
+     * @param unit
+     *            时间单位, 天:TimeUnit.DAYS 小时:TimeUnit.HOURS 分钟:TimeUnit.MINUTES
+     *            秒:TimeUnit.SECONDS 毫秒:TimeUnit.MILLISECONDS
+     */
+    public void setEx(String key, String value, long timeout, TimeUnit unit) {
+        stringRedisTemplate.opsForValue().set(key, value, timeout, unit);
+    }
+
+    /**
+     * 只有在 key 不存在时设置 key 的值
+     *
+     * @param key
+     * @param value
+     * @return 之前已经存在返回false,不存在返回true
+     */
+    public boolean setIfAbsent(String key, String value) {
+        return stringRedisTemplate.opsForValue().setIfAbsent(key, value);
+    }
+
+    /**
+     * 用 value 参数覆写给定 key 所储存的字符串值，从偏移量 offset 开始
+     *
+     * @param key
+     * @param value
+     * @param offset
+     *            从指定位置开始覆写
+     */
+    public void setRange(String key, String value, long offset) {
+        stringRedisTemplate.opsForValue().set(key, value, offset);
+    }
+
+    /**
+     * 获取字符串的长度
+     *
+     * @param key
+     * @return
+     */
+    public Long size(String key) {
+        return stringRedisTemplate.opsForValue().size(key);
+    }
+
+    /**
+     * 批量添加
+     *
+     * @param maps
+     */
+    public void multiSet(Map<String, String> maps) {
+        stringRedisTemplate.opsForValue().multiSet(maps);
+    }
+
+    /**
+     * 同时设置一个或多个 key-value 对，当且仅当所有给定 key 都不存在
+     *
+     * @param maps
+     * @return 之前已经存在返回false,不存在返回true
+     */
+    public boolean multiSetIfAbsent(Map<String, String> maps) {
+        return stringRedisTemplate.opsForValue().multiSetIfAbsent(maps);
+    }
+
+    /**
+     * 增加(自增长), 负数则为自减
+     *
+     * @param key
+     * @param
+     * @return
+     */
+    public Long incrBy(String key, long increment) {
+        return stringRedisTemplate.opsForValue().increment(key, increment);
+    }
+
+    /**
+     *
+     * @param key
+     * @param
+     * @return
+     */
+    public Double incrByFloat(String key, double increment) {
+        return stringRedisTemplate.opsForValue().increment(key, increment);
+    }
+
+    /**
+     * 追加到末尾
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Integer append(String key, String value) {
+        return stringRedisTemplate.opsForValue().append(key, value);
+    }
+
+    /** -------------------hash相关操作------------------------- */
+
+    /**
+     * 获取存储在哈希表中指定字段的值
+     *
+     * @param key
+     * @param field
+     * @return
+     */
+    public Object hGet(String key, String field) {
+        return stringRedisTemplate.opsForHash().get(key, field);
+    }
+
+    /**
+     * 获取所有给定字段的值
+     *
+     * @param key
+     * @return
+     */
+    public Map<Object, Object> hGetAll(String key) {
+        return stringRedisTemplate.opsForHash().entries(key);
+    }
+
+    /**
+     * 获取所有给定字段的值
+     *
+     * @param key
+     * @param fields
+     * @return
+     */
+    public List<Object> hMultiGet(String key, Collection<Object> fields) {
+        return stringRedisTemplate.opsForHash().multiGet(key, fields);
+    }
+
+    public void hPut(String key, String hashKey, String value) {
+        stringRedisTemplate.opsForHash().put(key, hashKey, value);
+    }
+
+    public void hPutAll(String key, Map<String, String> maps) {
+        stringRedisTemplate.opsForHash().putAll(key, maps);
+    }
+
+    /**
+     * 仅当hashKey不存在时才设置
+     *
+     * @param key
+     * @param hashKey
+     * @param value
+     * @return
+     */
+    public Boolean hPutIfAbsent(String key, String hashKey, String value) {
+        return stringRedisTemplate.opsForHash().putIfAbsent(key, hashKey, value);
+    }
+
+    /**
+     * 删除一个或多个哈希表字段
+     *
+     * @param key
+     * @param fields
+     * @return
+     */
+    public Long hDelete(String key, Object... fields) {
+        return stringRedisTemplate.opsForHash().delete(key, fields);
+    }
+
+    /**
+     * 查看哈希表 key 中，指定的字段是否存在
+     *
+     * @param key
+     * @param field
+     * @return
+     */
+    public boolean hExists(String key, String field) {
+        return stringRedisTemplate.opsForHash().hasKey(key, field);
+    }
+
+    /**
+     * 为哈希表 key 中的指定字段的整数值加上增量 increment
+     *
+     * @param key
+     * @param field
+     * @param increment
+     * @return
+     */
+    public Long hIncrBy(String key, Object field, long increment) {
+        return stringRedisTemplate.opsForHash().increment(key, field, increment);
+    }
+
+    /**
+     * 为哈希表 key 中的指定字段的整数值加上增量 increment
+     *
+     * @param key
+     * @param field
+     * @param delta
+     * @return
+     */
+    public Double hIncrByFloat(String key, Object field, double delta) {
+        return stringRedisTemplate.opsForHash().increment(key, field, delta);
+    }
+
+    /**
+     * 获取所有哈希表中的字段
+     *
+     * @param key
+     * @return
+     */
+    public Set<Object> hKeys(String key) {
+        return stringRedisTemplate.opsForHash().keys(key);
+    }
+
+    /**
+     * 获取哈希表中字段的数量
+     *
+     * @param key
+     * @return
+     */
+    public Long hSize(String key) {
+        return stringRedisTemplate.opsForHash().size(key);
+    }
+
+    /**
+     * 获取哈希表中所有值
+     *
+     * @param key
+     * @return
+     */
+    public List<Object> hValues(String key) {
+        return stringRedisTemplate.opsForHash().values(key);
+    }
+
+    /**
+     * 迭代哈希表中的键值对
+     *
+     * @param key
+     * @param options
+     * @return
+     */
+    public Cursor<Map.Entry<Object, Object>> hScan(String key, ScanOptions options) {
+        return stringRedisTemplate.opsForHash().scan(key, options);
+    }
+
+    /** ------------------------list相关操作---------------------------- */
+
+    /**
+     * 通过索引获取列表中的元素
+     *
+     * @param key
+     * @param index
+     * @return
+     */
+    public String lIndex(String key, long index) {
+        return stringRedisTemplate.opsForList().index(key, index);
+    }
+
+    /**
+     * 获取列表指定范围内的元素
+     *
+     * @param key
+     * @param start
+     *            开始位置, 0是开始位置
+     * @param end
+     *            结束位置, -1返回所有
+     * @return
+     */
+    public List<String> lRange(String key, long start, long end) {
+        return stringRedisTemplate.opsForList().range(key, start, end);
+    }
+
+    /**
+     * 存储在list头部
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lLeftPush(String key, String value) {
+        return stringRedisTemplate.opsForList().leftPush(key, value);
+    }
+
+    /**
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lLeftPushAll(String key, String... value) {
+        return stringRedisTemplate.opsForList().leftPushAll(key, value);
+    }
+
+    /**
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lLeftPushAll(String key, Collection<String> value) {
+        return stringRedisTemplate.opsForList().leftPushAll(key, value);
+    }
+
+    /**
+     * 当list存在的时候才加入
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lLeftPushIfPresent(String key, String value) {
+        return stringRedisTemplate.opsForList().leftPushIfPresent(key, value);
+    }
+
+    /**
+     * 如果pivot存在,再pivot前面添加
+     *
+     * @param key
+     * @param pivot
+     * @param value
+     * @return
+     */
+    public Long lLeftPush(String key, String pivot, String value) {
+        return stringRedisTemplate.opsForList().leftPush(key, pivot, value);
+    }
+
+    /**
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lRightPush(String key, String value) {
+        return stringRedisTemplate.opsForList().rightPush(key, value);
+    }
+
+    /**
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lRightPushAll(String key, String... value) {
+        return stringRedisTemplate.opsForList().rightPushAll(key, value);
+    }
+
+    /**
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lRightPushAll(String key, Collection<String> value) {
+        return stringRedisTemplate.opsForList().rightPushAll(key, value);
+    }
+
+    /**
+     * 为已存在的列表添加值
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long lRightPushIfPresent(String key, String value) {
+        return stringRedisTemplate.opsForList().rightPushIfPresent(key, value);
+    }
+
+    /**
+     * 在pivot元素的右边添加值
+     *
+     * @param key
+     * @param pivot
+     * @param value
+     * @return
+     */
+    public Long lRightPush(String key, String pivot, String value) {
+        return stringRedisTemplate.opsForList().rightPush(key, pivot, value);
+    }
+
+    /**
+     * 通过索引设置列表元素的值
+     *
+     * @param key
+     * @param index
+     *            位置
+     * @param value
+     */
+    public void lSet(String key, long index, String value) {
+        stringRedisTemplate.opsForList().set(key, index, value);
+    }
+
+    /**
+     * 移出并获取列表的第一个元素
+     *
+     * @param key
+     * @return 删除的元素
+     */
+    public String lLeftPop(String key) {
+        return stringRedisTemplate.opsForList().leftPop(key);
+    }
+
+    /**
+     * 移出并获取列表的第一个元素， 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
+     *
+     * @param key
+     * @param timeout
+     *            等待时间
+     * @param unit
+     *            时间单位
+     * @return
+     */
+    public String lBLeftPop(String key, long timeout, TimeUnit unit) {
+        return stringRedisTemplate.opsForList().leftPop(key, timeout, unit);
+    }
+
+    /**
+     * 移除并获取列表最后一个元素
+     *
+     * @param key
+     * @return 删除的元素
+     */
+    public String lRightPop(String key) {
+        return stringRedisTemplate.opsForList().rightPop(key);
+    }
+
+    /**
+     * 移出并获取列表的最后一个元素， 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
+     *
+     * @param key
+     * @param timeout
+     *            等待时间
+     * @param unit
+     *            时间单位
+     * @return
+     */
+    public String lBRightPop(String key, long timeout, TimeUnit unit) {
+        return stringRedisTemplate.opsForList().rightPop(key, timeout, unit);
+    }
+
+    /**
+     * 移除列表的最后一个元素，并将该元素添加到另一个列表并返回
+     *
+     * @param sourceKey
+     * @param destinationKey
+     * @return
+     */
+    public String lRightPopAndLeftPush(String sourceKey, String destinationKey) {
+        return stringRedisTemplate.opsForList().rightPopAndLeftPush(sourceKey,
+                destinationKey);
+    }
+
+    /**
+     * 从列表中弹出一个值，将弹出的元素插入到另外一个列表中并返回它； 如果列表没有元素会阻塞列表直到等待超时或发现可弹出元素为止
+     *
+     * @param sourceKey
+     * @param destinationKey
+     * @param timeout
+     * @param unit
+     * @return
+     */
+    public String lBRightPopAndLeftPush(String sourceKey, String destinationKey,
+                                        long timeout, TimeUnit unit) {
+        return stringRedisTemplate.opsForList().rightPopAndLeftPush(sourceKey,
+                destinationKey, timeout, unit);
+    }
+    
+    /**
+     * 删除集合中值等于value得元素
+     *
+     * @param key
+     * @param index
+     *            index=0, 删除所有值等于value的元素; index>0, 从头部开始删除第一个值等于value的元素;
+     *            index<0, 从尾部开始删除第一个值等于value的元素;
+     * @param value
+     * @return
+     */
+    public Long lRemove(String key, long index, String value) {
+        return stringRedisTemplate.opsForList().remove(key, index, value);
+    }
+
+    /**
+     * 裁剪list
+     *
+     * @param key
+     * @param start
+     * @param end
+     */
+    public void lTrim(String key, long start, long end) {
+        stringRedisTemplate.opsForList().trim(key, start, end);
+    }
+
+    /**
+     * 获取列表长度
+     *
+     * @param key
+     * @return
+     */
+    public Long lLen(String key) {
+        return stringRedisTemplate.opsForList().size(key);
+    }
+
+
+    /** --------------------set相关操作-------------------------- */
+
+    /**
+     * set添加元素
+     *
+     * @param key
+     * @param values
+     * @return
+     */
+    public Long sAdd(String key, String... values) {
+        return stringRedisTemplate.opsForSet().add(key, values);
+    }
+
+    /**
+     * set移除元素
+     *
+     * @param key
+     * @param values
+     * @return
+     */
+    public Long sRemove(String key, Object... values) {
+        return stringRedisTemplate.opsForSet().remove(key, values);
+    }
+
+    /**
+     * 移除并返回集合的一个随机元素
+     *
+     * @param key
+     * @return
+     */
+    public String sPop(String key) {
+        return stringRedisTemplate.opsForSet().pop(key);
+    }
+
+    /**
+     * 将元素value从一个集合移到另一个集合
+     *
+     * @param key
+     * @param value
+     * @param destKey
+     * @return
+     */
+    public Boolean sMove(String key, String value, String destKey) {
+        return stringRedisTemplate.opsForSet().move(key, value, destKey);
+    }
+
+    /**
+     * 获取集合的大小
+     *
+     * @param key
+     * @return
+     */
+    public Long sSize(String key) {
+        return stringRedisTemplate.opsForSet().size(key);
+    }
+
+    /**
+     * 判断集合是否包含value
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Boolean sIsMember(String key, Object value) {
+        return stringRedisTemplate.opsForSet().isMember(key, value);
+    }
+
+    /**
+     * 获取两个集合的交集
+     *
+     * @param key
+     * @param otherKey
+     * @return
+     */
+    public Set<String> sIntersect(String key, String otherKey) {
+        return stringRedisTemplate.opsForSet().intersect(key, otherKey);
+    }
+
+    /**
+     * 获取key集合与多个集合的交集
+     *
+     * @param key
+     * @param otherKeys
+     * @return
+     */
+    public Set<String> sIntersect(String key, Collection<String> otherKeys) {
+        return stringRedisTemplate.opsForSet().intersect(key, otherKeys);
+    }
+
+    /**
+     * key集合与otherKey集合的交集存储到destKey集合中
+     *
+     * @param key
+     * @param otherKey
+     * @param destKey
+     * @return
+     */
+    public Long sIntersectAndStore(String key, String otherKey, String destKey) {
+        return stringRedisTemplate.opsForSet().intersectAndStore(key, otherKey,
+                destKey);
+    }
+
+    /**
+     * key集合与多个集合的交集存储到destKey集合中
+     *
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Long sIntersectAndStore(String key, Collection<String> otherKeys,
+                                   String destKey) {
+        return stringRedisTemplate.opsForSet().intersectAndStore(key, otherKeys,
+                destKey);
+    }
+
+    /**
+     * 获取两个集合的并集
+     *
+     * @param key
+     * @param otherKeys
+     * @return
+     */
+    public Set<String> sUnion(String key, String otherKeys) {
+        return stringRedisTemplate.opsForSet().union(key, otherKeys);
+    }
+
+    /**
+     * 获取key集合与多个集合的并集
+     *
+     * @param key
+     * @param otherKeys
+     * @return
+     */
+    public Set<String> sUnion(String key, Collection<String> otherKeys) {
+        return stringRedisTemplate.opsForSet().union(key, otherKeys);
+    }
+
+    /**
+     * key集合与otherKey集合的并集存储到destKey中
+     *
+     * @param key
+     * @param otherKey
+     * @param destKey
+     * @return
+     */
+    public Long sUnionAndStore(String key, String otherKey, String destKey) {
+        return stringRedisTemplate.opsForSet().unionAndStore(key, otherKey, destKey);
+    }
+
+    /**
+     * key集合与多个集合的并集存储到destKey中
+     *
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Long sUnionAndStore(String key, Collection<String> otherKeys,
+                               String destKey) {
+        return stringRedisTemplate.opsForSet().unionAndStore(key, otherKeys, destKey);
+    }
+
+    /**
+     * 获取两个集合的差集
+     *
+     * @param key
+     * @param otherKey
+     * @return
+     */
+    public Set<String> sDifference(String key, String otherKey) {
+        return stringRedisTemplate.opsForSet().difference(key, otherKey);
+    }
+
+    /**
+     * 获取key集合与多个集合的差集
+     *
+     * @param key
+     * @param otherKeys
+     * @return
+     */
+    public Set<String> sDifference(String key, Collection<String> otherKeys) {
+        return stringRedisTemplate.opsForSet().difference(key, otherKeys);
+    }
+
+    /**
+     * key集合与otherKey集合的差集存储到destKey中
+     *
+     * @param key
+     * @param otherKey
+     * @param destKey
+     * @return
+     */
+    public Long sDifference(String key, String otherKey, String destKey) {
+        return stringRedisTemplate.opsForSet().differenceAndStore(key, otherKey,
+                destKey);
+    }
+
+    /**
+     * key集合与多个集合的差集存储到destKey中
+     *
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Long sDifference(String key, Collection<String> otherKeys,
+                            String destKey) {
+        return stringRedisTemplate.opsForSet().differenceAndStore(key, otherKeys,
+                destKey);
+    }
+
+    /**
+     * 获取集合所有元素
+     *
+     * @param key
+     * @param
+     * @param
+     * @return
+     */
+    public Set<String> setMembers(String key) {
+        return stringRedisTemplate.opsForSet().members(key);
+    }
+
+    /**
+     * 随机获取集合中的一个元素
+     *
+     * @param key
+     * @return
+     */
+    public String sRandomMember(String key) {
+        return stringRedisTemplate.opsForSet().randomMember(key);
+    }
+
+    /**
+     * 随机获取集合中count个元素
+     *
+     * @param key
+     * @param count
+     * @return
+     */
+    public List<String> sRandomMembers(String key, long count) {
+        return stringRedisTemplate.opsForSet().randomMembers(key, count);
+    }
+
+    /**
+     * 随机获取集合中count个元素并且去除重复的
+     *
+     * @param key
+     * @param count
+     * @return
+     */
+    public Set<String> sDistinctRandomMembers(String key, long count) {
+        return stringRedisTemplate.opsForSet().distinctRandomMembers(key, count);
+    }
+
+    /**
+     *
+     * @param key
+     * @param options
+     * @return
+     */
+    public Cursor<String> sScan(String key, ScanOptions options) {
+        return stringRedisTemplate.opsForSet().scan(key, options);
+    }
+
+    /**------------------zSet相关操作--------------------------------*/
+
+    /**
+     * 添加元素,有序集合是按照元素的score值由小到大排列
+     *
+     * @param key
+     * @param value
+     * @param score
+     * @return
+     */
+    public Boolean zAdd(String key, String value, double score) {
+        return stringRedisTemplate.opsForZSet().add(key, value, score);
+    }
+
+    /**
+     *
+     * @param key
+     * @param values
+     * @return
+     */
+    public Long zAdd(String key, Set<TypedTuple<String>> values) {
+        return stringRedisTemplate.opsForZSet().add(key, values);
+    }
+
+    /**
+     *
+     * @param key
+     * @param values
+     * @return
+     */
+    public Long zRemove(String key, Object... values) {
+        return stringRedisTemplate.opsForZSet().remove(key, values);
+    }
+
+    public Long zRemove(String key, Collection<String> values) {
+        if(values!=null&&!values.isEmpty()){
+            Object[] objs = values.toArray(new Object[values.size()]);
+            return stringRedisTemplate.opsForZSet().remove(key, objs);
+        }
+       return 0L;
+    }
+
+    /**
+     * 增加元素的score值，并返回增加后的值
+     *
+     * @param key
+     * @param value
+     * @param delta
+     * @return
+     */
+    public Double zIncrementScore(String key, String value, double delta) {
+        return stringRedisTemplate.opsForZSet().incrementScore(key, value, delta);
+    }
+
+    /**
+     * 返回元素在集合的排名,有序集合是按照元素的score值由小到大排列
+     *
+     * @param key
+     * @param value
+     * @return 0表示第一位
+     */
+    public Long zRank(String key, Object value) {
+        return stringRedisTemplate.opsForZSet().rank(key, value);
+    }
+
+    /**
+     * 返回元素在集合的排名,按元素的score值由大到小排列
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Long zReverseRank(String key, Object value) {
+        return stringRedisTemplate.opsForZSet().reverseRank(key, value);
+    }
+
+    /**
+     * 获取集合的元素, 从小到大排序
+     *
+     * @param key
+     * @param start
+     *            开始位置
+     * @param end
+     *            结束位置, -1查询所有
+     * @return
+     */
+    public Set<String> zRange(String key, long start, long end) {
+        return stringRedisTemplate.opsForZSet().range(key, start, end);
+    }
+    
+    /**
+     * 获取zset集合的所有元素, 从小到大排序
+     *
+     */
+    public Set<String> zRangeAll(String key) {
+        return zRange(key,0,-1);
+    }
+
+    /**
+     * 获取集合元素, 并且把score值也获取
+     *
+     * @param key
+     * @param start
+     * @param end
+     * @return
+     */
+    public Set<TypedTuple<String>> zRangeWithScores(String key, long start,
+                                                    long end) {
+        return stringRedisTemplate.opsForZSet().rangeWithScores(key, start, end);
+    }
+
+    /**
+     * 根据Score值查询集合元素
+     *
+     * @param key
+     * @param min
+     *            最小值
+     * @param max
+     *            最大值
+     * @return
+     */
+    public Set<String> zRangeByScore(String key, double min, double max) {
+        return stringRedisTemplate.opsForZSet().rangeByScore(key, min, max);
+    }
+
+
+    /**
+     * 根据Score值查询集合元素, 从小到大排序
+     *
+     * @param key
+     * @param min
+     *            最小值
+     * @param max
+     *            最大值
+     * @return
+     */
+    public Set<TypedTuple<String>> zRangeByScoreWithScores(String key,
+                                                           double min, double max) {
+        return stringRedisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max);
+    }
+
+    /**
+     *
+     * @param key
+     * @param min
+     * @param max
+     * @param start
+     * @param end
+     * @return
+     */
+    public Set<TypedTuple<String>> zRangeByScoreWithScores(String key,
+                                                           double min, double max, long start, long end) {
+        return stringRedisTemplate.opsForZSet().rangeByScoreWithScores(key, min, max,
+                start, end);
+    }
+
+    /**
+     * 获取集合的元素, 从大到小排序
+     *
+     * @param key
+     * @param start
+     * @param end
+     * @return
+     */
+    public Set<String> zReverseRange(String key, long start, long end) {
+        return stringRedisTemplate.opsForZSet().reverseRange(key, start, end);
+
+    }
+
+    public Set<String> zReverseRangeByScore(String key, long min, long max) {
+        return stringRedisTemplate.opsForZSet().reverseRangeByScore(key, min, max);
+
+    }
+
+    /**
+     * 获取集合的元素, 从大到小排序, 并返回score值
+     *
+     * @param key
+     * @param start
+     * @param end
+     * @return
+     */
+    public Set<TypedTuple<String>> zReverseRangeWithScores(String key,
+                                                           long start, long end) {
+        return stringRedisTemplate.opsForZSet().reverseRangeWithScores(key, start,
+                end);
+    }
+
+    /**
+     * 根据Score值查询集合元素, 从大到小排序
+     *
+     * @param key
+     * @param min
+     * @param max
+     * @return
+     */
+    public Set<String> zReverseRangeByScore(String key, double min,
+                                            double max) {
+        return stringRedisTemplate.opsForZSet().reverseRangeByScore(key, min, max);
+    }
+
+    /**
+     * 根据Score值查询集合元素, 从大到小排序
+     *
+     * @param key
+     * @param min
+     * @param max
+     * @return
+     */
+    public Set<TypedTuple<String>> zReverseRangeByScoreWithScores(
+            String key, double min, double max) {
+        return stringRedisTemplate.opsForZSet().reverseRangeByScoreWithScores(key,
+                min, max);
+    }
+
+    /**
+     *
+     * @param key
+     * @param min
+     * @param max
+     * @param start
+     * @param end
+     * @return
+     */
+    public Set<String> zReverseRangeByScore(String key, double min,
+                                            double max, long start, long end) {
+        return stringRedisTemplate.opsForZSet().reverseRangeByScore(key, min, max,
+                start, end);
+    }
+
+    /**
+     * 根据score值获取集合元素数量
+     *
+     * @param key
+     * @param min
+     * @param max
+     * @return
+     */
+    public Long zCount(String key, double min, double max) {
+        return stringRedisTemplate.opsForZSet().count(key, min, max);
+    }
+
+    /**
+     * 获取集合大小
+     *
+     * @param key
+     * @return
+     */
+    public Long zSize(String key) {
+        return stringRedisTemplate.opsForZSet().size(key);
+    }
+
+    /**
+     * 获取集合大小
+     *
+     * @param key
+     * @return
+     */
+    public Long zZCard(String key) {
+        return stringRedisTemplate.opsForZSet().zCard(key);
+    }
+
+    /**
+     * 获取集合中value元素的score值
+     *
+     * @param key
+     * @param value
+     * @return
+     */
+    public Double zScore(String key, Object value) {
+        return stringRedisTemplate.opsForZSet().score(key, value);
+    }
+
+    /**
+     * 移除指定索引位置的成员
+     *
+     * @param key
+     * @param start
+     * @param end
+     * @return
+     */
+    public Long zRemoveRange(String key, long start, long end) {
+        return stringRedisTemplate.opsForZSet().removeRange(key, start, end);
+    }
+
+    /**
+     * 根据指定的score值的范围来移除成员
+     *
+     * @param key
+     * @param min
+     * @param max
+     * @return
+     */
+    public Long zRemoveRangeByScore(String key, double min, double max) {
+        return stringRedisTemplate.opsForZSet().removeRangeByScore(key, min, max);
+    }
+
+    /**
+     * 获取key和otherKey的并集并存储在destKey中
+     *
+     * @param key
+     * @param otherKey
+     * @param destKey
+     * @return
+     */
+    public Long zUnionAndStore(String key, String otherKey, String destKey) {
+        return stringRedisTemplate.opsForZSet().unionAndStore(key, otherKey, destKey);
+    }
+
+    /**
+     *
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Long zUnionAndStore(String key, Collection<String> otherKeys,
+                               String destKey) {
+        return stringRedisTemplate.opsForZSet()
+                .unionAndStore(key, otherKeys, destKey);
+    }
+
+    /**
+     * 交集
+     *
+     * @param key
+     * @param otherKey
+     * @param destKey
+     * @return
+     */
+    public Long zIntersectAndStore(String key, String otherKey,
+                                   String destKey) {
+        return stringRedisTemplate.opsForZSet().intersectAndStore(key, otherKey,
+                destKey);
+    }
+
+    /**
+     * 交集
+     *
+     * @param key
+     * @param otherKeys
+     * @param destKey
+     * @return
+     */
+    public Long zIntersectAndStore(String key, Collection<String> otherKeys,
+                                   String destKey) {
+        return stringRedisTemplate.opsForZSet().intersectAndStore(key, otherKeys,
+                destKey);
+    }
+
+    /**
+     *
+     * @param key
+     * @param options
+     * @return
+     */
+    public Cursor<TypedTuple<String>> zScan(String key, ScanOptions options) {
+        return stringRedisTemplate.opsForZSet().scan(key, options);
+    }
+
+    /**
+     * 扫描主键，建议使用
+     * @param patten
+     * @return
+     */
+    public Set<String> scan(String patten){
+        Set<String> keys = stringRedisTemplate.execute((RedisCallback<Set<String>>) connection -> {
+            Set<String> result = new HashSet<>();
+            try (Cursor<byte[]> cursor = connection.scan(new ScanOptions.ScanOptionsBuilder()
+                    .match(patten).count(10000).build())) {
+                while (cursor.hasNext()) {
+                    result.add(new String(cursor.next()));
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            return result;
+        });
+        return  keys;
+    }
+    
+    /**
+     * 管道技术，提高性能
+     * @param type
+     * @param values
+     * @return
+     */
+    public List<Object> lRightPushPipeline(String type,Collection<String> values){
+        List<Object> results = stringRedisTemplate.executePipelined(new RedisCallback<Object>() {
+                    public Object doInRedis(RedisConnection connection) throws DataAccessException {
+                        StringRedisConnection stringRedisConn = (StringRedisConnection)connection;
+                        //集合转换数组
+                        String[] strings = values.toArray(new String[values.size()]);
+                        //直接批量发送
+                        stringRedisConn.rPush(type, strings);
+                        return null;
+                    }
+                });
+        return results;
+    }
+
+    public List<Object> refreshWithPipeline(String future_key,String topic_key,Collection<String> values){
+
+        List<Object> objects = stringRedisTemplate.executePipelined(new RedisCallback<Object>() {
+            @Nullable
+            @Override
+            public Object doInRedis(RedisConnection redisConnection) throws DataAccessException {
+                StringRedisConnection stringRedisConnection = (StringRedisConnection)redisConnection;
+                String[] strings = values.toArray(new String[values.size()]);
+                stringRedisConnection.lPush(topic_key,strings);
+                stringRedisConnection.zRem(future_key,strings);
+                return null;
+            }
+        });
+        return objects;
+    }
+
+    /**
+     * 加锁
+     *
+     * @param name
+     * @param expire
+     * @return
+     */
+    public String tryLock(String name, long expire) {
+        name = name + "_lock";
+        String token = UUID.randomUUID().toString();
+        RedisConnectionFactory factory = stringRedisTemplate.getConnectionFactory();
+        RedisConnection conn = factory.getConnection();
+        try {
+
+            //参考redis命令：
+            //set key value [EX seconds] [PX milliseconds] [NX|XX]
+            Boolean result = conn.set(
+                    name.getBytes(),
+                    token.getBytes(),
+                    Expiration.from(expire, TimeUnit.MILLISECONDS),
+                    RedisStringCommands.SetOption.SET_IF_ABSENT //NX
+            );
+            if (result != null && result)
+                return token;
+        } finally {
+            RedisConnectionUtils.releaseConnection(conn, factory,false);
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/heima-leadnews-common/src/main/java/com/heima/common/constants/AliyunAuditResultConstants.java b/heima-leadnews-common/src/main/java/com/heima/common/constants/AliyunAuditResultConstants.java
new file mode 100644
index 0000000000000000000000000000000000000000..e7219907ddcb0df4278c6dc39e444dbccf73e41e
--- /dev/null
+++ b/heima-leadnews-common/src/main/java/com/heima/common/constants/AliyunAuditResultConstants.java
@@ -0,0 +1,16 @@
+package com.heima.common.constants;
+
+/**
+ * @author ghy
+ */
+public interface AliyunAuditResultConstants {
+
+    String PASS = "pass";
+    String REVIEW = "review";
+    String BLOCK = "block";
+
+    String PASS_MESSAGE = "审核通过";
+    String REVIEW_MESSAGE = "人工审核";
+    String BLOCK_MESSAGE = "审核失败";
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-common/src/main/java/com/heima/common/constants/ArticleConstants.java b/heima-leadnews-common/src/main/java/com/heima/common/constants/ArticleConstants.java
new file mode 100644
index 0000000000000000000000000000000000000000..77fef3cf0f50bf0780b1ae66b1a111d16826f51a
--- /dev/null
+++ b/heima-leadnews-common/src/main/java/com/heima/common/constants/ArticleConstants.java
@@ -0,0 +1,31 @@
+package com.heima.common.constants;
+
+
+/**
+ * APP端搜索的常量
+ */
+public interface ArticleConstants {
+
+    /**
+     * 加载更多
+     */
+    Short LOADTYPE_LOAD_MORE = 1;
+
+    /**
+     * 加载最新
+     */
+    Short LOADTYPE_LOAD_NEW = 2;
+
+    /**
+     * 频道
+     */
+    String DEFAULT_TAG = "__all__";
+
+    String ARTICLE_ES_SYNC_TOPIC = "article.es.sync.topic";
+
+    Integer HOT_ARTICLE_LIKE_WEIGHT = 3;
+    Integer HOT_ARTICLE_COMMENT_WEIGHT = 5;
+    Integer HOT_ARTICLE_COLLECTION_WEIGHT = 8;
+    String HOT_ARTICLE_FIRST_PAGE = "hot_article_first_page_";
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-common/src/main/java/com/heima/common/constants/WemediaConstants.java b/heima-leadnews-common/src/main/java/com/heima/common/constants/WemediaConstants.java
new file mode 100644
index 0000000000000000000000000000000000000000..63ffab8637ba1e77dacc96e744a4137fb34da91b
--- /dev/null
+++ b/heima-leadnews-common/src/main/java/com/heima/common/constants/WemediaConstants.java
@@ -0,0 +1,22 @@
+package com.heima.common.constants;
+
+public interface WemediaConstants {
+
+    Short COLLECT_MATERIAL = 1;//收藏
+
+    Short CANCEL_COLLECT_MATERIAL = 0;//取消收藏
+
+    String WM_NEWS_TYPE_IMAGE = "image";
+
+    Short WM_NEWS_NONE_IMAGE = 0;  //无图
+    Short WM_NEWS_SINGLE_IMAGE = 1;  //单图
+    Short WM_NEWS_MANY_IMAGE = 3;  //三图
+    Short WM_NEWS_TYPE_AUTO = -1;  //自动
+
+    Short WM_CONTENT_REFERENCE = 0; //内容引用
+    Short WM_COVER_REFERENCE = 1;  //封面引用
+
+    Short WM_NEWS_STATUS_DRAFT = 0;  //草稿
+    Short WM_NEWS_STATUS_SUBMIT = 0;  //提交
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-common/src/main/java/com/heima/common/constants/WmNewsMessageConstants.java b/heima-leadnews-common/src/main/java/com/heima/common/constants/WmNewsMessageConstants.java
new file mode 100644
index 0000000000000000000000000000000000000000..5a82ed3244830617a4e8efb0dca3a43be49634a1
--- /dev/null
+++ b/heima-leadnews-common/src/main/java/com/heima/common/constants/WmNewsMessageConstants.java
@@ -0,0 +1,6 @@
+package com.heima.common.constants;
+
+public interface WmNewsMessageConstants {
+
+    String WM_NEWS_UP_OR_DOWN_TOPIC="wm.news.up.or.down.topic";
+}
\ No newline at end of file
diff --git a/heima-leadnews-common/src/main/java/com/heima/common/knife4j/SwaggerConfiguration.java b/heima-leadnews-common/src/main/java/com/heima/common/knife4j/SwaggerConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..99a7ee718e21f989e12a838428befb635e397381
--- /dev/null
+++ b/heima-leadnews-common/src/main/java/com/heima/common/knife4j/SwaggerConfiguration.java
@@ -0,0 +1,43 @@
+package com.heima.common.knife4j;
+
+import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+@EnableKnife4j
+@Import(BeanValidatorPluginsConfiguration.class)
+public class SwaggerConfiguration {
+
+    @Bean(value = "defaultApi")
+    public Docket defaultApi2() {
+        Docket docket=new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                //分组名称
+                .groupName("1.0")
+                .select()
+                //这里指定Controller扫描包路径
+                .apis(RequestHandlerSelectors.basePackage("com.heima"))
+                .paths(PathSelectors.any())
+                .build();
+        return docket;
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("黑马头条API文档")
+                .description("黑马头条API文档")
+                .version("1.0")
+                .build();
+    }
+}
\ No newline at end of file
diff --git a/heima-leadnews-common/src/main/java/com/heima/common/tess4j/Tess4jClient.java b/heima-leadnews-common/src/main/java/com/heima/common/tess4j/Tess4jClient.java
new file mode 100644
index 0000000000000000000000000000000000000000..bb6c3470af21f9519bb0481cdfa96131a4fdc84a
--- /dev/null
+++ b/heima-leadnews-common/src/main/java/com/heima/common/tess4j/Tess4jClient.java
@@ -0,0 +1,36 @@
+package com.heima.common.tess4j;
+
+import lombok.Getter;
+import lombok.Setter;
+import net.sourceforge.tess4j.ITesseract;
+import net.sourceforge.tess4j.Tesseract;
+import net.sourceforge.tess4j.TesseractException;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.awt.image.BufferedImage;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "tess4j")
+public class Tess4jClient {
+
+    private String dataPath;
+    private String language;
+
+    public String doOCR(BufferedImage image) throws TesseractException {
+        //创建Tesseract对象
+        ITesseract tesseract = new Tesseract();
+        //设置字体库路径
+        tesseract.setDatapath(dataPath);
+        //中文识别
+        tesseract.setLanguage(language);
+        //执行ocr识别
+        String result = tesseract.doOCR(image);
+        //替换回车和tal键  使结果为一行
+        result = result.replaceAll("\\r|\\n", "-").replaceAll(" ", "");
+        return result;
+    }
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-common/src/main/resources/META-INF/spring.factories b/heima-leadnews-common/src/main/resources/META-INF/spring.factories
index 0b0a4aaf38d19b1511517d4dc5832119abf4def1..3568e59a9ceb913ef5ed7e200a9c8f2a51e19308 100644
--- a/heima-leadnews-common/src/main/resources/META-INF/spring.factories
+++ b/heima-leadnews-common/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,7 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.heima.common.exception.ExceptionCatch
\ No newline at end of file
+  com.heima.common.exception.ExceptionCatch,\
+  com.heima.common.knife4j.SwaggerConfiguration,\
+  com.heima.common.aliyun.GreenTextScan,\
+  com.heima.common.aliyun.GreenImageScan,\
+  com.heima.common.tess4j.Tess4jClient,\
+  com.heima.common.cache.CacheService
\ No newline at end of file
diff --git a/heima-leadnews-feign-api/pom.xml b/heima-leadnews-feign-api/pom.xml
index e5a206502d2f0f37362ca0718a4345aed36fc603..0b9bb0a85538fd48a6ff1240e4197ecd6085c317 100644
--- a/heima-leadnews-feign-api/pom.xml
+++ b/heima-leadnews-feign-api/pom.xml
@@ -25,6 +25,10 @@
             <groupId>com.heima</groupId>
             <artifactId>heima-leadnews-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/heima-leadnews-feign-api/src/main/java/com/heima/apis/article/IArticleClient.java b/heima-leadnews-feign-api/src/main/java/com/heima/apis/article/IArticleClient.java
new file mode 100644
index 0000000000000000000000000000000000000000..c1f492f6b541687f1df46ec34195cece613c4200
--- /dev/null
+++ b/heima-leadnews-feign-api/src/main/java/com/heima/apis/article/IArticleClient.java
@@ -0,0 +1,26 @@
+package com.heima.apis.article;
+
+import com.heima.apis.article.fallback.ArticleClientFallback;
+import com.heima.model.article.dtos.ArticleDto;
+import com.heima.model.common.dtos.ResponseResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-08 16:49:46
+ */
+@FeignClient(name = "leadnews-article", fallback = ArticleClientFallback.class)
+public interface IArticleClient {
+
+    /**
+     * 保存或更新文章
+     * @param dto
+     * @return
+     */
+    @PostMapping("/api/v1/article/save")
+    ResponseResult saveApArticle(@RequestBody ArticleDto dto);
+
+}
diff --git a/heima-leadnews-feign-api/src/main/java/com/heima/apis/article/fallback/ArticleClientFallback.java b/heima-leadnews-feign-api/src/main/java/com/heima/apis/article/fallback/ArticleClientFallback.java
new file mode 100644
index 0000000000000000000000000000000000000000..58c755acd9c456daf4c184349ece268ae76d3930
--- /dev/null
+++ b/heima-leadnews-feign-api/src/main/java/com/heima/apis/article/fallback/ArticleClientFallback.java
@@ -0,0 +1,28 @@
+package com.heima.apis.article.fallback;
+
+import com.heima.apis.article.IArticleClient;
+import com.heima.model.article.dtos.ArticleDto;
+import com.heima.model.common.dtos.ResponseResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-09 15:58:37
+ */
+@Component
+@Slf4j
+public class ArticleClientFallback implements IArticleClient {
+
+    /**
+     * 保存文章数据 降级处理
+     * @param dto
+     * @return
+     */
+    @Override
+    public ResponseResult saveApArticle(ArticleDto dto) {
+        log.warn("保存文章失败了，进入了降级逻辑");
+        return ResponseResult.okResult(-1L);
+    }
+}
diff --git a/heima-leadnews-feign-api/src/main/java/com/heima/apis/wemedia/IWemediaClient.java b/heima-leadnews-feign-api/src/main/java/com/heima/apis/wemedia/IWemediaClient.java
new file mode 100644
index 0000000000000000000000000000000000000000..97b6e291e58661299ed984201d148c02f3f9f6a0
--- /dev/null
+++ b/heima-leadnews-feign-api/src/main/java/com/heima/apis/wemedia/IWemediaClient.java
@@ -0,0 +1,20 @@
+package com.heima.apis.wemedia;
+
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.wemedia.pojos.WmChannel;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-17 11:07:40
+ */
+@FeignClient(name = "leadnews-wemedia")
+public interface IWemediaClient {
+
+    @GetMapping("/inner/api/v1/channel/list")
+    ResponseResult<List<WmChannel>> channels();
+}
diff --git a/heima-leadnews-gateway/heima-leadnews-app-gateway/pom.xml b/heima-leadnews-gateway/heima-leadnews-app-gateway/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3e1cd3093c998be744a81e44de68b7ea37292cc1
--- /dev/null
+++ b/heima-leadnews-gateway/heima-leadnews-app-gateway/pom.xml
@@ -0,0 +1,19 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews-gateway</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>heima-leadnews-app-gateway</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/heima-leadnews-gateway/heima-leadnews-app-gateway/src/main/java/com/heima/app/gateway/AppGateway.java b/heima-leadnews-gateway/heima-leadnews-app-gateway/src/main/java/com/heima/app/gateway/AppGateway.java
new file mode 100644
index 0000000000000000000000000000000000000000..1e067fcc8a5c89de37a11c69f4eb91605a7be52b
--- /dev/null
+++ b/heima-leadnews-gateway/heima-leadnews-app-gateway/src/main/java/com/heima/app/gateway/AppGateway.java
@@ -0,0 +1,11 @@
+package com.heima.app.gateway;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class AppGateway {
+    public static void main(String[] args) {
+        SpringApplication.run(AppGateway.class, args);
+    }
+}
diff --git a/heima-leadnews-gateway/heima-leadnews-app-gateway/src/main/java/com/heima/app/gateway/filter/AuthorizeFilter.java b/heima-leadnews-gateway/heima-leadnews-app-gateway/src/main/java/com/heima/app/gateway/filter/AuthorizeFilter.java
new file mode 100644
index 0000000000000000000000000000000000000000..37f9c7e7b0c0fc861686b64fc1ea79fa5380880f
--- /dev/null
+++ b/heima-leadnews-gateway/heima-leadnews-app-gateway/src/main/java/com/heima/app/gateway/filter/AuthorizeFilter.java
@@ -0,0 +1,85 @@
+package com.heima.app.gateway.filter;
+
+import com.heima.app.gateway.utils.AppJwtUtil;
+import io.jsonwebtoken.Claims;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.cloud.gateway.filter.GlobalFilter;
+import org.springframework.core.Ordered;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.stereotype.Component;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+/**
+ * 网关鉴权
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-03 16:02:38
+ */
+@Component
+@Slf4j
+public class AuthorizeFilter implements GlobalFilter, Ordered {
+
+    public static final String LOGIN_PATH = "/login";
+
+    @Override
+    public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
+        log.warn("AppGateway AuthorizeFilter running -----");
+        // 1.放行登录请求
+        ServerHttpRequest request = exchange.getRequest();
+        ServerHttpResponse response = exchange.getResponse();
+        String path = request.getPath().toString();
+        log.warn("请求路径:{}", path);
+        if (path.contains(LOGIN_PATH)) {
+            log.warn("是登录请求，放行");
+            return chain.filter(exchange);
+        }
+        //释放跨域测试请求
+        if (path.contains("/ajax")) {
+            log.warn("是跨域测试请求，放行");
+            return chain.filter(exchange);
+        }
+
+        // 2.判断token是否有效
+        boolean flag = true;
+        String token = request.getHeaders().getFirst("token");
+        if(StringUtils.isBlank(token)) {
+            flag = false;
+        }
+        Claims claims = null;
+        try {
+            claims = AppJwtUtil.getClaimsBody(token);
+            int result = AppJwtUtil.verifyToken(claims);
+            if(result == 1 || result == 2) {
+                flag = false;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            flag = false;
+        }
+        if(flag) {
+            if(claims != null) {
+                // 3.有效：放行
+                Object id = claims.get("id");
+                log.warn("token正确，用户ID:{}", id);
+                exchange.mutate()
+                    .request(builder -> builder.header("appUserId", id.toString()))
+                    .build();
+            }
+            return chain.filter(exchange);
+        } else {
+            // 4.无效：拦截
+            response.setRawStatusCode(HttpStatus.UNAUTHORIZED.value());
+            return response.setComplete();
+        }
+    }
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+}
diff --git a/heima-leadnews-gateway/heima-leadnews-app-gateway/src/main/java/com/heima/app/gateway/utils/AppJwtUtil.java b/heima-leadnews-gateway/heima-leadnews-app-gateway/src/main/java/com/heima/app/gateway/utils/AppJwtUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..6ab509ae1b3275975275d9414581d1361760a4ec
--- /dev/null
+++ b/heima-leadnews-gateway/heima-leadnews-app-gateway/src/main/java/com/heima/app/gateway/utils/AppJwtUtil.java
@@ -0,0 +1,133 @@
+package com.heima.app.gateway.utils;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.CompressionCodecs;
+import io.jsonwebtoken.ExpiredJwtException;
+import io.jsonwebtoken.Jws;
+import io.jsonwebtoken.JwsHeader;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import java.util.Base64;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+
+/**
+ * JWT工具包
+ */
+public class AppJwtUtil {
+
+    // TOKEN的有效期一天（S）
+    private static final int TOKEN_TIME_OUT = 3_600;
+    // 加密KEY
+    private static final String TOKEN_ENCRY_KEY = "MDk4ZjZiY2Q0NjIxZDM3M2NhZGU0ZTgzMjYyN2I0ZjY";
+    // 最小刷新间隔(S)
+    private static final int REFRESH_TIME = 300;
+
+    // 生产ID
+    public static String getToken(Long id){
+        Map<String, Object> claimMaps = new HashMap<>();
+        claimMaps.put("id",id);
+        long currentTime = System.currentTimeMillis();
+        return Jwts.builder()
+                .setId(UUID.randomUUID().toString())
+                .setIssuedAt(new Date(currentTime))  //签发时间
+                .setSubject("system")  //说明
+                .setIssuer("heima") //签发者信息
+                .setAudience("app")  //接收用户
+                .compressWith(CompressionCodecs.GZIP)  //数据压缩方式
+                .signWith(SignatureAlgorithm.HS512, generalKey()) //加密方式
+                .setExpiration(new Date(currentTime + TOKEN_TIME_OUT * 1000))  //过期时间戳
+                .addClaims(claimMaps) //cla信息
+                .compact();
+    }
+
+    /**
+     * 获取token中的claims信息
+     *
+     * @param token
+     * @return
+     */
+    private static Jws<Claims> getJws(String token) {
+            return Jwts.parser()
+                    .setSigningKey(generalKey())
+                    .parseClaimsJws(token);
+    }
+
+    /**
+     * 获取payload body信息
+     *
+     * @param token
+     * @return
+     */
+    public static Claims getClaimsBody(String token) {
+        try {
+            return getJws(token).getBody();
+        }catch (ExpiredJwtException e){
+            return null;
+        }
+    }
+
+    /**
+     * 获取hearder body信息
+     *
+     * @param token
+     * @return
+     */
+    public static JwsHeader getHeaderBody(String token) {
+        return getJws(token).getHeader();
+    }
+
+    /**
+     * 是否过期
+     *
+     * @param claims
+     * @return -1：有效，0：有效，1：过期，2：过期
+     */
+    public static int verifyToken(Claims claims) {
+        if(claims==null){
+            return 1;
+        }
+        try {
+            claims.getExpiration()
+                    .before(new Date());
+            // 需要自动刷新TOKEN
+            if((claims.getExpiration().getTime()-System.currentTimeMillis())>REFRESH_TIME*1000){
+                return -1;
+            }else {
+                return 0;
+            }
+        } catch (ExpiredJwtException ex) {
+            return 1;
+        }catch (Exception e){
+            return 2;
+        }
+    }
+
+    /**
+     * 由字符串生成加密key
+     *
+     * @return
+     */
+    public static SecretKey generalKey() {
+        byte[] encodedKey = Base64.getEncoder().encode(TOKEN_ENCRY_KEY.getBytes());
+        SecretKey key = new SecretKeySpec(encodedKey, 0, encodedKey.length, "AES");
+        return key;
+    }
+
+    public static void main(String[] args) {
+       /* Map map = new HashMap();
+        map.put("id","11");*/
+        System.out.println(AppJwtUtil.getToken(1102L));
+        Jws<Claims> jws = AppJwtUtil.getJws("eyJhbGciOiJIUzUxMiIsInppcCI6IkdaSVAifQ.H4sIAAAAAAAAADWLQQqEMAwA_5KzhURNt_qb1KZYQSi0wi6Lf9942NsMw3zh6AVW2DYmDGl2WabkZgreCaM6VXzhFBfJMcMARTqsxIG9Z888QLui3e3Tup5Pb81013KKmVzJTGo11nf9n8v4nMUaEY73DzTabjmDAAAA.4SuqQ42IGqCgBai6qd4RaVpVxTlZIWC826QA9kLvt9d-yVUw82gU47HDaSfOzgAcloZedYNNpUcd18Ne8vvjQA");
+        Claims claims = jws.getBody();
+        System.out.println(claims.get("id"));
+
+    }
+
+}
diff --git a/heima-leadnews-gateway/heima-leadnews-app-gateway/src/main/resources/bootstrap.yml b/heima-leadnews-gateway/heima-leadnews-app-gateway/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8f12ec99b4685756856819e643b52a2c0e79b856
--- /dev/null
+++ b/heima-leadnews-gateway/heima-leadnews-app-gateway/src/main/resources/bootstrap.yml
@@ -0,0 +1,12 @@
+server:
+  port: 51601
+spring:
+  application:
+    name: leadnews-app-gateway
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.200.130:8848
+      config:
+        server-addr: 192.168.200.130:8848
+        file-extension: yml
\ No newline at end of file
diff --git a/heima-leadnews-gateway/heima-leadnews-wemedia-gateway/pom.xml b/heima-leadnews-gateway/heima-leadnews-wemedia-gateway/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a0919251eebfab9c3c7b4013d64ff0aecc709cc4
--- /dev/null
+++ b/heima-leadnews-gateway/heima-leadnews-wemedia-gateway/pom.xml
@@ -0,0 +1,19 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews-gateway</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>heima-leadnews-wemedia-gateway</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/heima-leadnews-gateway/heima-leadnews-wemedia-gateway/src/main/java/com/heima/wemedia/gateway/WemediaGatewayAplication.java b/heima-leadnews-gateway/heima-leadnews-wemedia-gateway/src/main/java/com/heima/wemedia/gateway/WemediaGatewayAplication.java
new file mode 100644
index 0000000000000000000000000000000000000000..74cf3fefcfb42095f70b129a3cbaad5fc4b0671c
--- /dev/null
+++ b/heima-leadnews-gateway/heima-leadnews-wemedia-gateway/src/main/java/com/heima/wemedia/gateway/WemediaGatewayAplication.java
@@ -0,0 +1,13 @@
+package com.heima.wemedia.gateway;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+
+@SpringBootApplication
+public class WemediaGatewayAplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(WemediaGatewayAplication.class,args);
+    }
+}
diff --git a/heima-leadnews-gateway/heima-leadnews-wemedia-gateway/src/main/java/com/heima/wemedia/gateway/filter/AuthorizeFilter.java b/heima-leadnews-gateway/heima-leadnews-wemedia-gateway/src/main/java/com/heima/wemedia/gateway/filter/AuthorizeFilter.java
new file mode 100644
index 0000000000000000000000000000000000000000..b504df32473baddf33928933b39172a1668ea665
--- /dev/null
+++ b/heima-leadnews-gateway/heima-leadnews-wemedia-gateway/src/main/java/com/heima/wemedia/gateway/filter/AuthorizeFilter.java
@@ -0,0 +1,75 @@
+package com.heima.wemedia.gateway.filter;
+
+
+import com.heima.wemedia.gateway.util.AppJwtUtil;
+import io.jsonwebtoken.Claims;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.cloud.gateway.filter.GlobalFilter;
+import org.springframework.core.Ordered;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.stereotype.Component;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+@Component
+@Slf4j
+public class AuthorizeFilter implements Ordered, GlobalFilter {
+    @Override
+    public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
+        //1.获取request和response对象
+        ServerHttpRequest request = exchange.getRequest();
+        ServerHttpResponse response = exchange.getResponse();
+
+        //2.判断是否是登录
+        if(request.getURI().getPath().contains("/login")){
+            //放行
+            return chain.filter(exchange);
+        }
+
+        //3.获取token
+        String token = request.getHeaders().getFirst("token");
+
+        //4.判断token是否存在
+        if(StringUtils.isBlank(token)){
+            response.setStatusCode(HttpStatus.UNAUTHORIZED);
+            return response.setComplete();
+        }
+
+        //5.判断token是否有效
+        try {
+            Claims claimsBody = AppJwtUtil.getClaimsBody(token);
+            //是否是过期
+            int result = AppJwtUtil.verifyToken(claimsBody);
+            if(result == 1 || result  == 2){
+                response.setStatusCode(HttpStatus.UNAUTHORIZED);
+                return response.setComplete();
+            }
+            //token有效
+            Object wmUserId = claimsBody.get("id");
+            //重置请求头
+            exchange.mutate().request(
+                    builder -> builder.header("wmUserId", wmUserId.toString())
+            ).build();
+        } catch (Exception e) {
+            e.printStackTrace();
+            response.setStatusCode(HttpStatus.UNAUTHORIZED);
+            return response.setComplete();
+        }
+
+        //6.放行
+        return chain.filter(exchange);
+    }
+
+    /**
+     * 优先级设置  值越小  优先级越高
+     * @return
+     */
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+}
diff --git a/heima-leadnews-gateway/heima-leadnews-wemedia-gateway/src/main/java/com/heima/wemedia/gateway/util/AppJwtUtil.java b/heima-leadnews-gateway/heima-leadnews-wemedia-gateway/src/main/java/com/heima/wemedia/gateway/util/AppJwtUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..05d61f9018a4eeb1e61f2cc326d01260ea9f18cf
--- /dev/null
+++ b/heima-leadnews-gateway/heima-leadnews-wemedia-gateway/src/main/java/com/heima/wemedia/gateway/util/AppJwtUtil.java
@@ -0,0 +1,109 @@
+package com.heima.wemedia.gateway.util;
+
+import io.jsonwebtoken.*;
+
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import java.util.*;
+
+public class AppJwtUtil {
+
+    // TOKEN的有效期一天（S）
+    private static final int TOKEN_TIME_OUT = 3_600;
+    // 加密KEY
+    private static final String TOKEN_ENCRY_KEY = "MDk4ZjZiY2Q0NjIxZDM3M2NhZGU0ZTgzMjYyN2I0ZjY";
+    // 最小刷新间隔(S)
+    private static final int REFRESH_TIME = 300;
+
+    // 生产ID
+    public static String getToken(Long id) {
+        Map<String, Object> claimMaps = new HashMap<>();
+        claimMaps.put("id", id);
+        long currentTime = System.currentTimeMillis();
+        return Jwts.builder()
+                .setId(UUID.randomUUID().toString())
+                .setIssuedAt(new Date(currentTime))  //签发时间
+                .setSubject("system")  //说明
+                .setIssuer("heima") //签发者信息
+                .setAudience("app")  //接收用户
+                .compressWith(CompressionCodecs.GZIP)  //数据压缩方式
+                .signWith(SignatureAlgorithm.HS512, generalKey()) //加密方式
+                .setExpiration(new Date(currentTime + TOKEN_TIME_OUT * 1000))  //过期时间戳
+                .addClaims(claimMaps) //cla信息
+                .compact();
+    }
+
+    /**
+     * 获取token中的claims信息
+     *
+     * @param token
+     * @return
+     */
+    private static Jws<Claims> getJws(String token) {
+        return Jwts.parser()
+                .setSigningKey(generalKey())
+                .parseClaimsJws(token);
+    }
+
+    /**
+     * 获取payload body信息
+     *
+     * @param token
+     * @return
+     */
+    public static Claims getClaimsBody(String token) throws ExpiredJwtException {
+        return getJws(token).getBody();
+    }
+
+    /**
+     * 获取hearder body信息
+     *
+     * @param token
+     * @return
+     */
+    public static JwsHeader getHeaderBody(String token) {
+        return getJws(token).getHeader();
+    }
+
+    /**
+     * 是否过期
+     *
+     * @param claims
+     * @return -1：有效，0：有效，1：过期，2：过期
+     */
+    public static int verifyToken(Claims claims) throws Exception {
+        if (claims == null) {
+            return 1;
+        }
+
+        claims.getExpiration().before(new Date());
+        // 需要自动刷新TOKEN
+        if ((claims.getExpiration().getTime() - System.currentTimeMillis()) > REFRESH_TIME * 1000) {
+            return -1;
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * 由字符串生成加密key
+     *
+     * @return
+     */
+    public static SecretKey generalKey() {
+        byte[] encodedKey = Base64.getEncoder().encode(TOKEN_ENCRY_KEY.getBytes());
+        SecretKey key = new SecretKeySpec(encodedKey, 0, encodedKey.length, "AES");
+        return key;
+    }
+
+    public static void main(String[] args) {
+       /* Map map = new HashMap();
+        map.put("id","11");*/
+        System.out.println(AppJwtUtil.getToken(1102L));
+        Jws<Claims> jws = AppJwtUtil.getJws("eyJhbGciOiJIUzUxMiIsInppcCI6IkdaSVAifQ.H4sIAAAAAAAAADWLQQqEMAwA_5KzhURNt_qb1KZYQSi0wi6Lf9942NsMw3zh6AVW2DYmDGl2WabkZgreCaM6VXzhFBfJMcMARTqsxIG9Z888QLui3e3Tup5Pb81013KKmVzJTGo11nf9n8v4nMUaEY73DzTabjmDAAAA.4SuqQ42IGqCgBai6qd4RaVpVxTlZIWC826QA9kLvt9d-yVUw82gU47HDaSfOzgAcloZedYNNpUcd18Ne8vvjQA");
+        Claims claims = jws.getBody();
+        System.out.println(claims.get("id"));
+
+    }
+
+}
diff --git a/heima-leadnews-gateway/heima-leadnews-wemedia-gateway/src/main/resources/bootstrap.yml b/heima-leadnews-gateway/heima-leadnews-wemedia-gateway/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000000000000000000000000000000000000..bfe34b046489ff33f391aab6b90d1aadca5f9eb4
--- /dev/null
+++ b/heima-leadnews-gateway/heima-leadnews-wemedia-gateway/src/main/resources/bootstrap.yml
@@ -0,0 +1,12 @@
+server:
+  port: 51602
+spring:
+  application:
+    name: leadnews-wemedia-gateway
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.200.130:8848
+      config:
+        server-addr: 192.168.200.130:8848
+        file-extension: yml
\ No newline at end of file
diff --git a/heima-leadnews-gateway/pom.xml b/heima-leadnews-gateway/pom.xml
index e343a24b28d4fffa01b9de8c5b2c872a4239cff1..053de891c57df91ccb7cf0ca0035f67566cd6a06 100644
--- a/heima-leadnews-gateway/pom.xml
+++ b/heima-leadnews-gateway/pom.xml
@@ -10,10 +10,35 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>heima-leadnews-gateway</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>heima-leadnews-app-gateway</module>
+        <module>heima-leadnews-wemedia-gateway</module>
+    </modules>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-gateway</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+        </dependency>
+    </dependencies>
+
+
 </project>
\ No newline at end of file
diff --git a/heima-leadnews-model/pom.xml b/heima-leadnews-model/pom.xml
index 9dcaf5cab2e0ffa2a77a2879b70e5483acb53732..960ddc3f4081acc201c3809b6140367259b3cea2 100644
--- a/heima-leadnews-model/pom.xml
+++ b/heima-leadnews-model/pom.xml
@@ -13,6 +13,12 @@
     <name>heima-leadnews-model</name>
 
     <dependencies>
+
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/article/dtos/ArticleDto.java b/heima-leadnews-model/src/main/java/com/heima/model/article/dtos/ArticleDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..d0d2443d519a4cf20b75004e5739e3a20a3109f7
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/article/dtos/ArticleDto.java
@@ -0,0 +1,12 @@
+package com.heima.model.article.dtos;
+
+import com.heima.model.article.pojos.ApArticle;
+import lombok.Data;
+
+@Data
+public class ArticleDto  extends ApArticle {
+    /**
+     * 文章内容
+     */
+    private String content;
+}
\ No newline at end of file
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/article/dtos/ArticleHomeDto.java b/heima-leadnews-model/src/main/java/com/heima/model/article/dtos/ArticleHomeDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..d95e15d17fffa7b40c71f0ef5ec14eaf6cde137a
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/article/dtos/ArticleHomeDto.java
@@ -0,0 +1,18 @@
+package com.heima.model.article.dtos;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ArticleHomeDto {
+
+    // 最大时间
+    private Date maxBehotTime;
+    // 最小时间
+    private Date minBehotTime;
+    // 分页size
+    private Integer size = 10;
+    // 频道ID
+    private String tag;
+}
\ No newline at end of file
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/article/pojos/ApArticle.java b/heima-leadnews-model/src/main/java/com/heima/model/article/pojos/ApArticle.java
new file mode 100644
index 0000000000000000000000000000000000000000..022a3f30e7d305a6e9185a5e74b511ea2207b5c3
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/article/pojos/ApArticle.java
@@ -0,0 +1,143 @@
+package com.heima.model.article.pojos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 文章信息表，存储已发布的文章
+ * </p>
+ *
+ * @author itheima
+ */
+
+@Data
+@TableName("ap_article")
+public class ApArticle implements Serializable {
+
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 作者id
+     */
+    @TableField("author_id")
+    private Long authorId;
+
+    /**
+     * 作者名称
+     */
+    @TableField("author_name")
+    private String authorName;
+
+    /**
+     * 频道id
+     */
+    @TableField("channel_id")
+    private Integer channelId;
+
+    /**
+     * 频道名称
+     */
+    @TableField("channel_name")
+    private String channelName;
+
+    /**
+     * 文章布局  0 无图文章   1 单图文章    2 多图文章
+     */
+    private Short layout;
+
+    /**
+     * 文章标记  0 普通文章   1 热点文章   2 置顶文章   3 精品文章   4 大V 文章
+     */
+    private Byte flag;
+
+    /**
+     * 文章封面图片 多张逗号分隔
+     */
+    private String images;
+
+    /**
+     * 标签
+     */
+    private String labels;
+
+    /**
+     * 点赞数量
+     */
+    private Integer likes;
+
+    /**
+     * 收藏数量
+     */
+    private Integer collection;
+
+    /**
+     * 评论数量
+     */
+    private Integer comment;
+
+    /**
+     * 阅读数量
+     */
+    private Integer views;
+
+    /**
+     * 省市
+     */
+    @TableField("province_id")
+    private Integer provinceId;
+
+    /**
+     * 市区
+     */
+    @TableField("city_id")
+    private Integer cityId;
+
+    /**
+     * 区县
+     */
+    @TableField("county_id")
+    private Integer countyId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("created_time")
+    private Date createdTime;
+
+    /**
+     * 发布时间
+     */
+    @TableField("publish_time")
+    private Date publishTime;
+
+    /**
+     * 同步状态
+     */
+    @TableField("sync_status")
+    private Boolean syncStatus;
+
+    /**
+     * 来源
+     */
+    private Boolean origin;
+
+    /**
+     * 静态页面地址
+     */
+    @TableField("static_url")
+    private String staticUrl;
+}
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/article/pojos/ApArticleConfig.java b/heima-leadnews-model/src/main/java/com/heima/model/article/pojos/ApArticleConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..22759ae833a5189cc11aad5207c5cd070e670572
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/article/pojos/ApArticleConfig.java
@@ -0,0 +1,73 @@
+package com.heima.model.article.pojos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * APP已发布文章配置表
+ * </p>
+ *
+ * @author itheima
+ */
+
+@Data
+@TableName("ap_article_config")
+public class ApArticleConfig implements Serializable {
+
+    public ApArticleConfig(){}
+
+    public ApArticleConfig(Long articleId) {
+        this.articleId = articleId;
+        this.isComment = true;
+        this.isForward = true;
+        this.isDown = false;
+        this.isDelete = false;
+    }
+
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 文章id
+     */
+    @TableField("article_id")
+    private Long articleId;
+
+    /**
+     * 是否可评论
+     * true: 可以评论   1
+     * false: 不可评论  0
+     */
+    @TableField("is_comment")
+    private Boolean isComment;
+
+    /**
+     * 是否转发
+     * true: 可以转发   1
+     * false: 不可转发  0
+     */
+    @TableField("is_forward")
+    private Boolean isForward;
+
+    /**
+     * 是否下架
+     * true: 下架   1
+     * false: 没有下架  0
+     */
+    @TableField("is_down")
+    private Boolean isDown;
+
+    /**
+     * 是否已删除
+     * true: 删除   1
+     * false: 没有删除  0
+     */
+    @TableField("is_delete")
+    private Boolean isDelete;
+}
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/article/pojos/ApArticleContent.java b/heima-leadnews-model/src/main/java/com/heima/model/article/pojos/ApArticleContent.java
new file mode 100644
index 0000000000000000000000000000000000000000..c71583f523cc24ce8ebbea2d52530368998892aa
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/article/pojos/ApArticleContent.java
@@ -0,0 +1,28 @@
+package com.heima.model.article.pojos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@TableName("ap_article_content")
+public class ApArticleContent implements Serializable {
+
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 文章id
+     */
+    @TableField("article_id")
+    private Long articleId;
+
+    /**
+     * 文章内容
+     */
+    private String content;
+}
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/article/vos/ApArticleVo.java b/heima-leadnews-model/src/main/java/com/heima/model/article/vos/ApArticleVo.java
new file mode 100644
index 0000000000000000000000000000000000000000..b083a5f7b135b9080129a61b203a821916f41b83
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/article/vos/ApArticleVo.java
@@ -0,0 +1,125 @@
+package com.heima.model.article.vos;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 文章信息表，存储已发布的文章
+ * </p>
+ *
+ * @author itheima
+ */
+
+@Data
+public class ApArticleVo implements Serializable {
+
+    private String id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 作者id
+     */
+    private Long authorId;
+
+    /**
+     * 作者名称
+     */
+    private String authorName;
+
+    /**
+     * 频道id
+     */
+    private Integer channelId;
+
+    /**
+     * 频道名称
+     */
+    private String channelName;
+
+    /**
+     * 文章布局  0 无图文章   1 单图文章    2 多图文章
+     */
+    private Short layout;
+
+    /**
+     * 文章标记  0 普通文章   1 热点文章   2 置顶文章   3 精品文章   4 大V 文章
+     */
+    private Byte flag;
+
+    /**
+     * 文章封面图片 多张逗号分隔
+     */
+    private String images;
+
+    /**
+     * 标签
+     */
+    private String labels;
+
+    /**
+     * 点赞数量
+     */
+    private Integer likes;
+
+    /**
+     * 收藏数量
+     */
+    private Integer collection;
+
+    /**
+     * 评论数量
+     */
+    private Integer comment;
+
+    /**
+     * 阅读数量
+     */
+    private Integer views;
+
+    /**
+     * 省市
+     */
+    private Integer provinceId;
+
+    /**
+     * 市区
+     */
+    private Integer cityId;
+
+    /**
+     * 区县
+     */
+    private Integer countyId;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 发布时间
+     */
+    private Date publishTime;
+
+    /**
+     * 同步状态
+     */
+    private Boolean syncStatus;
+
+    /**
+     * 来源
+     */
+    private Boolean origin;
+
+    /**
+     * 静态页面地址
+     */
+    private String staticUrl;
+}
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/article/vos/HotArticleVo.java b/heima-leadnews-model/src/main/java/com/heima/model/article/vos/HotArticleVo.java
new file mode 100644
index 0000000000000000000000000000000000000000..fd93e1bacf6e5c2dc2c896c3b3647567a5b7c9c5
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/article/vos/HotArticleVo.java
@@ -0,0 +1,22 @@
+package com.heima.model.article.vos;
+
+import com.heima.model.article.pojos.ApArticle;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-17 11:42:42
+ */
+@Data
+@NoArgsConstructor  //无参构造器
+@AllArgsConstructor  //全参构造器
+@Builder   //构建者设计模式
+public class HotArticleVo extends ApArticle {
+
+    private Integer score;
+
+}
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/common/enums/AppHttpCodeEnum.java b/heima-leadnews-model/src/main/java/com/heima/model/common/enums/AppHttpCodeEnum.java
index 6e7374f351402292196cbc294b111112e1a6cac4..7f850c4d379071c1fe538ae380c06018d2b64100 100644
--- a/heima-leadnews-model/src/main/java/com/heima/model/common/enums/AppHttpCodeEnum.java
+++ b/heima-leadnews-model/src/main/java/com/heima/model/common/enums/AppHttpCodeEnum.java
@@ -10,6 +10,7 @@ public enum AppHttpCodeEnum {
     // 登录段1~50
     NEED_LOGIN(1,"需要登录后操作"),
     LOGIN_PASSWORD_ERROR(2,"密码错误"),
+    PHONE_OR_PASSWORD_ERROR(3,"手机号或密码错误"),
     // TOKEN50~100
     TOKEN_INVALID(50,"无效的TOKEN"),
     TOKEN_EXPIRE(51,"TOKEN已过期"),
@@ -17,6 +18,11 @@ public enum AppHttpCodeEnum {
     // SIGN验签 100~120
     SIGN_INVALID(100,"无效的SIGN"),
     SIG_TIMEOUT(101,"SIGN已过期"),
+    // 增删改失败
+    INSERT_FAIL(110,"增加失败"),
+    UPDATE_FAIL(111,"更新失败"),
+    DELETE_FAIL(112,"删除失败"),
+
     // 参数错误 500~1000
     PARAM_REQUIRE(500,"缺少参数"),
     PARAM_INVALID(501,"无效参数"),
@@ -26,6 +32,22 @@ public enum AppHttpCodeEnum {
     DATA_EXIST(1000,"数据已经存在"),
     AP_USER_DATA_NOT_EXIST(1001,"ApUser数据不存在"),
     DATA_NOT_EXIST(1002,"数据不存在"),
+    FILE_UPLOAD_ERROR(1003,"文件上传错误"),
+    WM_MATERIAL_DATA_NOT_EXIST(1004,"素材不存在"),
+    NEWS_PUBLISHED_FAILED(1005,"文章发布失败"),
+    AP_ARTICLE_INSERT_FAIL(1006,"APP端文章增加失败"),
+    AP_ARTICLE_CONFIG_INSERT_FAIL(1007,"APP端文章配置增加失败"),
+    AP_ARTICLE_CONTENT_INSERT_FAIL(1008,"APP端文章内容增加失败"),
+    AP_ARTICLE_UPDATE_FAIL(1009,"APP端文章更新失败"),
+    AP_ARTICLE_CONTENT_UPDATE_FAIL(1010,"APP端文章内容更新失败"),
+    WM_NEWS_DATA_NOT_EXIST(1011,"自媒体端文章不存在"),
+    WM_NEWS_STATUS_NOT_SUBMIT(1012,"自媒体端文章状态不是待审核"),
+    TEXT_AUDIT_EX(1013,"文本审核异常"),
+    IMAGE_AUDIT_EX(1014,"图片审核异常"),
+    WM_NEWS_STATUS_NOT_PUBLISH(1015,"自媒体端文章状态不是发布状态"),
+
+
+
     // 数据错误 3000~3500
     NO_OPERATOR_AUTH(3000,"无权限操作"),
     NEED_ADMIN(3001,"需要管理员权限");
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/search/dtos/UserSearchDto.java b/heima-leadnews-model/src/main/java/com/heima/model/search/dtos/UserSearchDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..a1e9b263c44d1d9404e18927e9662c31681862c8
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/search/dtos/UserSearchDto.java
@@ -0,0 +1,37 @@
+package com.heima.model.search.dtos;
+
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+public class UserSearchDto {
+
+    /**
+    * 搜索关键字
+    */
+    String searchWords;
+    /**
+    * 当前页
+    */
+    int pageNum;
+    /**
+    * 分页条数
+    */
+    int pageSize;
+    /**
+    * 最小时间
+    */
+    Date minBehotTime;
+
+    /**
+     * 获取当前页搜索的起始下标
+     * @return
+     */
+    public int getFromIndex(){
+        if(this.pageNum<1) return 0;
+        if(this.pageSize<1) this.pageSize = 10;
+        return this.pageSize * (pageNum-1);
+    }
+}
\ No newline at end of file
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/search/vos/SearchArticleVo.java b/heima-leadnews-model/src/main/java/com/heima/model/search/vos/SearchArticleVo.java
new file mode 100644
index 0000000000000000000000000000000000000000..bdf2bf06dca1719d2a5abb763fde03c70860a2ea
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/search/vos/SearchArticleVo.java
@@ -0,0 +1,36 @@
+package com.heima.model.search.vos;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 返回给前端的搜索实体
+ */
+@Data
+public class SearchArticleVo {
+
+    // 文章id
+    private Long id;
+    // 文章标题
+    private String title;
+
+    // 高亮字段
+    private String h_title;
+
+    // 文章发布时间
+    private Date publishTime;
+    // 文章布局
+    private Integer layout;
+    // 封面
+    private String images;
+    // 作者id
+    private Long authorId;
+    // 作者名词
+    private String authorName;
+    //静态url
+    private String staticUrl;
+    //文章内容
+    private String content;
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/user/dtos/LoginDto.java b/heima-leadnews-model/src/main/java/com/heima/model/user/dtos/LoginDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..3d36c8e239edda8ddc8c3ab4ca4c777dd00c7014
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/user/dtos/LoginDto.java
@@ -0,0 +1,34 @@
+package com.heima.model.user.dtos;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 登录DTO
+ *
+ * @author admin
+ * @name LoginDto
+ * @date 2022-08-11 21:51
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "用户登录实体")
+public class LoginDto {
+
+    /**
+     * 手机号
+     */
+    @ApiModelProperty("手机号")
+    private String phone;
+
+    /**
+     * 密码，是未加密的
+     */
+    @ApiModelProperty("密码")
+    private String password;
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/user/pojos/ApUser.java b/heima-leadnews-model/src/main/java/com/heima/model/user/pojos/ApUser.java
new file mode 100644
index 0000000000000000000000000000000000000000..1a546209a156852a802b5a0e1aca51712a095938
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/user/pojos/ApUser.java
@@ -0,0 +1,103 @@
+package com.heima.model.user.pojos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * APP用户信息表
+ * </p>
+ *
+ * @author itheima
+ */
+@Data
+@TableName("ap_user")
+public class ApUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 密码、通信等加密盐
+     */
+    @TableField("salt")
+    private String salt;
+
+    /**
+     * 用户名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 密码,md5加密
+     */
+    @TableField("password")
+    private String password;
+
+    /**
+     * 手机号
+     */
+    @TableField("phone")
+    private String phone;
+
+    /**
+     * 头像
+     */
+    @TableField("image")
+    private String image;
+
+    /**
+     * 0 男
+            1 女
+            2 未知
+     */
+    @TableField("sex")
+    private Boolean sex;
+
+    /**
+     * 0 未
+            1 是
+     */
+    @TableField("is_certification")
+    private Boolean certification;
+
+    /**
+     * 是否身份认证
+     */
+    @TableField("is_identity_authentication")
+    private Boolean identityAuthentication;
+
+    /**
+     * 0正常
+            1锁定
+     */
+    @TableField("status")
+    private Boolean status;
+
+    /**
+     * 0 普通用户
+            1 自媒体人
+            2 大V
+     */
+    @TableField("flag")
+    private Short flag;
+
+    /**
+     * 注册时间
+     */
+    @TableField("created_time")
+    private Date createdTime;
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/ContentDto.java b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/ContentDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..e3c6f2702628e3a4712e4f1bad8ca52f76efdcd2
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/ContentDto.java
@@ -0,0 +1,23 @@
+package com.heima.model.wemedia.dtos;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 文章内容对应实体
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-08 10:44:18
+ */
+@Data
+@NoArgsConstructor  //无参构造器
+@AllArgsConstructor  //全参构造器
+@Builder   //构建者设计模式
+public class ContentDto {
+
+    private String type;
+    private String value;
+
+}
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/ContentImagesDto.java b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/ContentImagesDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..0908138669acf0a456c4f9c5ff5d8838127297f5
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/ContentImagesDto.java
@@ -0,0 +1,23 @@
+package com.heima.model.wemedia.dtos;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-09 08:56:40
+ */
+@Data
+@NoArgsConstructor  //无参构造器
+@AllArgsConstructor  //全参构造器
+@Builder   //构建者设计模式
+public class ContentImagesDto {
+
+    private String content;
+    private List<String> images;
+}
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/WmLoginDto.java b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/WmLoginDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..e49d13405222d7be11b09d5bd1ce192f68bbb4e0
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/WmLoginDto.java
@@ -0,0 +1,17 @@
+package com.heima.model.wemedia.dtos;
+
+
+import lombok.Data;
+
+@Data
+public class WmLoginDto {
+
+    /**
+     * 用户名
+     */
+    private String name;
+    /**
+     * 密码
+     */
+    private String password;
+}
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/WmMaterialDto.java b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/WmMaterialDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..a7614eeb8810683cd6b81b6ac66d91581aa94aab
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/WmMaterialDto.java
@@ -0,0 +1,14 @@
+package com.heima.model.wemedia.dtos;
+
+import com.heima.model.common.dtos.PageRequestDto;
+import lombok.Data;
+
+@Data
+public class WmMaterialDto extends PageRequestDto {
+
+    /**
+     * 1 收藏
+     * 0 全部
+     */
+    private Short isCollection;
+}
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/WmNewsDto.java b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/WmNewsDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..deee35bd91db455ea79a145ff52cd8750c94103f
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/WmNewsDto.java
@@ -0,0 +1,49 @@
+package com.heima.model.wemedia.dtos;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class WmNewsDto {
+    
+    private Integer id;
+     /**
+     * 标题
+     */
+    private String title;
+     /**
+     * 频道id
+     */
+    private Integer channelId;
+     /**
+     * 标签
+     */
+    private String labels;
+     /**
+     * 发布时间
+     */
+    private Date publishTime;
+     /**
+     * 文章内容
+     */
+    private String content;
+     /**
+     * 文章封面类型  0 无图 1 单图 3 多图 -1 自动
+     */
+    private Short type;
+     /**
+     * 提交时间
+     */
+    private Date submitedTime; 
+     /**
+     * 状态 提交为1  草稿为0
+     */
+    private Short status;
+     
+     /**
+     * 封面图片列表 多张图以逗号隔开
+     */
+    private List<String> images;
+}
\ No newline at end of file
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/WmNewsEnableDto.java b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/WmNewsEnableDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..49a61b1369c7ff9b77f35079ca224eceb5d37414
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/WmNewsEnableDto.java
@@ -0,0 +1,30 @@
+package com.heima.model.wemedia.dtos;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-14 14:58:19
+ */
+@Data
+@NoArgsConstructor  //无参构造器
+@AllArgsConstructor  //全参构造器
+@Builder   //构建者设计模式
+public class WmNewsEnableDto {
+
+    /**
+     * 自媒体文章ID
+     */
+    private Long id;
+
+    /**
+     * 上下架
+     *  上架1  下架0
+     */
+    private Short enable;
+
+}
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/WmNewsPageReqDto.java b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/WmNewsPageReqDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..3005380d972edd98aeec4d911ff9224438129357
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/dtos/WmNewsPageReqDto.java
@@ -0,0 +1,31 @@
+package com.heima.model.wemedia.dtos;
+
+import com.heima.model.common.dtos.PageRequestDto;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class WmNewsPageReqDto extends PageRequestDto {
+
+    /**
+     * 状态
+     */
+    private Short status;
+    /**
+     * 开始时间
+     */
+    private Date beginPubDate;
+    /**
+     * 结束时间
+     */
+    private Date endPubDate;
+    /**
+     * 所属频道ID
+     */
+    private Integer channelId;
+    /**
+     * 关键字
+     */
+    private String keyword;
+}
\ No newline at end of file
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmChannel.java b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmChannel.java
new file mode 100644
index 0000000000000000000000000000000000000000..269ee1a4ba9751503251f29dc43e5fbd2f9ed2cf
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmChannel.java
@@ -0,0 +1,68 @@
+package com.heima.model.wemedia.pojos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 频道信息表
+ * </p>
+ *
+ * @author itheima
+ */
+@Data
+@TableName("wm_channel")
+public class WmChannel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 频道名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 频道描述
+     */
+    @TableField("description")
+    private String description;
+
+    /**
+     * 是否默认频道
+     * 1：默认     true
+     * 0：非默认   false
+     */
+    @TableField("is_default")
+    private Boolean isDefault;
+
+    /**
+     * 是否启用
+     * 1：启用   true
+     * 0：禁用   false
+     */
+    @TableField("status")
+    private Boolean status;
+
+    /**
+     * 默认排序
+     */
+    @TableField("ord")
+    private Integer ord;
+
+    /**
+     * 创建时间
+     */
+    @TableField("created_time")
+    private Date createdTime;
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmMaterial.java b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmMaterial.java
new file mode 100644
index 0000000000000000000000000000000000000000..0ec894307f9c4b18e76d124c7941817f9c2ef811
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmMaterial.java
@@ -0,0 +1,61 @@
+package com.heima.model.wemedia.pojos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 自媒体图文素材信息表
+ * </p>
+ *
+ * @author itheima
+ */
+@Data
+@TableName("wm_material")
+public class WmMaterial implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 自媒体用户ID
+     */
+    @TableField("user_id")
+    private Integer userId;
+
+    /**
+     * 图片地址
+     */
+    @TableField("url")
+    private String url;
+
+    /**
+     * 素材类型 0图片 1视频
+     */
+    @TableField("type")
+    private Short type;
+
+    /**
+     * 是否收藏
+     */
+    @TableField("is_collection")
+    private Short isCollection;
+
+    /**
+     * 创建时间
+     */
+    @TableField("created_time")
+    private Date createdTime;
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmNews.java b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmNews.java
new file mode 100644
index 0000000000000000000000000000000000000000..b8dcc06bf5d5d3f6284b73c90b7e6356e055a008
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmNews.java
@@ -0,0 +1,133 @@
+package com.heima.model.wemedia.pojos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.apache.ibatis.type.Alias;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 自媒体图文内容信息表
+ * </p>
+ *
+ * @author itheima
+ */
+@Data
+@TableName("wm_news")
+public class WmNews implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 自媒体用户ID
+     */
+    @TableField("user_id")
+    private Integer userId;
+
+    /**
+     * 标题
+     */
+    @TableField("title")
+    private String title;
+
+    /**
+     * 图文内容
+     */
+    @TableField("content")
+    private String content;
+
+    /**
+     * 文章布局
+            0 无图文章
+            1 单图文章
+            3 多图文章
+     */
+    @TableField("type")
+    private Short type;
+
+    /**
+     * 图文频道ID
+     */
+    @TableField("channel_id")
+    private Integer channelId;
+
+    @TableField("labels")
+    private String labels;
+
+    /**
+     * 创建时间
+     */
+    @TableField("created_time")
+    private Date createdTime;
+
+    /**
+     * 提交时间
+     */
+    @TableField("submited_time")
+    private Date submitedTime;
+
+    /**
+     * 当前状态
+            0 草稿
+            1 提交（待审核）
+            2 审核失败
+            3 人工审核
+            4 人工审核通过
+            8 审核通过（待发布）
+            9 已发布
+     */
+    @TableField("status")
+    private Short status;
+
+    /**
+     * 定时发布时间，不定时则为空
+     */
+    @TableField("publish_time")
+    private Date publishTime;
+
+    /**
+     * 拒绝理由
+     */
+    @TableField("reason")
+    private String reason;
+
+    /**
+     * 发布库文章ID
+     */
+    @TableField("article_id")
+    private Long articleId;
+
+    /**
+     * //图片用逗号分隔
+     */
+    @TableField("images")
+    private String images;
+
+    @TableField("enable")
+    private Short enable;
+    
+     //状态枚举类
+    @Alias("WmNewsStatus")
+    public enum Status{
+        NORMAL((short)0),SUBMIT((short)1),FAIL((short)2),ADMIN_AUTH((short)3),ADMIN_SUCCESS((short)4),SUCCESS((short)8),PUBLISHED((short)9);
+        short code;
+        Status(short code){
+            this.code = code;
+        }
+        public short getCode(){
+            return this.code;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmNewsMaterial.java b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmNewsMaterial.java
new file mode 100644
index 0000000000000000000000000000000000000000..1db4e6a743d608a2be5219ee5fc7673f57b0a0a3
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmNewsMaterial.java
@@ -0,0 +1,56 @@
+package com.heima.model.wemedia.pojos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 自媒体图文引用素材信息表
+ * </p>
+ *
+ * @author itheima
+ */
+@Data
+@TableName("wm_news_material")
+public class WmNewsMaterial implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 素材ID
+     */
+    @TableField("material_id")
+    private Integer materialId;
+
+    /**
+     * 图文ID
+     */
+    @TableField("news_id")
+    private Integer newsId;
+
+    /**
+     * 引用类型
+            0 内容引用
+            1 主图引用
+     */
+    @TableField("type")
+    private Short type;
+
+    /**
+     * 引用排序
+     */
+    @TableField("ord")
+    private Short ord;
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmSensitive.java b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmSensitive.java
new file mode 100644
index 0000000000000000000000000000000000000000..77a23be40bd180db4e2b5bdb64991c38fa1362d8
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmSensitive.java
@@ -0,0 +1,43 @@
+package com.heima.model.wemedia.pojos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 敏感词信息表
+ * </p>
+ *
+ * @author itheima
+ */
+@Data
+@TableName("wm_sensitive")
+public class WmSensitive implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 敏感词
+     */
+    @TableField("sensitives")
+    private String sensitives;
+
+    /**
+     * 创建时间
+     */
+    @TableField("created_time")
+    private Date createdTime;
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmUser.java b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmUser.java
new file mode 100644
index 0000000000000000000000000000000000000000..a9e028fa5bcf36cb93b7d78733cbb0dfb65158f4
--- /dev/null
+++ b/heima-leadnews-model/src/main/java/com/heima/model/wemedia/pojos/WmUser.java
@@ -0,0 +1,121 @@
+package com.heima.model.wemedia.pojos;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 自媒体用户信息表
+ * </p>
+ *
+ * @author itheima
+ */
+@Data
+@TableName("wm_user")
+public class WmUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("ap_user_id")
+    private Integer apUserId;
+
+    @TableField("ap_author_id")
+    private Integer apAuthorId;
+
+    /**
+     * 登录用户名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 登录密码
+     */
+    @TableField("password")
+    private String password;
+
+    /**
+     * 盐
+     */
+    @TableField("salt")
+    private String salt;
+
+    /**
+     * 昵称
+     */
+    @TableField("nickname")
+    private String nickname;
+
+    /**
+     * 头像
+     */
+    @TableField("image")
+    private String image;
+
+    /**
+     * 归属地
+     */
+    @TableField("location")
+    private String location;
+
+    /**
+     * 手机号
+     */
+    @TableField("phone")
+    private String phone;
+
+    /**
+     * 状态
+            0 暂时不可用
+            1 永久不可用
+            9 正常可用
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 邮箱
+     */
+    @TableField("email")
+    private String email;
+
+    /**
+     * 账号类型
+            0 个人 
+            1 企业
+            2 子账号
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 运营评分
+     */
+    @TableField("score")
+    private Integer score;
+
+    /**
+     * 最后一次登录时间
+     */
+    @TableField("login_time")
+    private Date loginTime;
+
+    /**
+     * 创建时间
+     */
+    @TableField("created_time")
+    private Date createdTime;
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-article/pom.xml b/heima-leadnews-service/heima-leadnews-article/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4ed7336a48ff3a69db557b7ba0fc62ab038dc2db
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/pom.xml
@@ -0,0 +1,51 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews-service</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>heima-leadnews-article</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.heima</groupId>
+            <artifactId>heima-file-starter</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <!--seata-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
+        </dependency>
+        <!-- kafkfa -->
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+        </dependency>
+        <!--xxl-job-->
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-job-core</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/ArticleApplication.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/ArticleApplication.java
new file mode 100644
index 0000000000000000000000000000000000000000..a1baf7830ab18f8a8fcd0b4fe1a431b441ad7afc
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/ArticleApplication.java
@@ -0,0 +1,30 @@
+package com.heima.article;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+
+@SpringBootApplication
+@MapperScan("com.heima.article.mapper")
+@EnableAsync
+@EnableFeignClients(basePackages = "com.heima.apis.wemedia")
+public class ArticleApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ArticleApplication.class,args);
+    }
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/config/XxlJobConfig.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/config/XxlJobConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..786418165097b0dd3c37fd9a0d9c85327018905a
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/config/XxlJobConfig.java
@@ -0,0 +1,40 @@
+package com.heima.article.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * xxl-job config
+ *
+ * @author xuxueli 2017-04-28
+ */
+@Configuration
+public class XxlJobConfig {
+    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+
+    @Value("${xxl.job.admin.addresses}")
+    private String adminAddresses;
+
+    @Value("${xxl.job.executor.appname}")
+    private String appname;
+
+    @Value("${xxl.job.executor.port}")
+    private int port;
+
+
+    @Bean
+    public XxlJobSpringExecutor xxlJobExecutor() {
+        logger.info(">>>>>>>>>>> xxl-job config init.");
+        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+        xxlJobSpringExecutor.setAppname(appname);
+        xxlJobSpringExecutor.setPort(port);
+        return xxlJobSpringExecutor;
+    }
+
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/controller/v1/ApArticleController.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/controller/v1/ApArticleController.java
new file mode 100644
index 0000000000000000000000000000000000000000..e6ed7770da7b40c23faa775b674028dae79d2137
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/controller/v1/ApArticleController.java
@@ -0,0 +1,60 @@
+package com.heima.article.controller.v1;
+
+import com.heima.article.service.ApArticleService;
+import com.heima.common.constants.ArticleConstants;
+import com.heima.model.article.dtos.ArticleHomeDto;
+import com.heima.model.common.dtos.ResponseResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-05 10:16:52
+ */
+@RestController
+@RequestMapping("/api/v1/article")
+@Slf4j
+public class ApArticleController {
+
+    @Autowired
+    private ApArticleService apArticleService;
+
+    /**
+     * 加载首页
+     * @param dto
+     * @return
+     */
+    @PostMapping("/load")
+    public ResponseResult load(@RequestBody ArticleHomeDto dto){
+        log.warn("dto:{}", dto);
+        return apArticleService.load(dto, ArticleConstants.LOADTYPE_LOAD_NEW, true);
+    }
+
+    /**
+     * 加载最新  上拉
+     * @param dto
+     * @return
+     */
+    @PostMapping("/loadnew")
+    public ResponseResult loadnew(@RequestBody ArticleHomeDto dto){
+        log.warn("dto:{}", dto);
+        return apArticleService.load(dto, ArticleConstants.LOADTYPE_LOAD_NEW, false);
+    }
+
+    /**
+     * 加载更多  下垃
+     * @param dto
+     * @return
+     */
+    @PostMapping("/loadmore")
+    public ResponseResult loadmore(@RequestBody ArticleHomeDto dto){
+        log.warn("dto:{}", dto);
+        return apArticleService.load(dto, ArticleConstants.LOADTYPE_LOAD_MORE, false);
+    }
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/feign/ArticleClient.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/feign/ArticleClient.java
new file mode 100644
index 0000000000000000000000000000000000000000..b87965a080ba9eb63c0172027183231d95523f61
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/feign/ArticleClient.java
@@ -0,0 +1,37 @@
+package com.heima.article.feign;
+
+import com.heima.article.service.ApArticleService;
+import com.heima.model.article.dtos.ArticleDto;
+import com.heima.model.common.dtos.ResponseResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-08 16:52:16
+ */
+@RestController
+@RequestMapping("/api/v1/article")
+@Slf4j
+public class ArticleClient {
+
+    @Autowired
+    private ApArticleService apArticleService;
+
+    /**
+     * 保存或更新文章
+     * @param dto
+     * @return
+     */
+    @PostMapping("/save")
+    public ResponseResult saveApArticle(@RequestBody ArticleDto dto) {
+        log.warn("dto:{}", dto);
+        return apArticleService.saveApArticle(dto);
+    }
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/handler/ArticleHandler.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/handler/ArticleHandler.java
new file mode 100644
index 0000000000000000000000000000000000000000..ecdfd2a4c7fda5744264102c47c1174936e525ed
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/handler/ArticleHandler.java
@@ -0,0 +1,27 @@
+package com.heima.article.handler;
+
+import com.heima.article.service.ApArticleService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-17 15:13:10
+ */
+@Component
+@Slf4j
+public class ArticleHandler {
+
+    @Autowired
+    private ApArticleService apArticleService;
+
+    @XxlJob("computeHotArticleJobHandler")
+    public void computeHotArticleJobHandler(){
+        log.warn("computeHotArticleJobHandler任务定时计算热点文章开始执行了");
+        apArticleService.computeHotArticle();
+    }
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/listeners/ArticleIsDownListener.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/listeners/ArticleIsDownListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..5f0667999f8c224d4fbbb4ba9471c9db365d2df8
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/listeners/ArticleIsDownListener.java
@@ -0,0 +1,39 @@
+package com.heima.article.listeners;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.heima.article.mapper.ApArticleConfigMapper;
+import com.heima.common.constants.WmNewsMessageConstants;
+import com.heima.model.article.pojos.ApArticleConfig;
+import com.heima.model.wemedia.dtos.WmNewsEnableDto;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-14 15:09:37
+ */
+@Component
+@Slf4j
+public class ArticleIsDownListener {
+
+    @Autowired
+    private ApArticleConfigMapper apArticleConfigMapper;
+
+    @KafkaListener(topics=WmNewsMessageConstants.WM_NEWS_UP_OR_DOWN_TOPIC)
+    public void handleMessage(String json){
+        log.warn("收到的消息:{}",json);
+        if(StringUtils.isNotBlank(json)) {
+            WmNewsEnableDto dto = JSON.parseObject(json,WmNewsEnableDto.class);
+            ApArticleConfig apArticleConfig = new ApArticleConfig();
+            apArticleConfig.setIsDown(dto.getEnable() != 1);
+            apArticleConfigMapper.update(apArticleConfig,
+                    Wrappers.<ApArticleConfig>lambdaQuery().eq(ApArticleConfig::getArticleId, dto.getId()));
+        }
+    }
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/mapper/ApArticleConfigMapper.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/mapper/ApArticleConfigMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..382d7d677bee0f16a16b4d17d3d48e11a446d8d8
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/mapper/ApArticleConfigMapper.java
@@ -0,0 +1,18 @@
+package com.heima.article.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.heima.model.article.pojos.ApArticleConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * APP已发布文章配置表 Mapper 接口
+ * </p>
+ *
+ * @author ghy
+ * @since 2023-09-21
+ */
+@Mapper
+public interface ApArticleConfigMapper extends BaseMapper<ApArticleConfig> {
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/mapper/ApArticleContentMapper.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/mapper/ApArticleContentMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..66f2f67b27d89edec30bb0e66846e0ab1f87f2e7
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/mapper/ApArticleContentMapper.java
@@ -0,0 +1,18 @@
+package com.heima.article.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.heima.model.article.pojos.ApArticleContent;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * APP已发布文章内容表 Mapper 接口
+ * </p>
+ *
+ * @author ghy
+ * @since 2023-09-21
+ */
+@Mapper
+public interface ApArticleContentMapper extends BaseMapper<ApArticleContent> {
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/mapper/ApArticleMapper.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/mapper/ApArticleMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..c2204cc984508280c8d2392ed6dcd3fcdf5a2b32
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/mapper/ApArticleMapper.java
@@ -0,0 +1,31 @@
+package com.heima.article.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.heima.model.article.dtos.ArticleHomeDto;
+import com.heima.model.article.pojos.ApArticle;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 文章信息表，存储已发布的文章 Mapper 接口
+ * </p>
+ *
+ * @author ghy
+ * @since 2023-09-21
+ */
+@Mapper
+public interface ApArticleMapper extends BaseMapper<ApArticle> {
+
+    /**
+     * 查询文章
+     * @param dto
+     * @return
+     */
+    List<ApArticle> selectList(@Param("dto") ArticleHomeDto dto, @Param("type") Short type);
+
+    List<ApArticle> findListBeforeDate(@Param("day") Date day);
+}
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/ApArticleConfigService.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/ApArticleConfigService.java
new file mode 100644
index 0000000000000000000000000000000000000000..2cff8a78d6c37566fc59fdb0a16898090f0b2c2f
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/ApArticleConfigService.java
@@ -0,0 +1,16 @@
+package com.heima.article.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.heima.model.article.pojos.ApArticleConfig;
+
+/**
+ * <p>
+ * APP已发布文章配置表 服务类
+ * </p>
+ *
+ * @author ghy
+ * @since 2023-09-21
+ */
+public interface ApArticleConfigService extends IService<ApArticleConfig> {
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/ApArticleContentService.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/ApArticleContentService.java
new file mode 100644
index 0000000000000000000000000000000000000000..c2838a54207d4bd4cb34415c02f2d2523b683ed4
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/ApArticleContentService.java
@@ -0,0 +1,18 @@
+package com.heima.article.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.heima.model.article.pojos.ApArticleContent;
+
+;
+
+/**
+ * <p>
+ * APP已发布文章内容表 服务类
+ * </p>
+ *
+ * @author ghy
+ * @since 2023-09-21
+ */
+public interface ApArticleContentService extends IService<ApArticleContent> {
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/ApArticleDetailGenerateService.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/ApArticleDetailGenerateService.java
new file mode 100644
index 0000000000000000000000000000000000000000..4857a0accd560df63838ba06cc744cae877df9ad
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/ApArticleDetailGenerateService.java
@@ -0,0 +1,19 @@
+package com.heima.article.service;
+
+import com.heima.model.article.pojos.ApArticle;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-11 16:48:38
+ */
+public interface ApArticleDetailGenerateService {
+
+    /**
+     * 生成App端文章详情页
+     * @param apArticle 文本基本数据
+     * @param content 内容
+     */
+    void generateApArticleDetailPage(ApArticle apArticle, String content);
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/ApArticleService.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/ApArticleService.java
new file mode 100644
index 0000000000000000000000000000000000000000..0255f73763311244505d46c5623ef8389973a19d
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/ApArticleService.java
@@ -0,0 +1,40 @@
+package com.heima.article.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.heima.model.article.dtos.ArticleDto;
+import com.heima.model.article.dtos.ArticleHomeDto;
+import com.heima.model.article.pojos.ApArticle;
+import com.heima.model.common.dtos.ResponseResult;
+
+/**
+ * <p>
+ * 文章信息表，存储已发布的文章 服务类
+ * </p>
+ *
+ * @author ghy
+ * @since 2023-09-21
+ */
+public interface ApArticleService extends IService<ApArticle> {
+
+    /**
+     * 加载首页
+     * @param dto
+     * @param type 加载方式  1：更多  2：更新
+     * @param isFirstPage 是否首页
+     * @return
+     */
+    ResponseResult load(ArticleHomeDto dto, Short type, Boolean isFirstPage);
+
+    /**
+     * 保存或修改文章
+     * @param dto
+     * @return
+     */
+    ResponseResult saveApArticle(ArticleDto dto);
+
+    /**
+     * 计算热点文章
+     */
+    void computeHotArticle();
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/impl/ApArticleConfigServiceImpl.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/impl/ApArticleConfigServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..90fadb8b189eaa51ade00fc82eae38ca8da48576
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/impl/ApArticleConfigServiceImpl.java
@@ -0,0 +1,20 @@
+package com.heima.article.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.heima.article.mapper.ApArticleConfigMapper;
+import com.heima.article.service.ApArticleConfigService;
+import com.heima.model.article.pojos.ApArticleConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * APP已发布文章配置表 服务实现类
+ * </p>
+ *
+ * @author ghy
+ * @since 2023-09-21
+ */
+@Service
+public class ApArticleConfigServiceImpl extends ServiceImpl<ApArticleConfigMapper, ApArticleConfig> implements ApArticleConfigService {
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/impl/ApArticleContentServiceImpl.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/impl/ApArticleContentServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..3cb8e57587535e0a3d15cd801861d3eade27afff
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/impl/ApArticleContentServiceImpl.java
@@ -0,0 +1,20 @@
+package com.heima.article.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.heima.article.mapper.ApArticleContentMapper;
+import com.heima.article.service.ApArticleContentService;
+import com.heima.model.article.pojos.ApArticleContent;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * APP已发布文章内容表 服务实现类
+ * </p>
+ *
+ * @author ghy
+ * @since 2023-09-21
+ */
+@Service
+public class ApArticleContentServiceImpl extends ServiceImpl<ApArticleContentMapper, ApArticleContent> implements ApArticleContentService {
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/impl/ApArticleDetailGenerateServiceImpl.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/impl/ApArticleDetailGenerateServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..1d3f023adcb2461fcbf7f931bcbe846020c79582
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/impl/ApArticleDetailGenerateServiceImpl.java
@@ -0,0 +1,79 @@
+package com.heima.article.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.heima.article.mapper.ApArticleMapper;
+import com.heima.article.service.ApArticleDetailGenerateService;
+import com.heima.common.constants.ArticleConstants;
+import com.heima.file.service.FileStorageService;
+import com.heima.model.article.pojos.ApArticle;
+import com.heima.model.search.vos.SearchArticleVo;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.io.ByteArrayInputStream;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-11 16:50:32
+ */
+@Service
+@Slf4j
+public class ApArticleDetailGenerateServiceImpl implements ApArticleDetailGenerateService {
+
+    @Autowired
+    private ApArticleMapper apArticleMapper;
+    @Autowired
+    private Configuration configuration;
+    @Autowired
+    private FileStorageService fileStorageService;
+    @Autowired
+    private KafkaTemplate<String, String> kafkaTemplate;
+
+
+    @Override
+    @Async
+    public void generateApArticleDetailPage(ApArticle apArticle, String content) {
+        String path = "";
+        try {
+            StringWriter out = new StringWriter();
+            Template template = configuration.getTemplate("article.ftl");
+            Map<String, Object> data = new HashMap<>();
+            List<Map> maps = JSON.parseArray(content, Map.class);
+            data.put("content", maps);
+            template.process(data,out);
+            //3、生成HTML，上传到Minio
+            ByteArrayInputStream in = new ByteArrayInputStream(out.toString().getBytes(StandardCharsets.UTF_8));
+            path = fileStorageService.uploadHtmlFile("", apArticle.getId() + ".html", in);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //4、更新ApArticle的staticUrl字段
+        apArticle.setStaticUrl(path);
+        apArticleMapper.updateById(apArticle);
+
+        try {
+            //发送消息到Kafka
+            //组装数据
+            SearchArticleVo vo = new SearchArticleVo();
+            BeanUtils.copyProperties(apArticle, vo);
+            vo.setContent(content);
+            kafkaTemplate.send(ArticleConstants.ARTICLE_ES_SYNC_TOPIC, JSON.toJSONString(vo));
+        } catch (BeansException e) {
+            e.printStackTrace();
+        }
+
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/impl/ApArticleServiceImpl.java b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/impl/ApArticleServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..baca5f4cd90942a114e98ae13a80d4a6ea965220
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/java/com/heima/article/service/impl/ApArticleServiceImpl.java
@@ -0,0 +1,262 @@
+package com.heima.article.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.heima.apis.wemedia.IWemediaClient;
+import com.heima.article.mapper.ApArticleConfigMapper;
+import com.heima.article.mapper.ApArticleContentMapper;
+import com.heima.article.mapper.ApArticleMapper;
+import com.heima.article.service.ApArticleDetailGenerateService;
+import com.heima.article.service.ApArticleService;
+import com.heima.common.cache.CacheService;
+import com.heima.common.constants.ArticleConstants;
+import com.heima.common.exception.CustomException;
+import com.heima.model.article.dtos.ArticleDto;
+import com.heima.model.article.dtos.ArticleHomeDto;
+import com.heima.model.article.pojos.ApArticle;
+import com.heima.model.article.pojos.ApArticleConfig;
+import com.heima.model.article.pojos.ApArticleContent;
+import com.heima.model.article.vos.ApArticleVo;
+import com.heima.model.article.vos.HotArticleVo;
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.common.enums.AppHttpCodeEnum;
+import com.heima.model.wemedia.pojos.WmChannel;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 文章信息表，存储已发布的文章 服务实现类
+ * </p>
+ *
+ * @author ghy
+ * @since 2023-09-21
+ */
+@Service
+public class ApArticleServiceImpl extends ServiceImpl<ApArticleMapper, ApArticle> implements ApArticleService {
+
+    @Autowired
+    private ApArticleMapper apArticleMapper;
+    @Autowired
+    private ApArticleConfigMapper apArticleConfigMapper;
+    @Autowired
+    private ApArticleContentMapper apArticleContentMapper;
+    @Autowired
+    private ApArticleDetailGenerateService apArticleDetailGenerateService;
+    @Autowired
+    private IWemediaClient wemediaClient;
+    @Autowired
+    private CacheService cacheService;
+
+    /**
+     * 从缓存中获取各频道首页数据
+     * @param dto
+     * @return
+     */
+    private ResponseResult loadFormRedis(String channel) {
+        //从缓存中拿
+        String json = cacheService.get(ArticleConstants.HOT_ARTICLE_FIRST_PAGE + channel);
+        List<HotArticleVo> hotArticleVos = JSON.parseArray(json, HotArticleVo.class);
+        log.warn("redis 从缓冲中获取数据");
+        return ResponseResult.okResult(hotArticleVos);
+    }
+
+    @Override
+    public ResponseResult load(ArticleHomeDto dto, Short type, Boolean isFirstPage) {
+        //没有
+        // 一.校验参数
+        if(dto == null) {
+            throw new CustomException(AppHttpCodeEnum.PARAM_INVALID);
+        }
+        if (dto.getSize() == null || dto.getSize() <= 0) {
+            dto.setSize(10);
+        }
+        if(StringUtils.isBlank(dto.getTag())){
+            dto.setTag(ArticleConstants.DEFAULT_TAG);
+        }
+        if(dto.getMinBehotTime() == null) {
+            dto.setMinBehotTime(new Date());
+        }
+        if(dto.getMaxBehotTime() == null) {
+            dto.setMaxBehotTime(new Date());
+        }
+        if(!ArticleConstants.LOADTYPE_LOAD_MORE.equals(type) && !ArticleConstants.LOADTYPE_LOAD_NEW.equals(type)) {
+            type = ArticleConstants.LOADTYPE_LOAD_NEW;
+        }
+
+        if(isFirstPage) {
+            return loadFormRedis(dto.getTag());
+        }
+
+        // 二.处理业务
+        // 查询条件 频道、状态：已发布【配置表中不下架、不删除】、降序：发布时间
+        // 两表连查
+        log.warn("db 从数据库中获取数据");
+        List<ApArticle> list = apArticleMapper.selectList(dto, type);
+        List<ApArticleVo> voList = new ArrayList<>(list.size());
+        for (ApArticle apArticle : list) {
+            ApArticleVo vo = new ApArticleVo();
+            BeanUtils.copyProperties(apArticle, vo);
+            vo.setId(apArticle.getId().toString());
+            voList.add(vo);
+        }
+        // 三.封装数据
+        return ResponseResult.okResult(voList);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseResult saveApArticle(ArticleDto dto) {
+        /*try {
+            //休眠三秒，模拟保存文章数据，需要执行的时长
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }*/
+        // 一.校验参数
+        if(dto == null){
+            throw new CustomException(AppHttpCodeEnum.PARAM_INVALID);
+        }
+        // 二.处理业务
+        ApArticle apArticle = new ApArticle();
+        BeanUtils.copyProperties(dto, apArticle);
+        // 1.判断是保存还是修改
+        if(dto.getId() == null) {
+            // 2.保存
+            // 保存文章基本信息
+            boolean flag = this.save(apArticle);
+            if(!flag) {
+                throw new CustomException(AppHttpCodeEnum.AP_ARTICLE_INSERT_FAIL);
+            }
+            //制造异常
+            //int i = 1/0;
+            // 保存文章配置信息
+            ApArticleConfig apArticleConfig = new ApArticleConfig(apArticle.getId());
+            int row = apArticleConfigMapper.insert(apArticleConfig);
+            if(row <= 0) {
+                throw new CustomException(AppHttpCodeEnum.AP_ARTICLE_CONFIG_INSERT_FAIL);
+            }
+            // 保存文章内容
+            ApArticleContent apArticleContent = new ApArticleContent();
+            apArticleContent.setArticleId(apArticle.getId());
+            apArticleContent.setContent(dto.getContent());
+            row = apArticleContentMapper.insert(apArticleContent);
+            if(row <= 0) {
+                throw new CustomException(AppHttpCodeEnum.AP_ARTICLE_CONTENT_INSERT_FAIL);
+            }
+        } else {
+            // 3.修改
+            // 修改文章基本信息
+            boolean flag = this.updateById(apArticle);
+            if(!flag) {
+                throw new CustomException(AppHttpCodeEnum.AP_ARTICLE_UPDATE_FAIL);
+            }
+            // 修改文章内容
+            ApArticleContent apArticleContent = new ApArticleContent();
+            apArticleContent.setArticleId(dto.getId());
+            apArticleContent.setContent(dto.getContent());
+            int row = apArticleContentMapper.update(apArticleContent,
+                    Wrappers.<ApArticleContent>lambdaQuery().eq(ApArticleContent::getArticleId, dto.getId())
+            );//update ap_article_content set content = ? where article_id = ?
+            if(row <= 0) {
+                throw new CustomException(AppHttpCodeEnum.AP_ARTICLE_CONTENT_INSERT_FAIL);
+            }
+        }
+
+        //APP文章发布成功。生成文章详情页
+        apArticleDetailGenerateService.generateApArticleDetailPage(apArticle, dto.getContent());
+        // 三.封装数据
+        // 返回APP端文章的ID
+        return ResponseResult.okResult(apArticle.getId());
+    }
+
+    @Override
+    public void computeHotArticle() {
+        //1、查询指定时间的文章
+        //todo 5天前没有很多数据，所以现在写5年前，实际上线应该是5天前
+        Date day = DateTime.now().minusYears(5).toDate();
+        List<ApArticle> articleList = apArticleMapper.findListBeforeDate(day);
+        //2、计算分值
+        List<HotArticleVo> voList = computeHotArticleVo(articleList);
+        //3、排序并放入缓存
+        sortAndCacheToRedis(voList);
+    }
+
+    private void sortAndCacheToRedis(List<HotArticleVo> voList) {
+        ResponseResult<List<WmChannel>> responseResult = wemediaClient.channels();
+        if(responseResult.getCode().equals(200)) {
+            List<WmChannel> channels = responseResult.getData();
+            //1、得到每个频道下的文章
+            for (WmChannel channel : channels) {
+                //当前频道
+                List<HotArticleVo> channelVoList = voList.stream().filter(v -> v.getChannelId().equals(channel.getId())).collect(Collectors.toList());
+                //2、按score给文章排序
+                //3、取前30条放到Redis中
+                sortAndCache(channelVoList, ArticleConstants.HOT_ARTICLE_FIRST_PAGE + channel.getId());
+            }
+        }
+        //所有的数据也需要取前30条放到Redis
+        sortAndCache(voList, ArticleConstants.HOT_ARTICLE_FIRST_PAGE + ArticleConstants.DEFAULT_TAG);
+    }
+
+    /**
+     * 为热点文章数据排序，放入缓存
+     * @param voList
+     * @param redisKey
+     */
+    private void sortAndCache(List<HotArticleVo> voList, String redisKey) {
+        List<HotArticleVo> data = voList.stream()
+                //根据score倒序
+                .sorted(Comparator.comparing(HotArticleVo::getScore).reversed())
+                //取前30条
+                .limit(30)
+                .collect(Collectors.toList());
+        cacheService.set(redisKey, JSON.toJSONString(data));
+    }
+
+    private List<HotArticleVo> computeHotArticleVo(List<ApArticle> articleList) {
+        List<HotArticleVo> voList = new ArrayList<>();
+        for (ApArticle article : articleList) {
+            HotArticleVo vo = new HotArticleVo();
+            BeanUtils.copyProperties(article, vo);
+            Integer score = computeScore(vo);
+            vo.setScore(score);
+            voList.add(vo);
+        }
+        return voList;
+    }
+
+    private Integer computeScore(HotArticleVo vo) {
+        int score = 0;
+        Integer views = vo.getViews();
+        Integer likes = vo.getLikes();
+        Integer comment = vo.getComment();
+        Integer collection = vo.getCollection();
+        if(views != null && views > 0) {
+            score += views;
+        }
+        if(likes != null && likes > 0){
+            score += likes * ArticleConstants.HOT_ARTICLE_LIKE_WEIGHT;
+        }
+        if(comment != null && comment > 0){
+            score += comment * ArticleConstants.HOT_ARTICLE_COMMENT_WEIGHT;
+        }
+        if(collection != null && collection > 0){
+            score += collection * ArticleConstants.HOT_ARTICLE_COLLECTION_WEIGHT;
+        }
+        return score;
+    }
+
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/resources/bootstrap.yml b/heima-leadnews-service/heima-leadnews-article/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000000000000000000000000000000000000..40bbddafcd7fa64996f4dbd743a0492f8c1ce567
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/resources/bootstrap.yml
@@ -0,0 +1,27 @@
+server:
+  port: 51802
+spring:
+  application:
+    name: leadnews-article
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.200.130:8848
+      config:
+        server-addr: 192.168.200.130:8848
+        file-extension: yml
+
+seata:
+  registry: # TC服务注册中心的配置，微服务根据这些信息去注册中心获取tc服务地址
+    type: nacos # 注册中心类型 nacos
+    nacos:
+      server-addr: 192.168.200.130:8848 # nacos地址
+      namespace: "" # namespace，默认为空
+      group: DEFAULT_GROUP # 分组，默认是DEFAULT_GROUP
+      application: seata-server # seata服务名称
+      username: ""
+      password: ""
+  tx-service-group: seata-demo # 事务组名称
+  service:
+    vgroup-mapping: # 事务组与cluster的映射关系
+      seata-demo: default
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/resources/logback.xml b/heima-leadnews-service/heima-leadnews-article/src/main/resources/logback.xml
new file mode 100644
index 0000000000000000000000000000000000000000..199dbed48c7a52066ed75e0e99cb52431420567c
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/resources/logback.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration>
+    <!--定义日志文件的存储地址,使用绝对路径-->
+    <property name="LOG_HOME" value="e:/logs"/>
+
+    <!-- Console 输出设置 -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>utf8</charset>
+        </encoder>
+    </appender>
+
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <fileNamePattern>${LOG_HOME}/leadnews.%d{yyyy-MM-dd}.log</fileNamePattern>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 异步输出 -->
+    <appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
+        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
+        <discardingThreshold>0</discardingThreshold>
+        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
+        <queueSize>512</queueSize>
+        <!-- 添加附加的appender,最多只能添加一个 -->
+        <appender-ref ref="FILE"/>
+    </appender>
+
+
+    <logger name="org.apache.ibatis.cache.decorators.LoggingCache" level="DEBUG" additivity="false">
+        <appender-ref ref="CONSOLE"/>
+    </logger>
+    <logger name="org.springframework.boot" level="debug"/>
+    <root level="info">
+        <!--<appender-ref ref="ASYNC"/>-->
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="CONSOLE"/>
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/resources/mapper/ApArticleContentMapper.xml b/heima-leadnews-service/heima-leadnews-article/src/main/resources/mapper/ApArticleContentMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3d5dfae0ace83851f5fc5282a5be6d296d06a26f
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/resources/mapper/ApArticleContentMapper.xml
@@ -0,0 +1,17 @@
+<?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="com.heima.article.mapper.ApArticleContentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.heima.model.article.pojos.ApArticleContent">
+        <id column="id" property="id" />
+        <result column="article_id" property="articleId" />
+        <result column="content" property="content" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, article_id, content
+    </sql>
+
+</mapper>
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/resources/mapper/ApArticleMapper.xml b/heima-leadnews-service/heima-leadnews-article/src/main/resources/mapper/ApArticleMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d7f404093c0566606302235f63409666d39d3ea2
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/resources/mapper/ApArticleMapper.xml
@@ -0,0 +1,113 @@
+<?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="com.heima.article.mapper.ApArticleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.heima.model.article.pojos.ApArticle">
+        <!-- id:表示映射主键， column:结果集列名  property：column的值对应的Java实体的属性名-->
+        <id column="id" property="id" />
+        <!-- result:表示映射普通列， column:结果集列名  property：column的值对应的Java实体的属性名-->
+        <result column="title" property="title" />
+        <result column="author_id" property="authorId" />
+        <result column="author_name" property="authorName" />
+        <result column="channel_id" property="channelId" />
+        <result column="channel_name" property="channelName" />
+        <result column="layout" property="layout" />
+        <result column="flag" property="flag" />
+        <result column="images" property="images" />
+        <result column="labels" property="labels" />
+        <result column="likes" property="likes" />
+        <result column="collection" property="collection" />
+        <result column="comment" property="comment" />
+        <result column="views" property="views" />
+        <result column="province_id" property="provinceId" />
+        <result column="city_id" property="cityId" />
+        <result column="county_id" property="countyId" />
+        <result column="created_time" property="createdTime" />
+        <result column="publish_time" property="publishTime" />
+        <result column="sync_status" property="syncStatus" />
+        <result column="origin" property="origin" />
+        <result column="static_url" property="staticUrl" />
+    </resultMap>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMapNoId" type="com.heima.model.article.pojos.ApArticle">
+        <result column="title" property="title" />
+        <result column="author_id" property="authorId" />
+        <result column="author_name" property="authorName" />
+        <result column="channel_id" property="channelId" />
+        <result column="channel_name" property="channelName" />
+        <result column="layout" property="layout" />
+        <result column="flag" property="flag" />
+        <result column="images" property="images" />
+        <result column="labels" property="labels" />
+        <result column="likes" property="likes" />
+        <result column="collection" property="collection" />
+        <result column="comment" property="comment" />
+        <result column="views" property="views" />
+        <result column="province_id" property="provinceId" />
+        <result column="city_id" property="cityId" />
+        <result column="county_id" property="countyId" />
+        <result column="created_time" property="createdTime" />
+        <result column="publish_time" property="publishTime" />
+        <result column="sync_status" property="syncStatus" />
+        <result column="origin" property="origin" />
+        <result column="static_url" property="staticUrl" />
+    </resultMap>
+
+    <!-- resultMap : 自定义结果映射 -->
+    <resultMap id="ArticleResultMap" type="com.heima.model.article.pojos.ApArticle" extends="BaseResultMapNoId">
+        <id column="aa_id" property="id"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, title, author_id, author_name, channel_id, channel_name, layout, flag, images, labels, likes, collection, comment, views, province_id, city_id, county_id, created_time, publish_time, sync_status, origin, static_url
+    </sql>
+
+    <sql id="Base_Column_List_NO_ID">
+        title, author_id, author_name, channel_id, channel_name, layout, flag, images, labels, likes, collection, comment, views, province_id, city_id, county_id, created_time, publish_time, sync_status, origin, static_url
+    </sql>
+
+    <select id="selectList" resultMap="ArticleResultMap">
+        SELECT
+            aa.id aa_id,
+            <include refid="Base_Column_List_NO_ID"></include>
+        FROM
+            ap_article aa, ap_article_config aac
+        <where>
+            aa.id = aac.article_id
+          <if test="dto.tag != '__all__'">
+              AND aa.channel_id = #{dto.tag}
+          </if>
+          <if test="type == 1">
+              <![CDATA[
+                AND aa.publish_time < #{dto.minBehotTime}
+              ]]>
+          </if>
+            <if test="type == 2">
+                <![CDATA[
+                AND aa.publish_time > #{dto.maxBehotTime}
+              ]]>
+            </if>
+          AND aac.is_down != 1
+          AND aac.is_delete != 1
+        </where>
+        ORDER BY aa.publish_time DESC
+        LIMIT #{dto.size}
+    </select>
+
+    <select id="findListBeforeDate" resultMap="ArticleResultMap">
+        SELECT
+            aa.id aa_id,
+        <include refid="Base_Column_List_NO_ID"></include>
+        FROM
+            ap_article aa, ap_article_config aac
+        where
+            aa.id = aac.article_id
+            AND aac.is_down != 1
+            AND aac.is_delete != 1
+            AND aa.publish_time > #{day}
+    </select>
+
+</mapper>
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/resources/mapper/WmMaterialService.xml b/heima-leadnews-service/heima-leadnews-article/src/main/resources/mapper/WmMaterialService.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bfbca23bb16439e4cc02fc27276d833c2f4a575c
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/resources/mapper/WmMaterialService.xml
@@ -0,0 +1,20 @@
+<?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="com.heima.article.mapper.ApArticleConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.heima.model.article.pojos.ApArticleConfig">
+        <id column="id" property="id" />
+        <result column="article_id" property="articleId" />
+        <result column="is_comment" property="isComment" />
+        <result column="is_forward" property="isForward" />
+        <result column="is_down" property="isDown" />
+        <result column="is_delete" property="isDelete" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, article_id, is_comment, is_forward, is_down, is_delete
+    </sql>
+
+</mapper>
diff --git a/heima-leadnews-service/heima-leadnews-article/src/main/resources/templates/article.ftl b/heima-leadnews-service/heima-leadnews-article/src/main/resources/templates/article.ftl
new file mode 100644
index 0000000000000000000000000000000000000000..48b0eb46e68aa8416e718f8545a7909be1713a2c
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/main/resources/templates/article.ftl
@@ -0,0 +1,183 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover">
+    <title>黑马头条</title>
+    <!-- 引入样式文件 -->
+    <link rel="stylesheet" href="../../../plugins/css/style.css">
+    <!-- 页面样式 -->
+    <link rel="stylesheet" href="../../../plugins/css/index.css">
+
+</head>
+
+<body>
+<div id="app">
+    <div class="article">
+        <van-row>
+            <van-col span="24" class="article-title" v-html="title"></van-col>
+        </van-row>
+
+        <van-row type="flex" align="center" class="article-header">
+            <van-col span="3">
+                <van-image round class="article-avatar" src="https://p3.pstatp.com/thumb/1480/7186611868"></van-image>
+            </van-col>
+            <van-col span="16">
+                <div v-html="authorName"></div>
+                <div>{{ publishTime | timestampToDateTime }}</div>
+            </van-col>
+            <van-col span="5">
+                <van-button round :icon="relation.isfollow ? '' : 'plus'" type="info" class="article-focus"
+                            :text="relation.isfollow ? '取消关注' : '关注'" :loading="followLoading" @click="handleClickArticleFollow">
+                </van-button>
+            </van-col>
+        </van-row>
+
+        <van-row class="article-content">
+            <#if content??>
+                <#list content as item>
+                    <#if item.type='text'>
+                        <van-col span="24" class="article-text">${item.value}</van-col>
+                    <#else>
+                        <van-col span="24" class="article-image">
+                            <van-image width="100%" src="${item.value}"></van-image>
+                        </van-col>
+                    </#if>
+                </#list>
+            </#if>
+        </van-row>
+
+        <van-row type="flex" justify="center" class="article-action">
+            <van-col>
+                <van-button round :icon="relation.islike ? 'good-job' : 'good-job-o'" class="article-like"
+                            :loading="likeLoading" :text="relation.islike ? '取消赞' : '点赞'" @click="handleClickArticleLike"></van-button>
+                <van-button round :icon="relation.isunlike ? 'delete' : 'delete-o'" class="article-unlike"
+                            :loading="unlikeLoading" @click="handleClickArticleUnlike">不喜欢</van-button>
+            </van-col>
+        </van-row>
+
+        <!-- 文章评论列表 -->
+        <van-list v-model="commentsLoading" :finished="commentsFinished" finished-text="没有更多了"
+                  @load="onLoadArticleComments">
+            <van-row id="#comment-view" type="flex" class="article-comment" v-for="(item, index) in comments" :key="index">
+                <van-col span="3">
+                    <van-image round src="https://p3.pstatp.com/thumb/1480/7186611868" class="article-avatar"></van-image>
+                </van-col>
+                <van-col span="21">
+                    <van-row type="flex" align="center" justify="space-between">
+                        <van-col class="comment-author" v-html="item.authorName"></van-col>
+                        <van-col>
+                            <van-button round :icon="item.operation === 0 ? 'good-job' : 'good-job-o'" size="normal"
+                                        @click="handleClickCommentLike(item)">{{ item.likes || '' }}
+                            </van-button>
+                        </van-col>
+                    </van-row>
+
+                    <van-row>
+                        <van-col class="comment-content" v-html="item.content"></van-col>
+                    </van-row>
+                    <van-row type="flex" align="center">
+                        <van-col span="10" class="comment-time">
+                            {{ item.createdTime | timestampToDateTime }}
+                        </van-col>
+                        <van-col span="3">
+                            <van-button round size="normal" v-html="item.reply" @click="showCommentRepliesPopup(item.id)">回复 {{
+                                item.reply || '' }}
+                            </van-button>
+                        </van-col>
+                    </van-row>
+                </van-col>
+            </van-row>
+        </van-list>
+    </div>
+    <!-- 文章底部栏 -->
+    <van-row type="flex" justify="space-around" align="center" class="article-bottom-bar">
+        <van-col span="13">
+            <van-field v-model="commentValue" placeholder="写评论">
+                <template #button>
+                    <van-button icon="back-top" @click="handleSaveComment"></van-button>
+                </template>
+            </van-field>
+        </van-col>
+        <van-col span="3">
+            <van-button icon="comment-o" @click="handleScrollIntoCommentView"></van-button>
+        </van-col>
+        <van-col span="3">
+            <van-button :icon="relation.iscollection ? 'star' : 'star-o'" :loading="collectionLoading"
+                        @click="handleClickArticleCollection"></van-button>
+        </van-col>
+        <van-col span="3">
+            <van-button icon="share-o"></van-button>
+        </van-col>
+    </van-row>
+
+    <!-- 评论Popup 弹出层 -->
+    <van-popup v-model="showPopup" closeable position="bottom"
+               :style="{ width: '750px', height: '60%', left: '50%', 'margin-left': '-375px' }">
+        <!-- 评论回复列表 -->
+        <van-list v-model="commentRepliesLoading" :finished="commentRepliesFinished" finished-text="没有更多了"
+                  @load="onLoadCommentReplies">
+            <van-row id="#comment-reply-view" type="flex" class="article-comment-reply"
+                     v-for="(item, index) in commentReplies" :key="index">
+                <van-col span="3">
+                    <van-image round src="https://p3.pstatp.com/thumb/1480/7186611868" class="article-avatar"></van-image>
+                </van-col>
+                <van-col span="21">
+                    <van-row type="flex" align="center" justify="space-between">
+                        <van-col class="comment-author" v-html="item.authorName"></van-col>
+                        <van-col>
+                            <van-button round :icon="item.operation === 0 ? 'good-job' : 'good-job-o'" size="normal"
+                                        @click="handleClickCommentReplyLike(item)">{{ item.likes || '' }}
+                            </van-button>
+                        </van-col>
+                    </van-row>
+
+                    <van-row>
+                        <van-col class="comment-content" v-html="item.content"></van-col>
+                    </van-row>
+                    <van-row type="flex" align="center">
+                        <!-- TODO: js计算时间差 -->
+                        <van-col span="10" class="comment-time">
+                            {{ item.createdTime | timestampToDateTime }}
+                        </van-col>
+                    </van-row>
+                </van-col>
+            </van-row>
+        </van-list>
+        <!-- 评论回复底部栏 -->
+        <van-row type="flex" justify="space-around" align="center" class="comment-reply-bottom-bar">
+            <van-col span="13">
+                <van-field v-model="commentReplyValue" placeholder="写评论">
+                    <template #button>
+                        <van-button icon="back-top" @click="handleSaveCommentReply"></van-button>
+                    </template>
+                </van-field>
+            </van-col>
+            <van-col span="3">
+                <van-button icon="comment-o"></van-button>
+            </van-col>
+            <van-col span="3">
+                <van-button icon="star-o"></van-button>
+            </van-col>
+            <van-col span="3">
+                <van-button icon="share-o"></van-button>
+            </van-col>
+        </van-row>
+    </van-popup>
+</div>
+
+<!-- 引入 Vue 和 Vant 的 JS 文件 -->
+<script src="../../../plugins/js/vue.min.js">
+</script>
+<script src="../../../plugins/js/vant.min.js"></script>
+<!-- 引入 Axios 的 JS 文件 -->
+<#--<script src="https://unpkg.com/axios/dist/axios.min.js"></script>-->
+<script src="../../../plugins/js/axios.min.js"></script>
+<!-- 页面逻辑 -->
+<script src="../../../plugins/js/index.js"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-article/src/test/java/com/heima/article/service/ArticleClientTest.java b/heima-leadnews-service/heima-leadnews-article/src/test/java/com/heima/article/service/ArticleClientTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..6ac1dfe4bf5988230f5addb2ac58777348923a3e
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/test/java/com/heima/article/service/ArticleClientTest.java
@@ -0,0 +1,37 @@
+package com.heima.article.service;
+
+import com.heima.article.feign.ArticleClient;
+import com.heima.article.mapper.ApArticleMapper;
+import com.heima.model.article.dtos.ArticleDto;
+import com.heima.model.article.pojos.ApArticle;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-08 17:29:15
+ */
+@SpringBootTest
+public class ArticleClientTest {
+
+    @Autowired
+    private ArticleClient articleClient;
+    @Autowired
+    private ApArticleMapper apArticleMapper;
+
+    @Test
+    public void testSaveApArticle(){
+        Long articleId = 1302977754114826241L;
+        ApArticle apArticle = apArticleMapper.selectById(articleId);
+        apArticle.setId(null);
+        apArticle.setAuthorName("itheima");
+        ArticleDto dto = new ArticleDto();
+        BeanUtils.copyProperties(apArticle, dto);
+        dto.setContent("[{\"type\":\"text\",\"value\":\"杨澜回应一秒变脸杨澜回应一秒变脸杨澜回应一秒变脸杨澜回应一秒变脸杨澜回应一秒变脸杨澜回应一秒变脸\"},{\"type\":\"image\",\"value\":\"http://192.168.200.130/group1/M00/00/00/wKjIgl892wKAZLhtAASZUi49De0836.jpg\"},{\"type\":\"text\",\"value\":\"杨澜回应一秒变脸杨澜回应一秒变脸杨澜回应一秒变脸杨澜回应一秒变脸杨澜回应一秒变脸杨澜回应一秒变脸杨澜回应一秒变脸杨澜回应一秒变脸\"},{\"type\":\"text\",\"value\":\"11111111\"}]");
+        articleClient.saveApArticle(dto);
+    }
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-article/src/test/java/com/heima/article/test/GeneratePageTest.java b/heima-leadnews-service/heima-leadnews-article/src/test/java/com/heima/article/test/GeneratePageTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..9706ddb6ef4f022a1c2cd744f26a6b48e5451823
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-article/src/test/java/com/heima/article/test/GeneratePageTest.java
@@ -0,0 +1,74 @@
+package com.heima.article.test;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.heima.article.mapper.ApArticleContentMapper;
+import com.heima.article.mapper.ApArticleMapper;
+import com.heima.file.service.impl.MinIOFileStorageService;
+import com.heima.model.article.pojos.ApArticle;
+import com.heima.model.article.pojos.ApArticleContent;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.io.ByteArrayInputStream;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 09:57:44
+ */
+@SpringBootTest
+public class GeneratePageTest {
+
+    @Autowired
+    private ApArticleContentMapper apArticleContentMapper;
+    @Autowired
+    private ApArticleMapper apArticleMapper;
+    @Autowired
+    private Configuration configuration;
+    @Autowired
+    private MinIOFileStorageService minIOFileStorageService;
+
+    /**
+     *
+     * @throws Exception
+     */
+    @Test
+    public void generateHtmlToMinioTest() throws Exception {
+        //1、查询文章内容
+        Long articleId = 1302862387124125698L;
+        ApArticleContent apArticleContent = apArticleContentMapper.selectOne(
+                Wrappers.<ApArticleContent>lambdaQuery()
+                        .eq(ApArticleContent::getArticleId, articleId)
+        );
+        //2、通过Freemarker填充内容
+        if(apArticleContent == null || StringUtils.isBlank(apArticleContent.getContent())){
+            return;
+        }
+        StringWriter out = new StringWriter();
+        Template template = configuration.getTemplate("article.ftl");
+        Map<String, Object> data = new HashMap<>();
+        List<Map> maps = JSON.parseArray(apArticleContent.getContent(), Map.class);
+        data.put("content", maps);
+        template.process(data,out);
+        //3、生成HTML，上传到Minio
+        ByteArrayInputStream in = new ByteArrayInputStream(out.toString().getBytes(StandardCharsets.UTF_8));
+        String path = minIOFileStorageService.uploadHtmlFile("", articleId + ".html", in);
+        System.out.println(path);
+        //4、更新ApArticle的staticUrl字段
+        ApArticle apArticle = new ApArticle();
+        apArticle.setId(articleId);
+        apArticle.setStaticUrl(path);
+        apArticleMapper.updateById(apArticle);
+    }
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-search/pom.xml b/heima-leadnews-service/heima-leadnews-search/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ffa42a7cc4464bbb27ed70ecdce3685403bb47fb
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/pom.xml
@@ -0,0 +1,50 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews-service</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>heima-leadnews-search</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+    <dependencies>
+        <!--elasticsearch-->
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-high-level-client</artifactId>
+            <version>7.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-client</artifactId>
+            <version>7.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <version>7.4.0</version>
+        </dependency>
+        <!-- kafkfa -->
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/SearchApplication.java b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/SearchApplication.java
new file mode 100644
index 0000000000000000000000000000000000000000..7881a8d02ae6de288cb9ccac69c6bfb9db53e303
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/SearchApplication.java
@@ -0,0 +1,14 @@
+package com.heima.search;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+@SpringBootApplication
+@EnableAsync
+public class SearchApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SearchApplication.class,args);
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/config/ElasticSearchConfig.java b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/config/ElasticSearchConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..94b831b4f955efbc26cff7faa3164113e5fdba34
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/config/ElasticSearchConfig.java
@@ -0,0 +1,32 @@
+package com.heima.search.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.http.HttpHost;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Getter
+@Setter
+@Configuration
+@ConfigurationProperties(prefix = "elasticsearch")
+public class ElasticSearchConfig {
+    private String host;
+    private int port;
+
+    @Bean
+    public RestHighLevelClient client(){
+        System.out.println(host);
+        System.out.println(port);
+        return new RestHighLevelClient(RestClient.builder(
+                new HttpHost(
+                        host,
+                        port,
+                        "http"
+                )
+        ));
+    }
+}
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/config/WebMvcConfig.java b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/config/WebMvcConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..727f590b939bac777a5c1f6e591615c5cb460aa3
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/config/WebMvcConfig.java
@@ -0,0 +1,25 @@
+package com.heima.search.config;
+
+import com.heima.search.interceptors.AppTokenInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 11:59:14
+ */
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    @Autowired
+    private AppTokenInterceptor appTokenInterceptor;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(appTokenInterceptor)
+                .addPathPatterns("/**");
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/controller/v1/ApAssociateWordsController.java b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/controller/v1/ApAssociateWordsController.java
new file mode 100644
index 0000000000000000000000000000000000000000..fbfe7b5434b1dbd04b879039af844a549c409fbc
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/controller/v1/ApAssociateWordsController.java
@@ -0,0 +1,26 @@
+package com.heima.search.controller.v1;
+
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.search.dtos.UserSearchDto;
+import com.heima.search.service.ApAssociateWordsService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/v1/associate")
+@Slf4j
+public class ApAssociateWordsController {
+
+    @Autowired
+    private ApAssociateWordsService apAssociateWordsService;
+
+    @PostMapping("/search")
+    public ResponseResult search(@RequestBody UserSearchDto userSearchDto) {
+        log.warn("{}", userSearchDto);
+        return apAssociateWordsService.search(userSearchDto);
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/controller/v1/ArticleSearchController.java b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/controller/v1/ArticleSearchController.java
new file mode 100644
index 0000000000000000000000000000000000000000..ed9252a7b76f9ff89d3a12b1a3aee0b33827d600
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/controller/v1/ArticleSearchController.java
@@ -0,0 +1,34 @@
+package com.heima.search.controller.v1;
+
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.search.dtos.UserSearchDto;
+import com.heima.search.service.ArticleSearchService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+
+@RestController
+@RequestMapping("/api/v1/article/search")
+@Slf4j
+public class ArticleSearchController {
+
+    @Autowired
+    private ArticleSearchService articleSearchService;
+
+    /**
+     * 搜索框搜索
+     * @param dto
+     * @return
+     * @throws IOException
+     */
+    @PostMapping("/search")
+    public ResponseResult search(@RequestBody UserSearchDto dto) throws Exception {
+        log.warn("dto:{}", dto);
+        return articleSearchService.search(dto);
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/interceptors/AppTokenInterceptor.java b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/interceptors/AppTokenInterceptor.java
new file mode 100644
index 0000000000000000000000000000000000000000..12712c2f887dd8aa7fd484706483fb3c7114a757
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/interceptors/AppTokenInterceptor.java
@@ -0,0 +1,50 @@
+package com.heima.search.interceptors;
+
+import com.heima.search.utils.AppThreadLocalUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 11:44:59
+ */
+@Component
+@Slf4j
+public class AppTokenInterceptor implements HandlerInterceptor {
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        //1.获取请求头
+        String appUserIdStr = request.getHeader("appUserId");
+        if(StringUtils.isNotBlank(appUserIdStr)) {
+            //2.放到ThreadLocal中
+            try {
+                Integer appUserId = Integer.valueOf(appUserIdStr);
+                AppThreadLocalUtil.setAppUserId(appUserId);
+                log.info("appUserId:{}", appUserId);
+            } catch (NumberFormatException e) {
+                e.printStackTrace();
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 释放资源
+     * @param request
+     * @param response
+     * @param handler
+     * @param ex
+     * @throws Exception
+     */
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+        AppThreadLocalUtil.removeAppUserId();
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/listeners/SyncArticleListener.java b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/listeners/SyncArticleListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..37d98babcd04618f14eb9b5c2b17fce07e779354
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/listeners/SyncArticleListener.java
@@ -0,0 +1,46 @@
+package com.heima.search.listeners;
+
+import com.alibaba.fastjson.JSON;
+import com.heima.common.constants.ArticleConstants;
+import com.heima.model.search.vos.SearchArticleVo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.common.xcontent.XContentType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-15 10:26:47
+ */
+@Component
+@Slf4j
+public class SyncArticleListener {
+
+    @Autowired
+    private RestHighLevelClient client;
+
+    @KafkaListener(topics=ArticleConstants.ARTICLE_ES_SYNC_TOPIC)
+    public void handleMessage(String message) {
+        try {
+            if(StringUtils.isNotBlank(message)) {
+                SearchArticleVo vo = JSON.parseObject(message, SearchArticleVo.class);
+                IndexRequest request = new IndexRequest("app_info_article");
+                request.id(vo.getId().toString())
+                                .source(message, XContentType.JSON);
+                client.index(request, RequestOptions.DEFAULT);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            log.error("文章数据同步到ES出错了:{}", e.getMessage());
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/pojos/ApAssociateWords.java b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/pojos/ApAssociateWords.java
new file mode 100644
index 0000000000000000000000000000000000000000..9d37edc1030d804306522dd126318e58b425feeb
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/pojos/ApAssociateWords.java
@@ -0,0 +1,34 @@
+package com.heima.search.pojos;
+
+import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 联想词表
+ * </p>
+ *
+ * @author itheima
+ */
+@Data
+@Document("ap_associate_words")   //用来映射实体与文档的对应关系
+public class ApAssociateWords implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    /**
+     * 联想词
+     */
+    private String associateWords;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/pojos/ApUserSearch.java b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/pojos/ApUserSearch.java
new file mode 100644
index 0000000000000000000000000000000000000000..33771fcda530cbf18c5c829395c250e494802005
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/pojos/ApUserSearch.java
@@ -0,0 +1,42 @@
+package com.heima.search.pojos;
+
+import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * APP用户搜索信息表
+ * </p>
+ * @author itheima
+ */
+@Data
+@Document("ap_user_search")
+public class ApUserSearch implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * 搜索词
+     */
+    private String keyword;
+
+    /**
+     * 创建时间
+     */
+    //private String createdTime;
+    private Date createdTime;
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/ApAssociateWordsService.java b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/ApAssociateWordsService.java
new file mode 100644
index 0000000000000000000000000000000000000000..d46b4116dc742d96cbfa6c50b736a0735991736a
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/ApAssociateWordsService.java
@@ -0,0 +1,16 @@
+package com.heima.search.service;
+
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.search.dtos.UserSearchDto;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-15 17:18:58
+ */
+public interface ApAssociateWordsService {
+
+    ResponseResult search(@RequestBody UserSearchDto userSearchDto);
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/ApUserSearchService.java b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/ApUserSearchService.java
new file mode 100644
index 0000000000000000000000000000000000000000..fb91072f9afa0d06097d1e483e2c7179d0efa9cd
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/ApUserSearchService.java
@@ -0,0 +1,17 @@
+package com.heima.search.service;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-15 14:57:10
+ */
+public interface ApUserSearchService {
+
+    /**
+     * 保存用户搜索记录
+     * @param keyword
+     * @param userId
+     */
+    void save(String keyword, Integer userId);
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/ArticleSearchService.java b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/ArticleSearchService.java
new file mode 100644
index 0000000000000000000000000000000000000000..1b25090c5593a2d92315edc8466b4d8981b59123
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/ArticleSearchService.java
@@ -0,0 +1,21 @@
+package com.heima.search.service;
+
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.search.dtos.UserSearchDto;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-14 17:43:58
+ */
+public interface ArticleSearchService {
+
+    /**
+     * 搜索框搜索
+     * @param dto
+     * @return
+     */
+    ResponseResult search(@RequestBody UserSearchDto dto) throws Exception;
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/impl/ApAssociateWordsServiceImpl.java b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/impl/ApAssociateWordsServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b504f22a8b0e9058dd6574d9816db44de4bb2ea
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/impl/ApAssociateWordsServiceImpl.java
@@ -0,0 +1,50 @@
+package com.heima.search.service.impl;
+
+import com.heima.common.exception.CustomException;
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.common.enums.AppHttpCodeEnum;
+import com.heima.model.search.dtos.UserSearchDto;
+import com.heima.search.pojos.ApAssociateWords;
+import com.heima.search.service.ApAssociateWordsService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.regex.Pattern;
+
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-15 17:19:31
+ */
+@Service
+@Slf4j
+public class ApAssociateWordsServiceImpl implements ApAssociateWordsService {
+
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
+    @Override
+    public ResponseResult search(UserSearchDto userSearchDto) {
+        if(userSearchDto == null || StringUtils.isBlank(userSearchDto.getSearchWords())) {
+            throw new CustomException(AppHttpCodeEnum.PARAM_INVALID);
+        }
+        if(userSearchDto.getPageSize() <= 0 || userSearchDto.getPageSize() > 10){
+            userSearchDto.setPageSize(10);
+        }
+        Query query = Query.query(
+                Criteria.where("associateWords")
+                        .regex(Pattern.compile("^.*" + userSearchDto.getSearchWords() + ".*$", Pattern.CASE_INSENSITIVE)))
+                .with(Sort.by(Sort.Direction.DESC, "createdTime"))
+                .limit(userSearchDto.getPageSize());
+        List<ApAssociateWords> apAssociateWordsList = mongoTemplate.find(query, ApAssociateWords.class);
+        return ResponseResult.okResult(apAssociateWordsList);
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/impl/ApUserSearchServiceImpl.java b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/impl/ApUserSearchServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..26575172bd65dfb82fdcf9d46bb6e3c342610431
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/impl/ApUserSearchServiceImpl.java
@@ -0,0 +1,69 @@
+package com.heima.search.service.impl;
+
+import com.heima.search.pojos.ApUserSearch;
+import com.heima.search.service.ApUserSearchService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-15 14:59:33
+ */
+@Service
+@Slf4j
+public class ApUserSearchServiceImpl implements ApUserSearchService {
+
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
+    public static final SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.sss");
+
+
+    @Override
+    @Async
+    public void save(String keyword, Integer userId) {
+        if(StringUtils.isBlank(keyword) || userId == null) {
+            log.error("非法参数");
+            return;
+        }
+        Query query = Query.query(Criteria.where("keyword").is(keyword).and("userId").is(userId));
+        ApUserSearch apUserSearch = mongoTemplate.findOne(query, ApUserSearch.class);
+        if(apUserSearch != null){
+            //apUserSearch.setCreatedTime(SDF.format(new Date()));
+            apUserSearch.setCreatedTime(new Date());
+            //ID相同会覆盖
+            mongoTemplate.save(apUserSearch);
+            return;
+        }
+        //不存在，肯定得保存一条新记录
+        ApUserSearch userSearch = new ApUserSearch();
+        userSearch.setUserId(userId);
+        userSearch.setKeyword(keyword);
+        //userSearch.setCreatedTime(SDF.format(new Date()));
+        userSearch.setCreatedTime(new Date());
+        Query query2 = Query.query(Criteria.where("userId").is(userId))
+                .with(Sort.by(Sort.Direction.DESC, "createdTime"));
+        List<ApUserSearch> apUserSearchList = mongoTemplate.find(query2, ApUserSearch.class);
+        if(apUserSearchList.size() < 10) {
+            //没到10，直接保存
+            mongoTemplate.save(userSearch);
+        } else {
+            //到10条，替换最旧的那条
+            ApUserSearch oldApUserSearch = apUserSearchList.get(apUserSearchList.size() - 1);
+            Query query3 = Query.query(Criteria.where("id").is(oldApUserSearch.getId()));
+            mongoTemplate.findAndReplace(query3, userSearch);
+        }
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/impl/ArticleSearchServiceImpl.java b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/impl/ArticleSearchServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..8e15d8bee574662d7c06bfd92bbd11eceea97b7c
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/service/impl/ArticleSearchServiceImpl.java
@@ -0,0 +1,101 @@
+package com.heima.search.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.search.dtos.UserSearchDto;
+import com.heima.model.search.vos.SearchArticleVo;
+import com.heima.search.service.ApUserSearchService;
+import com.heima.search.service.ArticleSearchService;
+import com.heima.search.utils.AppThreadLocalUtil;
+import io.jsonwebtoken.lang.Collections;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.SearchHit;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.elasticsearch.search.fetch.subphase.highlight.HighlightField;
+import org.elasticsearch.search.sort.SortOrder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-14 17:44:22
+ */
+@Service
+@Slf4j
+public class ArticleSearchServiceImpl implements ArticleSearchService {
+
+    @Autowired
+    private RestHighLevelClient client;
+    @Autowired
+    private ApUserSearchService apUserSearchService;
+
+    @Override
+    public ResponseResult search(UserSearchDto dto) throws Exception {
+        if(StringUtils.isBlank(dto.getSearchWords())){
+            return ResponseResult.okResult(new ArrayList<SearchArticleVo>());
+        }
+        int start = dto.getFromIndex();
+
+        //异步保存用户搜索记录
+        Integer appUserId = AppThreadLocalUtil.getAppUserId();
+        //用户登录后，且第一次搜索新关键词才需要保存搜索记录
+        if(appUserId != null && start == 0){
+            apUserSearchService.save(dto.getSearchWords(), appUserId);
+        }
+
+        SearchRequest request = new SearchRequest("app_info_article");
+        BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
+        //搜索框匹配
+        boolQuery.must(QueryBuilders.multiMatchQuery(dto.getSearchWords(), "title", "content"))
+                //发布时间匹配
+                .filter(QueryBuilders.rangeQuery("publishTime").lt(dto.getMinBehotTime().getTime()));
+        request.source()
+                .query(boolQuery)
+                //排序
+                .sort("publishTime", SortOrder.DESC)
+                //分页
+                .from(start)  //起始文档下标
+                .size(dto.getPageSize())  //页大小
+                //高亮
+                .highlighter(
+                        SearchSourceBuilder.highlight()
+                                .field("title")   //高亮字段
+                                .preTags("<font style='color: red; font-size: inherit;'>")   //前缀
+                                .postTags("</font>")   //后缀
+                                .requireFieldMatch(false)
+                );
+
+        SearchResponse response = client.search(request, RequestOptions.DEFAULT);
+        //获取搜索hits结果
+        SearchHit[] hits = response.getHits().getHits();
+        ArrayList<SearchArticleVo> voList = new ArrayList<>(hits.length);
+        //查询数据
+        for (SearchHit hit : hits) {
+            String json = hit.getSourceAsString();
+            SearchArticleVo vo = JSON.parseObject(json, SearchArticleVo.class);
+            //获取高亮的内容
+            Map<String, HighlightField> map = hit.getHighlightFields();
+            if(!Collections.isEmpty(map)){
+                HighlightField hf = map.get("title");
+                if(hf != null) {
+                    String filedName = hf.getFragments()[0].toString();
+                    //前端已经把高亮字段固定了  h_title
+                    vo.setH_title(filedName);
+                }
+            }
+            voList.add(vo);
+        }
+        return ResponseResult.okResult(voList);
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/utils/AppThreadLocalUtil.java b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/utils/AppThreadLocalUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..182f5c1fa58518db934135c76fac960e74f3c0c3
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/java/com/heima/search/utils/AppThreadLocalUtil.java
@@ -0,0 +1,36 @@
+package com.heima.search.utils;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 11:46:06
+ */
+public class AppThreadLocalUtil {
+
+    public static final ThreadLocal<Integer> THREAD_LOCAL = new ThreadLocal<>();
+
+    /**
+     * 设置APP用户ID到当前线程
+     * @param appUserId
+     */
+    public static void setAppUserId(Integer appUserId){
+        THREAD_LOCAL.set(appUserId);
+    }
+
+    /**
+     * 从当前线程上获取APP用户ID
+     * @return
+     */
+    public static Integer getAppUserId(){
+        return THREAD_LOCAL.get();
+    }
+
+    /**
+     * 从当前线程上移除APP用户ID
+     * @return
+     */
+    public static void removeAppUserId(){
+        THREAD_LOCAL.remove();
+    }
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-search/src/main/resources/bootstrap.yml b/heima-leadnews-service/heima-leadnews-search/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3973320085cb22516202686a44347e3a3dda28b6
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/main/resources/bootstrap.yml
@@ -0,0 +1,12 @@
+server:
+  port: 51804
+spring:
+  application:
+    name: leadnews-search
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.200.130:8848
+      config:
+        server-addr: 192.168.200.130:8848
+        file-extension: yml
diff --git a/heima-leadnews-service/heima-leadnews-search/src/test/java/com/heima/search/service/ApUserSearchServiceTest.java b/heima-leadnews-service/heima-leadnews-search/src/test/java/com/heima/search/service/ApUserSearchServiceTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..af6ebed2f4052c75cec1b8974abd0ede19abd590
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/test/java/com/heima/search/service/ApUserSearchServiceTest.java
@@ -0,0 +1,24 @@
+package com.heima.search.service;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-15 15:14:34
+ */
+@SpringBootTest
+public class ApUserSearchServiceTest {
+
+    @Autowired
+    private ApUserSearchService apUserSearchService;
+
+    @Test
+    public void save() {
+        apUserSearchService.save("测试搜索72",1);
+    }
+}
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-search/src/test/java/com/heima/search/test/ArticleESTest.java b/heima-leadnews-service/heima-leadnews-search/src/test/java/com/heima/search/test/ArticleESTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b9068148891c120e2c73c5f17c8fbc48b2b3479
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-search/src/test/java/com/heima/search/test/ArticleESTest.java
@@ -0,0 +1,18 @@
+package com.heima.search.test;
+
+import com.heima.search.SearchApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@SpringBootTest(classes = SearchApplication.class)
+@RunWith(SpringRunner.class)
+public class ArticleESTest {
+
+    @Test
+    public void importAllTest(){
+
+    }
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-user/pom.xml b/heima-leadnews-service/heima-leadnews-user/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5c5ca4d751f2e4309e5b48715830536ed1a5e965
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-user/pom.xml
@@ -0,0 +1,19 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews-service</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>heima-leadnews-user</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/UserApplication.java b/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/UserApplication.java
new file mode 100644
index 0000000000000000000000000000000000000000..bd69d4303bc62ea390c203bdd3c21c8c129f2d10
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/UserApplication.java
@@ -0,0 +1,13 @@
+package com.heima.user;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+@MapperScan("com.heima.user.mapper")
+public class UserApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(UserApplication.class, args);
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/controller/v1/AjaxController.java b/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/controller/v1/AjaxController.java
new file mode 100644
index 0000000000000000000000000000000000000000..e01fd017d8e3ad7aedc35be930655b43b3999e7e
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/controller/v1/AjaxController.java
@@ -0,0 +1,22 @@
+package com.heima.user.controller.v1;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-05 09:13:38
+ */
+@RestController
+@Slf4j
+public class AjaxController {
+
+    @GetMapping("/ajax")
+    public String testAjax(){
+        System.out.println("testAjax---》");
+        return "Gateway Handle Cross";
+    }
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/controller/v1/ApUserController.java b/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/controller/v1/ApUserController.java
new file mode 100644
index 0000000000000000000000000000000000000000..1aa79ddd9b62de9b746bc352901033255c27d43b
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/controller/v1/ApUserController.java
@@ -0,0 +1,38 @@
+package com.heima.user.controller.v1;
+
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.user.dtos.LoginDto;
+import com.heima.user.service.ApUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-03 11:18:39
+ */
+@RestController
+@RequestMapping("/api/v1/login")
+@Slf4j
+@Api(tags = "用户相关接口")
+public class ApUserController {
+
+    @Autowired
+    private ApUserService apUserService;
+
+    @PostMapping("/login_auth")
+    @ApiOperation("用户登录")
+    public ResponseResult login(@RequestBody LoginDto dto){
+        //1.打印日志
+        log.warn("dto:{}", dto);
+        //2.调用业务
+        return apUserService.login(dto);
+    }
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/mapper/ApUserMapper.java b/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/mapper/ApUserMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..45884063fcf566c761f62a5f2d136a1bc29df22a
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/mapper/ApUserMapper.java
@@ -0,0 +1,14 @@
+package com.heima.user.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.heima.model.user.pojos.ApUser;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-03 11:22:29
+ */
+@Mapper
+public interface ApUserMapper extends BaseMapper<ApUser> {
+}
diff --git a/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/service/ApUserService.java b/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/service/ApUserService.java
new file mode 100644
index 0000000000000000000000000000000000000000..8a2c1287a0e45882784bd01e0d2e986aa2dd899a
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/service/ApUserService.java
@@ -0,0 +1,22 @@
+package com.heima.user.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.user.dtos.LoginDto;
+import com.heima.model.user.pojos.ApUser;
+
+/**
+ * 用户业务接口
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-03 11:23:15
+ */
+public interface ApUserService extends IService<ApUser> {
+
+    /**
+     * 登录
+     * @param dto 手机和密码
+     * @return
+     */
+    ResponseResult login(LoginDto dto);
+}
diff --git a/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/service/impl/ApUserServiceImpl.java b/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/service/impl/ApUserServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..879b13616d924e81d5edd90737c5025ce6e896bf
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-user/src/main/java/com/heima/user/service/impl/ApUserServiceImpl.java
@@ -0,0 +1,63 @@
+package com.heima.user.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.heima.common.exception.CustomException;
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.common.enums.AppHttpCodeEnum;
+import com.heima.model.user.dtos.LoginDto;
+import com.heima.model.user.pojos.ApUser;
+import com.heima.user.mapper.ApUserMapper;
+import com.heima.user.service.ApUserService;
+import com.heima.utils.common.AppJwtUtil;
+import com.heima.utils.common.MD5Utils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-03 11:23:56
+ */
+@Service
+public class ApUserServiceImpl extends ServiceImpl<ApUserMapper, ApUser> implements ApUserService {
+    @Override
+    public ResponseResult login(LoginDto dto) {
+        //一、校验参数
+        if(dto == null) {
+            throw new CustomException(AppHttpCodeEnum.PARAM_INVALID);
+        }
+        //二、处理业务
+        Map<String, Object> data = new HashMap<>();
+        String phone = dto.getPhone();
+        String password = dto.getPassword();
+        // 1.判断是否为登录
+        if(StringUtils.isNotBlank(phone) && StringUtils.isNotBlank(password)) {
+            // 2.通过用户名查询数据库
+            ApUser userDB = this.lambdaQuery().eq(ApUser::getPhone, phone).one();
+            // 3.用户是否存在
+            if(userDB == null) {
+                throw new CustomException(AppHttpCodeEnum.AP_USER_DATA_NOT_EXIST);
+            }
+            // 4.比对密码
+            password = MD5Utils.encodeWithSalt(password, userDB.getSalt());
+            if(!password.equals(userDB.getPassword())) {
+                throw new CustomException(AppHttpCodeEnum.PHONE_OR_PASSWORD_ERROR);
+            }
+            //三、封装数据
+            //成功
+            data.put("token", AppJwtUtil.getToken(userDB.getId().longValue()));
+            //数据脱敏
+            userDB.setPassword("");
+            userDB.setSalt("");
+            data.put("user",userDB);
+            return ResponseResult.okResult(data);
+        }
+        //三、封装数据
+        //不登录，先看看
+        data.put("token", AppJwtUtil.getToken(0L));
+        return ResponseResult.okResult(data);
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-user/src/main/resources/bootstrap.yml b/heima-leadnews-service/heima-leadnews-user/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000000000000000000000000000000000000..520972ade94301753c69ccabdd2d82d601f19a2d
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-user/src/main/resources/bootstrap.yml
@@ -0,0 +1,12 @@
+server:
+  port: 51801
+spring:
+  application:
+    name: leadnews-user
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.200.130:8848
+      config:
+        server-addr: 192.168.200.130:8848
+        file-extension: yml
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-user/src/main/resources/logback.xml b/heima-leadnews-service/heima-leadnews-user/src/main/resources/logback.xml
new file mode 100644
index 0000000000000000000000000000000000000000..199dbed48c7a52066ed75e0e99cb52431420567c
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-user/src/main/resources/logback.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration>
+    <!--定义日志文件的存储地址,使用绝对路径-->
+    <property name="LOG_HOME" value="e:/logs"/>
+
+    <!-- Console 输出设置 -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>utf8</charset>
+        </encoder>
+    </appender>
+
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <fileNamePattern>${LOG_HOME}/leadnews.%d{yyyy-MM-dd}.log</fileNamePattern>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 异步输出 -->
+    <appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
+        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
+        <discardingThreshold>0</discardingThreshold>
+        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
+        <queueSize>512</queueSize>
+        <!-- 添加附加的appender,最多只能添加一个 -->
+        <appender-ref ref="FILE"/>
+    </appender>
+
+
+    <logger name="org.apache.ibatis.cache.decorators.LoggingCache" level="DEBUG" additivity="false">
+        <appender-ref ref="CONSOLE"/>
+    </logger>
+    <logger name="org.springframework.boot" level="debug"/>
+    <root level="info">
+        <!--<appender-ref ref="ASYNC"/>-->
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="CONSOLE"/>
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/pom.xml b/heima-leadnews-service/heima-leadnews-wemedia/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ca6596828876bf716e0e97225925af01c8aba491
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/pom.xml
@@ -0,0 +1,52 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews-service</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>heima-leadnews-wemedia</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.heima</groupId>
+            <artifactId>heima-file-starter</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <!--seata-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+            <version>3.16.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+        <!-- kafkfa -->
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+        </dependency>
+
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/WemediaApplication.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/WemediaApplication.java
new file mode 100644
index 0000000000000000000000000000000000000000..3f09fe23e612955afa80c45f3045a939b222ed91
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/WemediaApplication.java
@@ -0,0 +1,21 @@
+package com.heima.wemedia;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+
+@SpringBootApplication
+@EnableDiscoveryClient
+@MapperScan("com.heima.wemedia.mapper")
+@EnableFeignClients(basePackages = "com.heima.apis.article")
+@EnableAsync  //开启异步执行
+public class WemediaApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(WemediaApplication.class,args);
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/config/InitConfig.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/config/InitConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..189233712ab44e8fcd94262277980ad216a1ae1d
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/config/InitConfig.java
@@ -0,0 +1,14 @@
+package com.heima.wemedia.config;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-09 16:00:48
+ */
+@Configuration
+@ComponentScan(basePackages = "com.heima.apis.article.fallback")
+public class InitConfig {
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/config/MybatisPlusConfiguration.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/config/MybatisPlusConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..975001c30a2002d75accff0b452f4df3f5b4eff3
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/config/MybatisPlusConfiguration.java
@@ -0,0 +1,23 @@
+package com.heima.wemedia.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 16:02:54
+ */
+@Configuration
+public class MybatisPlusConfiguration {
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/config/RabbitConfig.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/config/RabbitConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..3b40ed87d3eb198452ab5e66c6aae15865821059
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/config/RabbitConfig.java
@@ -0,0 +1,40 @@
+package com.heima.wemedia.config;
+
+import org.springframework.amqp.core.Binding;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.amqp.core.Queue;
+import org.springframework.amqp.core.QueueBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-12 15:14:06
+ */
+@Configuration
+public class RabbitConfig {
+
+    @Bean
+    public Queue articlePublishQueue(){
+        return QueueBuilder
+                .durable("article.publish.queue")
+                .deadLetterExchange("article.delay.direct")
+                .deadLetterRoutingKey("article.delay")
+                .build();
+    }
+
+    @Bean
+    public DirectExchange articlePublishDirectExchange(){
+        return new DirectExchange("article.publish.direct.exchange");
+    }
+
+    @Bean
+    public Binding simpleQueueToSimpleDirectExchange(Queue articlePublishQueue, DirectExchange articlePublishDirectExchange){
+        return BindingBuilder.bind(articlePublishQueue)
+                .to(articlePublishDirectExchange)
+                .with("article.delay");
+    }
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/config/TaskPoolConfig.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/config/TaskPoolConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..ab9d4ecbf6d149f72470089e04e3d917f5368559
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/config/TaskPoolConfig.java
@@ -0,0 +1,29 @@
+package com.heima.wemedia.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+@Configuration
+public class TaskPoolConfig {
+    @Bean("wemedia-AsyncExecutor")
+    public Executor asyncExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        // 核心线程池数
+        executor.setCorePoolSize(10);
+		//最大线程池数
+        executor.setMaxPoolSize(20);
+        //任务队列的容量
+        executor.setQueueCapacity(200);
+        // 非核心线程的存活时间
+        executor.setKeepAliveSeconds(60);
+        // 线程池的前缀名称
+        executor.setThreadNamePrefix("wemedia-async-");
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());//调用主线程，让主线程处理
+        executor.initialize();
+        return executor;
+    }
+}
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/config/WebMvcConfig.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/config/WebMvcConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..9600b766d67d450cce1eaab5c097a475fe2e2008
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/config/WebMvcConfig.java
@@ -0,0 +1,27 @@
+package com.heima.wemedia.config;
+
+import com.heima.wemedia.interceptors.WmTokenInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 11:59:14
+ */
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    @Autowired
+    private WmTokenInterceptor wmTokenInterceptor;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(wmTokenInterceptor)
+                .addPathPatterns("/**")
+                .excludePathPatterns("/inner/**")
+                .excludePathPatterns("/login/in");
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/controller/v1/LoginController.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/controller/v1/LoginController.java
new file mode 100644
index 0000000000000000000000000000000000000000..b25e8cae8e06b8a2604162c62d8fcb536e30a125
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/controller/v1/LoginController.java
@@ -0,0 +1,23 @@
+package com.heima.wemedia.controller.v1;
+
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.wemedia.dtos.WmLoginDto;
+import com.heima.wemedia.service.WmUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/login")
+public class LoginController {
+
+    @Autowired
+    private WmUserService wmUserService;
+
+    @PostMapping("/in")
+    public ResponseResult login(@RequestBody WmLoginDto dto){
+        return wmUserService.login(dto);
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/controller/v1/WmChannelController.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/controller/v1/WmChannelController.java
new file mode 100644
index 0000000000000000000000000000000000000000..fec503cc58313a2d00f8f5b8fe71ca121fcd95cb
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/controller/v1/WmChannelController.java
@@ -0,0 +1,30 @@
+package com.heima.wemedia.controller.v1;
+
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.wemedia.service.WmChannelService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-07 15:09:09
+ */
+@RestController
+@RequestMapping("/api/v1/channel")
+@Slf4j
+public class WmChannelController {
+
+    @Autowired
+    private WmChannelService wmChannelService;
+
+    @GetMapping("/channels")
+    public ResponseResult channels(){
+        log.warn("WmChannelController channels");
+        return wmChannelService.findList();
+    }
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/controller/v1/WmMaterialController.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/controller/v1/WmMaterialController.java
new file mode 100644
index 0000000000000000000000000000000000000000..578b93e0b324d65ce3fdd74a187c4fada2ade57d
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/controller/v1/WmMaterialController.java
@@ -0,0 +1,81 @@
+package com.heima.wemedia.controller.v1;
+
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.wemedia.dtos.WmMaterialDto;
+import com.heima.wemedia.service.WmMaterialService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 14:56:10
+ */
+@RestController
+@RequestMapping("/api/v1/material")
+@Slf4j
+public class WmMaterialController {
+
+    @Autowired
+    private WmMaterialService wmMaterialService;
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @GetMapping("/del_picture/{id}")
+    public ResponseResult delPicture(@PathVariable("id") Integer id){
+        return wmMaterialService.delPicture(id);
+    }
+
+    /**
+     * 收藏
+     * @param id
+     * @return
+     */
+    @GetMapping("/collect/{id}")
+    public ResponseResult collect(@PathVariable("id") Integer id){
+        return wmMaterialService.isCollect(id, (short) 1);
+    }
+
+    /**
+     * 取消收藏
+     * @param id
+     * @return
+     */
+    @GetMapping("/cancel_collect/{id}")
+    public ResponseResult cancelCollect(@PathVariable("id") Integer id){
+        return wmMaterialService.isCollect(id, (short) 0);
+    }
+
+    /**
+     * 分页显示素材
+     * @param dto
+     * @return
+     */
+    @PostMapping("/list")
+    public ResponseResult list(@RequestBody WmMaterialDto dto){
+        log.info("dto:{}", dto);
+        return wmMaterialService.findPage(dto);
+    }
+
+    /**
+     * 上传素材
+     * @param multipartFile
+     * @return
+     */
+    @PostMapping("/upload_picture")
+    public ResponseResult uploadPicture(MultipartFile multipartFile){
+        log.info("multipartFile:{}", multipartFile);
+        return wmMaterialService.uploadPicture(multipartFile);
+    }
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/controller/v1/WmNewsController.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/controller/v1/WmNewsController.java
new file mode 100644
index 0000000000000000000000000000000000000000..6515632af0a7d742927fbd0826e28c99977e738b
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/controller/v1/WmNewsController.java
@@ -0,0 +1,75 @@
+package com.heima.wemedia.controller.v1;
+
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.wemedia.dtos.WmNewsDto;
+import com.heima.model.wemedia.dtos.WmNewsEnableDto;
+import com.heima.model.wemedia.dtos.WmNewsPageReqDto;
+import com.heima.wemedia.service.WmNewsService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 17:45:48
+ */
+@RestController
+@RequestMapping("/api/v1/news")
+@Slf4j
+public class WmNewsController {
+
+    @Autowired
+    private WmNewsService wmNewsService;
+
+    /**
+     * 上下架
+     * @param dto
+     * @return
+     */
+    @PostMapping("/down_or_up")
+    public ResponseResult downOrUp(@RequestBody WmNewsEnableDto dto){
+        log.warn("dto:{}", dto);
+        return wmNewsService.downOrUp(dto);
+    }
+
+
+    /**
+     * 编辑回显
+     * @param id
+     * @return
+     */
+    @GetMapping("/one/{id}")
+    public ResponseResult one(@PathVariable("id") Integer id){
+        log.warn("id:{}", id);
+        return ResponseResult.okResult(wmNewsService.getById(id));
+    }
+
+    /**
+     * 文章发布
+     * @param dto
+     * @return
+     */
+    @PostMapping("/submit")
+    public ResponseResult submit(@RequestBody WmNewsDto dto){
+        log.warn("dto:{}", dto);
+        return wmNewsService.submit(dto);
+    }
+
+    /**
+     * 条件分页查询
+     * @param dto
+     * @return
+     */
+    @PostMapping("/list")
+    public ResponseResult list(@RequestBody WmNewsPageReqDto dto){
+        log.warn("dto:{}", dto);
+        return wmNewsService.findPage(dto);
+    }
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/feign/WemediaClient.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/feign/WemediaClient.java
new file mode 100644
index 0000000000000000000000000000000000000000..bee4e10ba38e30dfcb1f3fd2c9b5343d91e72af8
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/feign/WemediaClient.java
@@ -0,0 +1,31 @@
+package com.heima.wemedia.feign;
+
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.wemedia.pojos.WmChannel;
+import com.heima.wemedia.service.WmChannelService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-07 15:09:09
+ */
+@RestController
+@Slf4j
+public class WemediaClient {
+
+    @Autowired
+    private WmChannelService wmChannelService;
+
+    @GetMapping("/inner/api/v1/channel/list")
+    public ResponseResult<List<WmChannel>> channels(){
+        log.warn("WmChannelController list");
+        return ResponseResult.okResult(wmChannelService.list());
+    }
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/interceptors/WmTokenInterceptor.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/interceptors/WmTokenInterceptor.java
new file mode 100644
index 0000000000000000000000000000000000000000..b874f0bdb91af364467e6ebbc66162f406e924e1
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/interceptors/WmTokenInterceptor.java
@@ -0,0 +1,54 @@
+package com.heima.wemedia.interceptors;
+
+import com.heima.wemedia.utils.WmThreadLocalUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 11:44:59
+ */
+@Component
+@Slf4j
+public class WmTokenInterceptor implements HandlerInterceptor {
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        //1.获取请求头
+        String wmUserIdStr = request.getHeader("wmUserId");
+        if(StringUtils.isNotBlank(wmUserIdStr)) {
+            //2.放到ThreadLocal中
+            try {
+                Integer wmUserId = Integer.valueOf(wmUserIdStr);
+                WmThreadLocalUtil.setWmUserId(wmUserId);
+                log.info("wmUserId:{}", wmUserId);
+            } catch (NumberFormatException e) {
+                e.printStackTrace();
+            }
+            return true;
+        }
+        //没有用户ID，就直接拦截
+        response.setContentType("application/json");
+        response.setStatus(HttpStatus.UNAUTHORIZED.value());
+        return false;
+    }
+
+    /**
+     * 释放资源
+     * @param request
+     * @param response
+     * @param handler
+     * @param ex
+     * @throws Exception
+     */
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+        WmThreadLocalUtil.removeWmUserId();
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/listeners/ArticleDelayPublishListener.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/listeners/ArticleDelayPublishListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..b2c0be1e53a5e589b4e2237236a455af529f2530
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/listeners/ArticleDelayPublishListener.java
@@ -0,0 +1,64 @@
+package com.heima.wemedia.listeners;
+
+import com.heima.common.exception.CustomException;
+import com.heima.model.common.enums.AppHttpCodeEnum;
+import com.heima.model.wemedia.pojos.WmNews;
+import com.heima.wemedia.mapper.WmNewsMapper;
+import com.heima.wemedia.service.WmNewsAutoAuditService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.amqp.core.ExchangeTypes;
+import org.springframework.amqp.rabbit.annotation.Exchange;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.QueueBinding;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-12 15:19:49
+ */
+@Component
+@Slf4j
+public class ArticleDelayPublishListener {
+
+    @Autowired
+    private WmNewsMapper wmNewsMapper;
+    @Autowired
+    private WmNewsAutoAuditService wmNewsAutoAuditService;
+
+    /**
+     * 监听文章延迟发布的消息
+     *
+     * @param message
+     */
+    @RabbitListener(bindings = @QueueBinding(
+            value = @Queue(name = "article.delay.queue"),
+            exchange = @Exchange(name = "article.delay.direct", type = ExchangeTypes.DIRECT),
+            key = "article.delay"
+    ))
+    public void handleDeadMessage(String message) {
+        log.warn("收到消息:" + message);
+        if (StringUtils.isNotBlank(message)) {
+            Integer wmNewsId = Integer.valueOf(message);
+            log.warn("发布文章到APP端:{}", wmNewsId);
+            WmNews wmNews = wmNewsMapper.selectById(wmNewsId);
+            if (wmNews == null) {
+                return;
+            }
+            // 5.到了，发布，同步数据到APP端
+            Long articleId = wmNewsAutoAuditService.saveApArticle(wmNews);
+            if (articleId > 0) {
+                wmNews.setArticleId(articleId);
+                wmNews.setStatus(WmNews.Status.PUBLISHED.getCode());
+                wmNewsMapper.updateById(wmNews);
+            } else {
+                log.warn("自媒体微服务：收到文章微服务进入降级了---->");
+                throw new CustomException(AppHttpCodeEnum.AP_ARTICLE_INSERT_FAIL);
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/listeners/DelayPublishWmNewsToAppListener.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/listeners/DelayPublishWmNewsToAppListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..78b205b72b1264c070c772532661c2c679f17113
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/listeners/DelayPublishWmNewsToAppListener.java
@@ -0,0 +1,25 @@
+//package com.heima.wemedia.listeners;
+//
+//import com.heima.wemedia.task.DelayWmNewsIdTask;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//
+//import javax.annotation.PostConstruct;
+//
+///**
+// * @author ghy
+// * @version 1.0.1
+// * @date 2024-07-12 09:25:06
+// */
+//@Component
+//public class DelayPublishWmNewsToAppListener {
+//
+//    @Autowired
+//    private DelayWmNewsIdTask delayWmNewsIdTask;
+//
+//    @PostConstruct  //Bean初始化后就立即执行这个方法
+//    public void run(){
+//        delayWmNewsIdTask.handleMessage();
+//    }
+//
+//}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmChannelMapper.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmChannelMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..f907ae3c977d816c17fcc89f320f3017dad31863
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmChannelMapper.java
@@ -0,0 +1,14 @@
+package com.heima.wemedia.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.heima.model.wemedia.pojos.WmChannel;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-07 15:12:48
+ */
+@Mapper
+public interface WmChannelMapper extends BaseMapper<WmChannel> {
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmMaterialMapper.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmMaterialMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..087285931cfaa75509f18bdb5cb7cdbff04e6a0c
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmMaterialMapper.java
@@ -0,0 +1,14 @@
+package com.heima.wemedia.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.heima.model.wemedia.pojos.WmMaterial;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 14:58:38
+ */
+@Mapper
+public interface WmMaterialMapper extends BaseMapper<WmMaterial> {
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmNewsMapper.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmNewsMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..942be4bd21dc2b8c16988d84e16583c3095b4238
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmNewsMapper.java
@@ -0,0 +1,14 @@
+package com.heima.wemedia.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.heima.model.wemedia.pojos.WmNews;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 17:47:41
+ */
+@Mapper
+public interface WmNewsMapper extends BaseMapper<WmNews> {
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmNewsMaterialMapper.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmNewsMaterialMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..10cfd714039e3d604349af3d7a112824c0e8ee51
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmNewsMaterialMapper.java
@@ -0,0 +1,27 @@
+package com.heima.wemedia.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.heima.model.wemedia.pojos.WmNewsMaterial;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-08 10:32:05
+ */
+@Mapper
+public interface WmNewsMaterialMapper extends BaseMapper<WmNewsMaterial> {
+
+    /**
+     * 批量保存
+     * @param wmMaterialIds
+     * @param wmNewsId
+     * @param type
+     */
+    void saveRelations(@Param("mids") List<Integer> wmMaterialIds,
+                       @Param("newsId") Integer wmNewsId,
+                       @Param("type") Short type);
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmSensitiveMapper.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmSensitiveMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..cd0c965060657ab2286c4f7c877a7822d1f345ba
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmSensitiveMapper.java
@@ -0,0 +1,10 @@
+package com.heima.wemedia.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.heima.model.wemedia.pojos.WmSensitive;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+public interface WmSensitiveMapper extends BaseMapper<WmSensitive> {
+}
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmUserMapper.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmUserMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..bc9e7753954d68cf7ab1a9952708f80aedd6df9b
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/mapper/WmUserMapper.java
@@ -0,0 +1,9 @@
+package com.heima.wemedia.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.heima.model.wemedia.pojos.WmUser;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface WmUserMapper extends BaseMapper<WmUser> {
+}
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/WmChannelService.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/WmChannelService.java
new file mode 100644
index 0000000000000000000000000000000000000000..8fcfa0800c27f182acf314d733fece1ee365999f
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/WmChannelService.java
@@ -0,0 +1,19 @@
+package com.heima.wemedia.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.wemedia.pojos.WmChannel;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-07 15:11:46
+ */
+public interface WmChannelService extends IService<WmChannel> {
+
+    /**
+     * 查询所有频道
+     * @return
+     */
+    ResponseResult findList();
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/WmMaterialService.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/WmMaterialService.java
new file mode 100644
index 0000000000000000000000000000000000000000..c295d5cbb51afff26b58920b14a819aa9d8c9ab3
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/WmMaterialService.java
@@ -0,0 +1,44 @@
+package com.heima.wemedia.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.wemedia.dtos.WmMaterialDto;
+import com.heima.model.wemedia.pojos.WmMaterial;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 14:58:21
+ */
+public interface WmMaterialService extends IService<WmMaterial> {
+
+    /**
+     * 上传素材
+     * @param multipartFile
+     * @return 数据：素材详细信息
+     */
+    ResponseResult uploadPicture(MultipartFile multipartFile);
+
+    /**
+     * 分页条件查询
+     * @param dto
+     * @return
+     */
+    ResponseResult findPage(WmMaterialDto dto);
+
+    /**
+     * 是否收藏
+     * @param id
+     * @param isCollection
+     * @return
+     */
+    ResponseResult isCollect(Integer id, Short isCollection);
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    ResponseResult delPicture(Integer id);
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/WmNewsAutoAuditService.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/WmNewsAutoAuditService.java
new file mode 100644
index 0000000000000000000000000000000000000000..ffa29a0e349ecbd407849305eef3fa813b2ebb61
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/WmNewsAutoAuditService.java
@@ -0,0 +1,23 @@
+package com.heima.wemedia.service;
+
+import com.heima.model.wemedia.pojos.WmNews;
+
+/**
+ * 文章自动审核
+ * @author ghy
+ */
+public interface WmNewsAutoAuditService {
+
+    /**
+     * 自媒体文章审核
+     * @param id  自媒体文章id
+     */
+    void autoAuditWmNews(Integer id);
+
+    /**
+     * 同步文章到APP端
+     * @param wmNews
+     * @return
+     */
+    Long saveApArticle(WmNews wmNews);
+}
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/WmNewsService.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/WmNewsService.java
new file mode 100644
index 0000000000000000000000000000000000000000..4932f291da7e5c96fb4399346b53f86ddd8aa218
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/WmNewsService.java
@@ -0,0 +1,36 @@
+package com.heima.wemedia.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.wemedia.dtos.WmNewsDto;
+import com.heima.model.wemedia.dtos.WmNewsEnableDto;
+import com.heima.model.wemedia.dtos.WmNewsPageReqDto;
+import com.heima.model.wemedia.pojos.WmNews;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 17:47:14
+ */
+public interface WmNewsService extends IService<WmNews> {
+    /**
+     * 分页条件查询
+     * @param dto
+     * @return
+     */
+    ResponseResult findPage(WmNewsPageReqDto dto);
+
+    /**
+     * 文章发布
+     * @param dto
+     * @return
+     */
+    ResponseResult submit(WmNewsDto dto);
+
+    /**
+     * 上下架
+     * @param dto
+     * @return
+     */
+    ResponseResult downOrUp(WmNewsEnableDto dto);
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/WmUserService.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/WmUserService.java
new file mode 100644
index 0000000000000000000000000000000000000000..0e73a858bf8f93d15c6025b8698b7fc5eee47405
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/WmUserService.java
@@ -0,0 +1,17 @@
+package com.heima.wemedia.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.wemedia.dtos.WmLoginDto;
+import com.heima.model.wemedia.pojos.WmUser;
+
+public interface WmUserService extends IService<WmUser> {
+
+    /**
+     * 自媒体端登录
+     * @param dto
+     * @return
+     */
+    public ResponseResult login(WmLoginDto dto);
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/impl/WmChannelServiceImpl.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/impl/WmChannelServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..8a47d32a1824d987e8276e78da8923e42e65b9a5
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/impl/WmChannelServiceImpl.java
@@ -0,0 +1,28 @@
+package com.heima.wemedia.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.wemedia.pojos.WmChannel;
+import com.heima.wemedia.mapper.WmChannelMapper;
+import com.heima.wemedia.service.WmChannelService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-07 15:12:21
+ */
+@Service
+@Slf4j
+public class WmChannelServiceImpl extends ServiceImpl<WmChannelMapper, WmChannel> implements WmChannelService {
+    @Override
+    public ResponseResult findList() {
+        List<WmChannel> channels = this.lambdaQuery()
+                .orderByDesc(WmChannel::getOrd)
+                .list();
+        return ResponseResult.okResult(channels);
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/impl/WmMaterialServiceImpl.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/impl/WmMaterialServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..cad7debc4fc35b7a0d9997caa4e32bae447a4d93
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/impl/WmMaterialServiceImpl.java
@@ -0,0 +1,130 @@
+package com.heima.wemedia.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.heima.common.exception.CustomException;
+import com.heima.file.service.FileStorageService;
+import com.heima.model.common.dtos.PageResponseResult;
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.common.enums.AppHttpCodeEnum;
+import com.heima.model.wemedia.dtos.WmMaterialDto;
+import com.heima.model.wemedia.pojos.WmMaterial;
+import com.heima.wemedia.mapper.WmMaterialMapper;
+import com.heima.wemedia.service.WmMaterialService;
+import com.heima.wemedia.utils.WmThreadLocalUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 14:59:55
+ */
+@Service
+@Slf4j
+public class WmMaterialServiceImpl extends ServiceImpl<WmMaterialMapper, WmMaterial> implements WmMaterialService {
+
+    @Autowired
+    private FileStorageService fileStorageService;
+
+    @Override
+    public ResponseResult uploadPicture(MultipartFile multipartFile) {
+        // 一.校验参数
+        if(multipartFile == null || multipartFile.getSize() == 0) {
+            throw new CustomException(AppHttpCodeEnum.PARAM_INVALID);
+        }
+        // 二.处理业务
+        // 1.文件重命名
+        String filename = multipartFile.getOriginalFilename();
+        String suffix = filename.substring(filename.lastIndexOf("."));//.jpg
+        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+        filename = uuid.concat(suffix);
+        // 2.上传
+        String path = null;
+        try {
+            path = fileStorageService.uploadImgFile("", filename, multipartFile.getInputStream());
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new CustomException(AppHttpCodeEnum.FILE_UPLOAD_ERROR);
+        }
+        // 三.封装数据
+        Integer wmUserId = WmThreadLocalUtil.getWmUserId();
+        WmMaterial wmMaterial = new WmMaterial();
+        wmMaterial.setUserId(wmUserId);
+        wmMaterial.setUrl(path);
+        wmMaterial.setType((short)0);
+        wmMaterial.setIsCollection((short) 0);
+        wmMaterial.setCreatedTime(new Date());
+        boolean flag = save(wmMaterial);
+        if(!flag) {
+            throw new CustomException(AppHttpCodeEnum.INSERT_FAIL);
+        }
+        return ResponseResult.okResult(wmMaterial);
+    }
+
+    @Override
+    public ResponseResult findPage(WmMaterialDto dto) {
+        // 一.校验参数
+        if(dto == null) {
+            throw new CustomException(AppHttpCodeEnum.PARAM_INVALID);
+        }
+        //分页参数校验
+        dto.checkParam();
+        Integer wmUserId = WmThreadLocalUtil.getWmUserId();
+        if(wmUserId == null) {
+            throw new CustomException(AppHttpCodeEnum.NEED_LOGIN);
+        }
+        // 二.处理业务
+        // 分页
+        IPage<WmMaterial> page = new Page<>(dto.getPage(), dto.getSize());
+        // 组装条件
+        Short isCollection = dto.getIsCollection();
+        this.lambdaQuery()
+                .eq(isCollection != null && isCollection == 1, WmMaterial::getIsCollection, isCollection)
+                .eq(WmMaterial::getUserId, wmUserId)
+                .orderByDesc(WmMaterial::getCreatedTime)  // 排序
+                .page(page);
+        // 三.封装数据
+        PageResponseResult pageResponseResult = new PageResponseResult(dto.getPage(), dto.getSize(), (int) page.getTotal());
+        pageResponseResult.setData(page.getRecords());
+        return pageResponseResult;
+    }
+
+    @Override
+    public ResponseResult isCollect(Integer id, Short isCollection) {
+        if(id == null || (isCollection != 0 && isCollection != 1)) {
+            throw new CustomException(AppHttpCodeEnum.PARAM_INVALID);
+        }
+        boolean flag = this.lambdaUpdate()
+                .set(WmMaterial::getIsCollection, isCollection)   // set is_collcetion = ?
+                .eq(WmMaterial::getId, id)  //where id = ?
+                .update();
+        if(!flag) {
+            throw new CustomException(AppHttpCodeEnum.UPDATE_FAIL);
+        }
+        return ResponseResult.okResult(AppHttpCodeEnum.SUCCESS);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseResult delPicture(Integer id) {
+        WmMaterial wmMaterial = this.getById(id);
+        if(wmMaterial == null) {
+            throw new CustomException(AppHttpCodeEnum.WM_MATERIAL_DATA_NOT_EXIST);
+        }
+        fileStorageService.delete(wmMaterial.getUrl());  //NPE: NullPointException
+        boolean flag = this.removeById(id);
+        if(!flag) {
+            throw new CustomException(AppHttpCodeEnum.DELETE_FAIL);
+        }
+        return ResponseResult.okResult(AppHttpCodeEnum.SUCCESS);
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/impl/WmNewsAutoAuditServiceImpl.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/impl/WmNewsAutoAuditServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..4a5950a0ee2c657dab45a6d0169519ed8569f656
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/impl/WmNewsAutoAuditServiceImpl.java
@@ -0,0 +1,325 @@
+package com.heima.wemedia.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.heima.apis.article.IArticleClient;
+import com.heima.common.aliyun.GreenImageScan;
+import com.heima.common.aliyun.GreenTextScan;
+import com.heima.common.constants.WemediaConstants;
+import com.heima.common.exception.CustomException;
+import com.heima.common.tess4j.Tess4jClient;
+import com.heima.file.service.FileStorageService;
+import com.heima.model.article.dtos.ArticleDto;
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.common.enums.AppHttpCodeEnum;
+import com.heima.model.wemedia.dtos.ContentDto;
+import com.heima.model.wemedia.dtos.ContentImagesDto;
+import com.heima.model.wemedia.pojos.WmChannel;
+import com.heima.model.wemedia.pojos.WmNews;
+import com.heima.model.wemedia.pojos.WmSensitive;
+import com.heima.model.wemedia.pojos.WmUser;
+import com.heima.utils.common.SensitiveWordUtil;
+import com.heima.wemedia.mapper.WmChannelMapper;
+import com.heima.wemedia.mapper.WmNewsMapper;
+import com.heima.wemedia.mapper.WmSensitiveMapper;
+import com.heima.wemedia.mapper.WmUserMapper;
+import com.heima.wemedia.service.WmNewsAutoAuditService;
+import io.seata.spring.annotation.GlobalTransactional;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.redisson.api.RedissonClient;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.core.MessageBuilder;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-09 08:49:49
+ */
+@Service
+@Slf4j
+public class WmNewsAutoAuditServiceImpl implements WmNewsAutoAuditService {
+
+    @Autowired
+    private WmNewsMapper wmNewsMapper;
+    @Autowired
+    private WmUserMapper wmUserMapper;
+    @Autowired
+    private WmChannelMapper wmChannelMapper;
+    @Autowired
+    private WmSensitiveMapper wmSensitiveMapper;
+    @Autowired
+    private GreenTextScan greenTextScan;
+    @Autowired
+    private GreenImageScan greenImageScan;
+    @Autowired
+    private FileStorageService fileStorageService;
+    @Autowired
+    private IArticleClient articleClient;
+    @Autowired
+    private Tess4jClient tess4jClient;
+    @Autowired
+    private RedissonClient redissonClient;
+    @Autowired
+    private AmqpTemplate amqpTemplate;
+
+    @Override
+    //@Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional   //表示全局事务的入口
+    @Async   //该方法异步执行
+    public void autoAuditWmNews(Integer id) {
+        try {
+            log.warn("自动审核当前线程:{}", Thread.currentThread().getName());
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        log.warn("ID为{}文章自动审核开始了", id );
+        // 1.查询自媒体文章
+        WmNews wmNews = wmNewsMapper.selectById(id);
+        if(wmNews == null) {
+            throw new CustomException(AppHttpCodeEnum.WM_NEWS_DATA_NOT_EXIST);
+        }
+        if(WmNews.Status.SUBMIT.getCode() != wmNews.getStatus()) {
+            //状态不是待审核
+            throw new CustomException(AppHttpCodeEnum.WM_NEWS_STATUS_NOT_SUBMIT);
+        }
+        // 2.提取文本与图片
+        ContentImagesDto contentImagesDto = getTextAndImages(wmNews);
+        //敏感词过滤
+        boolean flag = sensitiveFilter(contentImagesDto.getContent(), wmNews);
+        //审核结果， true:成功   false:失败
+        if(!flag) {
+            return;
+        }
+        //TODO 将来要用，松开就好=======================
+        // 3. 审核文本【内容文本、标题、标签】 审核不成功，则更新WmNews
+        flag = auditText(contentImagesDto.getContent(), wmNews);
+        //审核结果， true:成功   false:失败
+        if(!flag) {
+            return;
+        }
+        // 4.审核图片【封面、内容图片】
+        flag = auditImages(contentImagesDto.getImages(), wmNews);
+        //审核结果， true:成功   false:失败
+        if(!flag) {
+            return;
+        }
+        //========================
+        // 5.判断是否到达发布时间
+        if(wmNews.getPublishTime().getTime() < System.currentTimeMillis()) {
+            // 5.到了，发布，同步数据到APP端
+            Long articleId = saveApArticle(wmNews);
+            //制造异常：演示分布式事务问题
+            //int i = 1/0;
+            if(articleId > 0){
+                wmNews.setArticleId(articleId);
+                updateWmNews(wmNews, WmNews.Status.PUBLISHED.getCode(), "");
+            } else {
+                log.warn("自媒体微服务：收到文章微服务进入降级了---->");
+                throw new CustomException(AppHttpCodeEnum.AP_ARTICLE_INSERT_FAIL);
+            }
+        } else {
+            // 6.没到，修改wm_news表数据  状态：审核通过    理由：审核通过
+            updateWmNews(wmNews, WmNews.Status.SUCCESS.getCode(), "审核通过");
+           /* //使用Redisson实现延迟队列
+            //向延迟队列中增加一个任务
+            RBlockingDeque<Integer> blockingDeque = redissonClient.getBlockingDeque("article-deque");
+            RDelayedQueue<Integer> delayedQueue = redissonClient.getDelayedQueue(blockingDeque);
+            long time = wmNews.getPublishTime().getTime() - System.currentTimeMillis();
+            delayedQueue.offer(wmNews.getId(), time, TimeUnit.MILLISECONDS);
+            */
+            //使用RabbitMQ的死信队列+TTL实现延迟发布文章
+            long time = wmNews.getPublishTime().getTime() - System.currentTimeMillis();
+            Message message = MessageBuilder
+                    .withBody(wmNews.getId().toString().getBytes(StandardCharsets.UTF_8))
+                    .setExpiration(time + "")
+                    .build();
+            amqpTemplate.convertAndSend("article.publish.direct.exchange", "article.delay", message);
+        }
+    }
+
+    /**
+     * 敏感词过滤
+     */
+    private boolean sensitiveFilter(String content, WmNews wmNews) {
+        //1、初始化Map
+        List<WmSensitive> wmSensitives = wmSensitiveMapper.selectList(null);
+        Set<String> words = wmSensitives.stream().map(WmSensitive::getSensitives).collect(Collectors.toSet());
+        SensitiveWordUtil.initMap(words);
+        //2、过滤
+        Map<String, Integer> map = SensitiveWordUtil.matchWords(content);
+        if(map.size() > 0) {
+            //3、返回结果
+            log.warn("文章中有敏感词:{}", map);
+            updateWmNews(wmNews,WmNews.Status.FAIL.getCode(),map.toString());
+            return false;
+        }
+        //3、返回结果
+        return true;
+    }
+
+    /**
+     * 通过OpenFeign去远程调用APP端保存文章的业务
+     * @param wmNews
+     * @return
+     */
+    @Override
+    public Long saveApArticle(WmNews wmNews) {
+        //1.补全实体
+        ArticleDto dto = new ArticleDto();
+        BeanUtils.copyProperties(wmNews, dto, "id");
+        dto.setContent(wmNews.getContent());
+        Integer userId = wmNews.getUserId();
+        WmUser wmUser = wmUserMapper.selectById(userId);
+        if(wmUser != null) {
+            dto.setAuthorId(userId.longValue());
+            dto.setAuthorName(wmUser.getName());
+        }
+        WmChannel wmChannel = wmChannelMapper.selectById(dto.getChannelId());
+        if(wmChannel != null) {
+            dto.setChannelName(wmChannel.getName());
+        }
+        dto.setLayout(wmNews.getType());
+        dto.setFlag((byte) 0);
+        //2.远程调用
+        ResponseResult responseResult = articleClient.saveApArticle(dto);
+        if(responseResult.getCode().equals(200)){
+            return (Long) responseResult.getData();
+        } else {
+            log.warn("文章自动审核，远程调用APP端保存文章信息，出异常了:{}",responseResult.getErrorMessage());
+            throw new CustomException(AppHttpCodeEnum.AP_ARTICLE_INSERT_FAIL);
+        }
+    }
+
+    private boolean auditImages(List<String> images, WmNews wmNews) {
+        boolean flag = true;  //审核通过
+        try {
+            //去重
+            images = images.stream().distinct().collect(Collectors.toList());
+            if(images == null || images.size() == 0){
+                return flag;
+            }
+            List<byte[]> imageBytes = new ArrayList<>(images.size());
+            for (String url : images) {
+                byte[] bytes = fileStorageService.downLoadFile(url);
+                imageBytes.add(bytes);
+                //提取图片中文字，进行过滤
+                //把字节数组转成流对象
+                BufferedImage image = ImageIO.read(new ByteArrayInputStream(bytes));
+                String text = tess4jClient.doOCR(image);
+                flag = sensitiveFilter(text, wmNews);
+                //审核结果， true:成功   false:失败
+                return flag;
+            }
+            //审核
+            /*Map map = greenImageScan.imageScan(imageBytes);
+            String suggestion = map.get("suggestion").toString();
+            if(AliyunAuditResultConstants.BLOCK.equals(suggestion)) {
+                flag = false;
+                updateWmNews(wmNews, WmNews.Status.FAIL.getCode(), AliyunAuditResultConstants.BLOCK_MESSAGE + ":" + map.get("label"));
+            } else if(AliyunAuditResultConstants.REVIEW.equals(suggestion)) {
+                flag = false;
+                updateWmNews(wmNews, WmNews.Status.ADMIN_AUTH.getCode(), AliyunAuditResultConstants.REVIEW_MESSAGE + ":" + map.get("label"));
+            }*/
+        } catch (Exception e) {
+            e.printStackTrace();
+            updateWmNews(wmNews, WmNews.Status.FAIL.getCode(), AppHttpCodeEnum.IMAGE_AUDIT_EX.getErrorMessage());
+            throw new CustomException(AppHttpCodeEnum.TEXT_AUDIT_EX);
+        }
+        return flag;
+    }
+
+    /**
+     * 审核文本
+     * @param content
+     * @param wmNews
+     * @return
+     */
+    private boolean auditText(String content, WmNews wmNews) {
+        boolean flag = true;  //审核通过
+        /*try {
+            Map map = greenTextScan.greenTextScan(content);
+            String suggestion = map.get("suggestion").toString();
+            if(AliyunAuditResultConstants.BLOCK.equals(suggestion)) {
+                flag = false;
+                updateWmNews(wmNews, WmNews.Status.FAIL.getCode(), AliyunAuditResultConstants.BLOCK_MESSAGE + ":" + map.get("label"));
+            } else if(AliyunAuditResultConstants.REVIEW.equals(suggestion)) {
+                flag = false;
+                updateWmNews(wmNews, WmNews.Status.ADMIN_AUTH.getCode(), AliyunAuditResultConstants.REVIEW_MESSAGE + ":" + map.get("label"));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            updateWmNews(wmNews, WmNews.Status.FAIL.getCode(), AppHttpCodeEnum.TEXT_AUDIT_EX.getErrorMessage());
+            throw new CustomException(AppHttpCodeEnum.TEXT_AUDIT_EX);
+        }*/
+        return flag;
+    }
+
+    /**
+     * 更新文章的状态及审核结果信息
+     * @param wmNews
+     * @param status
+     * @param reason
+     */
+    private void updateWmNews(WmNews wmNews, short status, String reason) {
+        wmNews.setStatus(status);
+        wmNews.setReason(reason);
+        int row = wmNewsMapper.updateById(wmNews);
+        if(row <= 0){
+            throw new CustomException(AppHttpCodeEnum.UPDATE_FAIL);
+        }
+    }
+
+    /**
+     * 提取文章的文本与内容
+     * @param wmNews  文本：标题、标签、内容   图片：封面、内容
+     * @return
+     */
+    private ContentImagesDto getTextAndImages(WmNews wmNews) {
+        //放图片
+        List<String> images = new ArrayList<>();
+        //放文本
+        StringBuffer text = new StringBuffer("");
+        //获取内容中的图片与文本
+        String content = wmNews.getContent();
+        if(StringUtils.isNotBlank(content)) {
+            List<ContentDto> contentDtoList = JSON.parseArray(content, ContentDto.class);
+            for (ContentDto contentDto : contentDtoList) {
+                if (WemediaConstants.WM_NEWS_TYPE_IMAGE.equals(contentDto.getType())) {
+                    //把提取到的内容图片放到集合中
+                    images.add(contentDto.getValue());
+                } else {
+                    text.append(contentDto.getValue()).append(" - ");
+                }
+            }
+        }
+        //其他文本
+        text.append(wmNews.getTitle()).append(" - ").append(wmNews.getLabels());
+        //封面图片
+        if(StringUtils.isNotBlank(wmNews.getImages())){
+            String[] coverImageArray = wmNews.getImages().split(",");
+            images.addAll(Arrays.asList(coverImageArray));
+        }
+        ContentImagesDto dto = new ContentImagesDto();
+        dto.setImages(images);
+        dto.setContent(text.toString());
+        return dto;
+    }
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/impl/WmNewsServiceImpl.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/impl/WmNewsServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..aa5e346952300234caac3ef71a159eb82afeb88f
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/impl/WmNewsServiceImpl.java
@@ -0,0 +1,233 @@
+package com.heima.wemedia.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.heima.common.constants.WemediaConstants;
+import com.heima.common.constants.WmNewsMessageConstants;
+import com.heima.common.exception.CustomException;
+import com.heima.model.common.dtos.PageResponseResult;
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.common.enums.AppHttpCodeEnum;
+import com.heima.model.wemedia.dtos.ContentDto;
+import com.heima.model.wemedia.dtos.WmNewsDto;
+import com.heima.model.wemedia.dtos.WmNewsEnableDto;
+import com.heima.model.wemedia.dtos.WmNewsPageReqDto;
+import com.heima.model.wemedia.pojos.WmMaterial;
+import com.heima.model.wemedia.pojos.WmNews;
+import com.heima.model.wemedia.pojos.WmNewsMaterial;
+import com.heima.wemedia.mapper.WmMaterialMapper;
+import com.heima.wemedia.mapper.WmNewsMapper;
+import com.heima.wemedia.mapper.WmNewsMaterialMapper;
+import com.heima.wemedia.service.WmNewsAutoAuditService;
+import com.heima.wemedia.service.WmNewsService;
+import com.heima.wemedia.utils.WmThreadLocalUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 17:48:19
+ */
+@Service
+@Slf4j
+public class WmNewsServiceImpl extends ServiceImpl<WmNewsMapper, WmNews> implements WmNewsService {
+
+    @Autowired
+    private WmNewsMaterialMapper wmNewsMaterialMapper;
+    @Autowired
+    private WmMaterialMapper wmMaterialMapper;
+    @Autowired
+    private WmNewsAutoAuditService wmNewsAutoAuditService;
+    @Autowired
+    private KafkaTemplate<String, String> kafkaTemplate;
+
+    @Override
+    public ResponseResult findPage(WmNewsPageReqDto dto) {
+        // 一.校验参数
+        if(dto == null) {
+            throw new CustomException(AppHttpCodeEnum.PARAM_INVALID);
+        }
+        dto.checkParam();
+        // 二.处理业务
+        // 分页
+        IPage<WmNews> page = new Page<>(dto.getPage(), dto.getSize());
+        // 条件
+        Short status = dto.getStatus();
+        Date begin = dto.getBeginPubDate();
+        Date end = dto.getEndPubDate();
+        Integer channelId = dto.getChannelId();
+        String keyword = dto.getKeyword();
+        this.lambdaQuery()
+                .eq(status != null, WmNews::getStatus, status)
+                .between(begin != null && end != null, WmNews::getPublishTime, begin, end)
+                .eq(channelId != null, WmNews::getChannelId, channelId)
+                .like(StringUtils.isNotBlank(keyword), WmNews::getTitle, keyword)
+                .eq(WmNews::getUserId, WmThreadLocalUtil.getWmUserId())
+                .orderByDesc(WmNews::getCreatedTime)
+                .page(page);
+        // 三.封装数据
+        PageResponseResult pageResponseResult = new PageResponseResult(dto.getPage(), dto.getSize(), (int) page.getTotal());
+        pageResponseResult.setData(page.getRecords());
+        return pageResponseResult;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseResult submit(WmNewsDto dto) {
+        log.warn("文章发布当前线程:{}", Thread.currentThread().getName());
+        // 一.校验参数
+        if(dto == null) {
+            throw new CustomException(AppHttpCodeEnum.PARAM_INVALID);
+        }
+        // 二.处理业务
+        if (dto.getId() != null) {
+            //1、删除文章与素材的关联关系
+            deleteRelations(dto.getId());
+        }
+        //2、保存或更新文章
+        WmNews wmNews = createWmNews(dto);
+        boolean flag = saveOrUpdate(wmNews);
+        if(!flag) {
+            throw new CustomException(AppHttpCodeEnum.NEWS_PUBLISHED_FAILED);
+        }
+        //3、判断是否为草稿
+        if(WemediaConstants.WM_NEWS_STATUS_DRAFT.equals(dto.getStatus())){
+            //是草稿
+            return ResponseResult.okResult(AppHttpCodeEnum.SUCCESS);
+        }
+        //4、保存文章内容、封面与素材的关联关系
+        //保存文章内容图片与素材的关联关系：插入数据到中间表
+        List<String> contentImageUrls = getImageUrlsFromContent(dto.getContent());
+        saveRelations(contentImageUrls, wmNews.getId(), WemediaConstants.WM_CONTENT_REFERENCE);
+        //保存文章封面图片与素材的关联关系
+        List<String> coverImageUrls = dto.getImages();
+        saveRelations(coverImageUrls, wmNews.getId(), WemediaConstants.WM_COVER_REFERENCE);
+
+        //文章发布成功后，文章自动审核
+        wmNewsAutoAuditService.autoAuditWmNews(wmNews.getId());
+        // 三.封装数据
+        return ResponseResult.okResult(AppHttpCodeEnum.SUCCESS);
+    }
+
+    @Override
+    public ResponseResult downOrUp(WmNewsEnableDto dto) {
+        if(dto == null
+            || dto.getId() == null
+            || dto.getEnable() == null
+            || (dto.getEnable() != 1 && dto.getEnable() != 0)) {
+            throw new CustomException(AppHttpCodeEnum.PARAM_INVALID);
+        }
+        WmNews wmNews = this.getById(dto.getId());
+        if(wmNews == null) {
+            throw new CustomException(AppHttpCodeEnum.WM_NEWS_DATA_NOT_EXIST);
+        }
+        if(!wmNews.getStatus().equals(WmNews.Status.PUBLISHED.getCode())){
+            throw new CustomException(AppHttpCodeEnum.WM_NEWS_STATUS_NOT_PUBLISH);
+        }
+        //更新文章状态
+        wmNews.setEnable(dto.getEnable());
+        updateById(wmNews);
+        //发送消息给Kafka
+        dto.setId(wmNews.getArticleId());
+        String json = JSON.toJSONString(dto);
+        kafkaTemplate.send(WmNewsMessageConstants.WM_NEWS_UP_OR_DOWN_TOPIC, json);
+        return ResponseResult.okResult(AppHttpCodeEnum.SUCCESS);
+    }
+
+    /**
+     * 保存文章与素材的关联关系
+     * @param imageUrls
+     * @param wmNewsId
+     * @param type
+     */
+    private void saveRelations(List<String> imageUrls, Integer wmNewsId, Short type) {
+        if(CollectionUtils.isNotEmpty(imageUrls)) {
+            List<WmMaterial> wmMaterialList = wmMaterialMapper.selectList(
+                    Wrappers.<WmMaterial>lambdaQuery()
+                            .in(WmMaterial::getUrl, imageUrls)
+            );
+            List<Integer> wmMaterialIds = wmMaterialList.stream().map(WmMaterial::getId).collect(Collectors.toList());
+            wmNewsMaterialMapper.saveRelations(wmMaterialIds, wmNewsId, type);
+        }
+    }
+
+    /**
+     * 根据DTO封装文章实体
+     * @param dto
+     * @return
+     */
+    private WmNews createWmNews(WmNewsDto dto) {
+        WmNews wmNews = new WmNews();
+        BeanUtils.copyProperties(dto,wmNews);
+        //补全实体
+        wmNews.setUserId(WmThreadLocalUtil.getWmUserId());
+        wmNews.setCreatedTime(new Date());
+        wmNews.setSubmitedTime(new Date());
+        List<String> images = dto.getImages();  //如果是自动  []
+        if (WemediaConstants.WM_NEWS_TYPE_AUTO.equals(dto.getType())) {
+            //type==-1,images就是一个[]
+            images = getImageUrlsFromContent(dto.getContent());  //从内容中提取的图片集合一定不是null
+            if(images.size() >= WemediaConstants.WM_NEWS_MANY_IMAGE) {
+                //当图片 >=3，选择3图。选择前3张作为封面图片
+                images = images.stream().limit(3).collect(Collectors.toList());
+                wmNews.setType(WemediaConstants.WM_NEWS_MANY_IMAGE);
+            } else if(images.size() == WemediaConstants.WM_NEWS_NONE_IMAGE){
+                //当图片 ==0，选择无图
+                wmNews.setType(WemediaConstants.WM_NEWS_NONE_IMAGE);
+            } else {
+                //否则，选择单图，选择第1张作为封面图片
+                images = images.stream().limit(1).collect(Collectors.toList());
+                wmNews.setType(WemediaConstants.WM_NEWS_SINGLE_IMAGE);
+            }
+            //布局选择自动，需要把内容中的图片设置成封面图片
+            dto.setImages(images);
+        }
+        //StringUtils.join(集合, ",")  //把集合转成字符串，以逗号分隔
+        wmNews.setImages(StringUtils.join(images, ","));
+        return wmNews;
+    }
+
+    /**
+     * 从文章内容中提取图片
+     * @param content 内容
+     * @return 返回一个非空集合  ["http://192.168.200.130/leadnews/2024/07/08/1.jpg", ""]
+     */
+    private List<String> getImageUrlsFromContent(String content) {
+        if(StringUtils.isNotBlank(content)) {
+            List<ContentDto> contentDtoList = JSON.parseArray(content, ContentDto.class);
+            return contentDtoList.stream()
+                    //过滤的是type="image"的对象数据
+                    .filter(v -> WemediaConstants.WM_NEWS_TYPE_IMAGE.equals(v.getType()))
+                    //再加工：得到value
+                    .map(ContentDto::getValue)
+                    .collect(Collectors.toList());
+        }
+        return new ArrayList<>();
+    }
+
+    /**
+     * 根据文章ID删除素材关系
+     * @param wmNewsId
+     */
+    private void deleteRelations(Integer wmNewsId) {
+        wmNewsMaterialMapper.delete(
+                Wrappers.<WmNewsMaterial>lambdaQuery()
+                        .eq(WmNewsMaterial::getNewsId, wmNewsId)
+        );
+    }
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/impl/WmUserServiceImpl.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/impl/WmUserServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..0f164e31bdda1d24db91c6b41ff8f4bae4f9c949
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/service/impl/WmUserServiceImpl.java
@@ -0,0 +1,51 @@
+package com.heima.wemedia.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.heima.model.common.dtos.ResponseResult;
+import com.heima.model.common.enums.AppHttpCodeEnum;
+import com.heima.model.wemedia.dtos.WmLoginDto;
+import com.heima.model.wemedia.pojos.WmUser;
+import com.heima.utils.common.AppJwtUtil;
+import com.heima.wemedia.mapper.WmUserMapper;
+import com.heima.wemedia.service.WmUserService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.DigestUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class WmUserServiceImpl extends ServiceImpl<WmUserMapper, WmUser> implements WmUserService {
+
+    @Override
+    public ResponseResult login(WmLoginDto dto) {
+        //1.检查参数
+        if(StringUtils.isBlank(dto.getName()) || StringUtils.isBlank(dto.getPassword())){
+            return ResponseResult.errorResult(AppHttpCodeEnum.PARAM_INVALID,"用户名或密码为空");
+        }
+
+        //2.查询用户
+        WmUser wmUser = getOne(Wrappers.<WmUser>lambdaQuery().eq(WmUser::getName, dto.getName()));
+        if(wmUser == null){
+            return ResponseResult.errorResult(AppHttpCodeEnum.DATA_NOT_EXIST);
+        }
+
+        //3.比对密码
+        String salt = wmUser.getSalt();
+        String pswd = dto.getPassword();
+        pswd = DigestUtils.md5DigestAsHex((pswd + salt).getBytes());
+        if(pswd.equals(wmUser.getPassword())){
+            //4.返回数据  jwt
+            Map<String,Object> map  = new HashMap<>();
+            map.put("token", AppJwtUtil.getToken(wmUser.getId().longValue()));
+            wmUser.setSalt("");
+            wmUser.setPassword("");
+            map.put("user",wmUser);
+            return ResponseResult.okResult(map);
+        }else {
+            return ResponseResult.errorResult(AppHttpCodeEnum.LOGIN_PASSWORD_ERROR);
+        }
+    }
+}
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/task/DelayWmNewsIdTask.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/task/DelayWmNewsIdTask.java
new file mode 100644
index 0000000000000000000000000000000000000000..87a8de48c0c59b96a865c40b9ac67f9b23fd7d51
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/task/DelayWmNewsIdTask.java
@@ -0,0 +1,67 @@
+//package com.heima.wemedia.task;
+//
+//import com.heima.common.exception.CustomException;
+//import com.heima.model.common.enums.AppHttpCodeEnum;
+//import com.heima.model.wemedia.pojos.WmNews;
+//import com.heima.wemedia.mapper.WmNewsMapper;
+//import com.heima.wemedia.service.WmNewsAutoAuditService;
+//import lombok.extern.slf4j.Slf4j;
+//import org.redisson.api.RBlockingDeque;
+//import org.redisson.api.RedissonClient;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.scheduling.annotation.Async;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.concurrent.TimeUnit;
+//
+///**
+// * @author ghy
+// * @version 1.0.1
+// * @date 2024-07-12 09:20:32
+// */
+//@Component
+//@Slf4j
+//public class DelayWmNewsIdTask {
+//
+//    @Autowired
+//    private RedissonClient redissonClient;
+//    @Autowired
+//    private WmNewsMapper wmNewsMapper;
+//    @Autowired
+//    private WmNewsAutoAuditService wmNewsAutoAuditService;
+//    @Async
+//    //@GlobalTransactional
+//    public void handleMessage(){
+//        RBlockingDeque<Integer> blockingDeque = redissonClient.getBlockingDeque("article-deque");
+//        while (true) {
+//            try {
+//                //从队列中获取任务，如果拿到，直接返回。如果没有，则等10秒，如果还没有，本次拿任务中断
+//                Integer wmNewsId = blockingDeque.poll(10, TimeUnit.SECONDS);
+//                log.error("从队列中获取到数据:{}", wmNewsId);
+//                if(wmNewsId != null){
+//                    log.warn("发布文章到APP端:{}", wmNewsId);
+//                    WmNews wmNews = wmNewsMapper.selectById(wmNewsId);
+//                    if(wmNews == null) {
+//                        return;
+//                    }
+//                    // 5.到了，发布，同步数据到APP端
+//                    Long articleId = wmNewsAutoAuditService.saveApArticle(wmNews);
+//                    //制造异常：演示分布式事务问题
+//                    //int i = 1/0;
+//                    if(articleId > 0){
+//                        wmNews.setArticleId(articleId);
+//                        wmNews.setStatus(WmNews.Status.PUBLISHED.getCode());
+//                        wmNewsMapper.updateById(wmNews);
+//                    } else {
+//                        log.warn("自媒体微服务：收到文章微服务进入降级了---->");
+//                        throw new CustomException(AppHttpCodeEnum.AP_ARTICLE_INSERT_FAIL);
+//                    }
+//                }
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//                log.warn("获取任务失败:{}",e.getMessage());
+//            }
+//        }
+//    }
+//
+//}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/utils/WmThreadLocalUtil.java b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/utils/WmThreadLocalUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..ed2ba3b84594250b7e16a251e0c49fc614470d96
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/java/com/heima/wemedia/utils/WmThreadLocalUtil.java
@@ -0,0 +1,36 @@
+package com.heima.wemedia.utils;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 11:46:06
+ */
+public class WmThreadLocalUtil {
+
+    public static final ThreadLocal<Integer> THREAD_LOCAL = new ThreadLocal<>();
+
+    /**
+     * 设置自媒体用户ID到当前线程
+     * @param wmUserId
+     */
+    public static void setWmUserId(Integer wmUserId){
+        THREAD_LOCAL.set(wmUserId);
+    }
+
+    /**
+     * 从当前线程上获取自媒体用户ID
+     * @return
+     */
+    public static Integer getWmUserId(){
+        return THREAD_LOCAL.get();
+    }
+
+    /**
+     * 从当前线程上移除自媒体用户ID
+     * @return
+     */
+    public static void removeWmUserId(){
+        THREAD_LOCAL.remove();
+    }
+
+}
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/resources/bootstrap.yml b/heima-leadnews-service/heima-leadnews-wemedia/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8b8da082548df1bf33f0a41eb755b8c6f7ae9414
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/resources/bootstrap.yml
@@ -0,0 +1,37 @@
+server:
+  port: 51803
+spring:
+  application:
+    name: leadnews-wemedia
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.200.130:8848
+      config:
+        server-addr: 192.168.200.130:8848
+        file-extension: yml
+  rabbitmq:
+    host: 192.168.200.130
+    port: 5672
+    virtual-host: /
+    username: itcast
+    password: 123456
+seata:
+  registry: # TC服务注册中心的配置，微服务根据这些信息去注册中心获取tc服务地址
+    type: nacos # 注册中心类型 nacos
+    nacos:
+      server-addr: 192.168.200.130:8848 # nacos地址
+      namespace: "" # namespace，默认为空
+      group: DEFAULT_GROUP # 分组，默认是DEFAULT_GROUP
+      application: seata-server # seata服务名称
+      username: ""
+      password: ""
+  tx-service-group: seata-demo # 事务组名称
+  service:
+    vgroup-mapping: # 事务组与cluster的映射关系
+      seata-demo: default
+
+tess4j:
+  data-path: D:\166\project2\tessdata
+  language: chi_sim
+
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/resources/logback.xml b/heima-leadnews-service/heima-leadnews-wemedia/src/main/resources/logback.xml
new file mode 100644
index 0000000000000000000000000000000000000000..199dbed48c7a52066ed75e0e99cb52431420567c
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/resources/logback.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration>
+    <!--定义日志文件的存储地址,使用绝对路径-->
+    <property name="LOG_HOME" value="e:/logs"/>
+
+    <!-- Console 输出设置 -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>utf8</charset>
+        </encoder>
+    </appender>
+
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <fileNamePattern>${LOG_HOME}/leadnews.%d{yyyy-MM-dd}.log</fileNamePattern>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 异步输出 -->
+    <appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
+        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
+        <discardingThreshold>0</discardingThreshold>
+        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
+        <queueSize>512</queueSize>
+        <!-- 添加附加的appender,最多只能添加一个 -->
+        <appender-ref ref="FILE"/>
+    </appender>
+
+
+    <logger name="org.apache.ibatis.cache.decorators.LoggingCache" level="DEBUG" additivity="false">
+        <appender-ref ref="CONSOLE"/>
+    </logger>
+    <logger name="org.springframework.boot" level="debug"/>
+    <root level="info">
+        <!--<appender-ref ref="ASYNC"/>-->
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="CONSOLE"/>
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/main/resources/mapper/WmNewsMaterialMapper.xml b/heima-leadnews-service/heima-leadnews-wemedia/src/main/resources/mapper/WmNewsMaterialMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cd71eca4bb25aa331ed9d69effddb08c0d44ef72
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/main/resources/mapper/WmNewsMaterialMapper.xml
@@ -0,0 +1,15 @@
+<?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="com.heima.wemedia.mapper.WmNewsMaterialMapper">
+
+    <insert id="saveRelations">
+        insert into wm_news_material
+            ( material_id, news_id, type, ord )
+            values
+            <foreach collection="mids" separator="," item="mid" index="i">
+                (#{mid}, #{newsId}, #{type}, #{i})
+            </foreach>
+    </insert>
+
+</mapper>
\ No newline at end of file
diff --git a/heima-leadnews-service/heima-leadnews-wemedia/src/test/java/com/heima/wemedia/AliyunContentSecurityTest.java b/heima-leadnews-service/heima-leadnews-wemedia/src/test/java/com/heima/wemedia/AliyunContentSecurityTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..274dc3fb4d4981e301f90424ddbf770e4bdc2762
--- /dev/null
+++ b/heima-leadnews-service/heima-leadnews-wemedia/src/test/java/com/heima/wemedia/AliyunContentSecurityTest.java
@@ -0,0 +1,52 @@
+package com.heima.wemedia;
+
+import com.heima.common.aliyun.GreenImageScan;
+import com.heima.common.aliyun.GreenTextScan;
+import com.heima.file.service.FileStorageService;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-08 16:14:57
+ */
+@SpringBootTest
+public class AliyunContentSecurityTest {
+
+    @Autowired
+    private GreenTextScan greenTextScan;
+    @Autowired
+    private GreenImageScan greenImageScan;
+    @Autowired
+    private FileStorageService fileStorageService;
+
+    /**
+     * 文本审核
+     * @throws Exception
+     */
+    @Test   //org.junit.jupiter.api.Test
+    public void greenTextScanTest() throws Exception {
+        String content = "我在上海出差，讲Java！！我不卖冰毒！";
+        Map map = greenTextScan.greenTextScan(content);
+        System.out.println(map);
+    }
+
+    /**
+     * 图片审核
+     * @throws Exception
+     */
+    @Test
+    public void greenImageScanTest() throws Exception {
+        //String url = "http://192.168.200.130:9000/leadnews/2024/07/06/9594f71e429d423eb06ed28c029560f1.jpg";
+        String url = "http://192.168.200.130:9000/leadnews/20240708162358625.jpg";
+        byte[] bytes = fileStorageService.downLoadFile(url);
+        Map map = greenImageScan.imageScan(Arrays.asList(bytes));
+        System.out.println(map);
+    }
+
+}
diff --git a/heima-leadnews-service/pom.xml b/heima-leadnews-service/pom.xml
index 7383b65c13185a807b052abacd3e6fb85bf58daa..eb99e2e171f948ec636c7ed18ce7ad8c50aa409b 100644
--- a/heima-leadnews-service/pom.xml
+++ b/heima-leadnews-service/pom.xml
@@ -10,6 +10,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>heima-leadnews-service</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>heima-leadnews-user</module>
+        <module>heima-leadnews-article</module>
+        <module>heima-leadnews-wemedia</module>
+        <module>heima-leadnews-search</module>
+    </modules>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
diff --git a/heima-leadnews-test/es-init/pom.xml b/heima-leadnews-test/es-init/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..04b633266587991c694c5021a42c9adc235f9afa
--- /dev/null
+++ b/heima-leadnews-test/es-init/pom.xml
@@ -0,0 +1,53 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews-test</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>es-init</artifactId>
+
+
+    <dependencies>
+        <!-- 引入依赖模块 -->
+        <dependency>
+            <groupId>com.heima</groupId>
+            <artifactId>heima-leadnews-common</artifactId>
+        </dependency>
+
+        <!-- Spring boot starter -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!--elasticsearch-->
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-high-level-client</artifactId>
+            <version>7.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-client</artifactId>
+            <version>7.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <version>7.4.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.13.1</version>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/heima-leadnews-test/es-init/src/main/java/com/heima/es/EsInitApplication.java b/heima-leadnews-test/es-init/src/main/java/com/heima/es/EsInitApplication.java
new file mode 100644
index 0000000000000000000000000000000000000000..cfb71f58c86c09d365543f8f9a76de6fe327434c
--- /dev/null
+++ b/heima-leadnews-test/es-init/src/main/java/com/heima/es/EsInitApplication.java
@@ -0,0 +1,19 @@
+package com.heima.es;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @Description:
+ * @Version: V1.0
+ */
+@SpringBootApplication
+@MapperScan("com.heima.es.mapper")
+public class EsInitApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(EsInitApplication.class, args);
+    }
+
+}
diff --git a/heima-leadnews-test/es-init/src/main/java/com/heima/es/config/ElasticSearchConfig.java b/heima-leadnews-test/es-init/src/main/java/com/heima/es/config/ElasticSearchConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..7aa8b9ef8da237705ae63ed16c9f8d8be0eb9cae
--- /dev/null
+++ b/heima-leadnews-test/es-init/src/main/java/com/heima/es/config/ElasticSearchConfig.java
@@ -0,0 +1,30 @@
+package com.heima.es.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.http.HttpHost;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Getter
+@Setter
+@Configuration
+@ConfigurationProperties(prefix = "elasticsearch")
+public class ElasticSearchConfig {
+    private String host;
+    private int port;
+
+    @Bean
+    public RestHighLevelClient client(){
+        return new RestHighLevelClient(RestClient.builder(
+                new HttpHost(
+                        host,
+                        port,
+                        "http"
+                )
+        ));
+    }
+}
diff --git a/heima-leadnews-test/es-init/src/main/java/com/heima/es/mapper/ApArticleMapper.java b/heima-leadnews-test/es-init/src/main/java/com/heima/es/mapper/ApArticleMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..8b51d2f6edf5519b777de626587c21366a359fdb
--- /dev/null
+++ b/heima-leadnews-test/es-init/src/main/java/com/heima/es/mapper/ApArticleMapper.java
@@ -0,0 +1,15 @@
+package com.heima.es.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.heima.es.pojo.SearchArticleVo;
+import com.heima.model.article.pojos.ApArticle;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface ApArticleMapper extends BaseMapper<ApArticle> {
+
+    public List<SearchArticleVo> loadArticleList();
+
+}
diff --git a/heima-leadnews-test/es-init/src/main/java/com/heima/es/pojo/SearchArticleVo.java b/heima-leadnews-test/es-init/src/main/java/com/heima/es/pojo/SearchArticleVo.java
new file mode 100644
index 0000000000000000000000000000000000000000..adcdc0040f4ce890a4cacb77df6e1bb05c13722a
--- /dev/null
+++ b/heima-leadnews-test/es-init/src/main/java/com/heima/es/pojo/SearchArticleVo.java
@@ -0,0 +1,31 @@
+package com.heima.es.pojo;
+
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * 返回给前端的搜索实体
+ */
+@Data
+public class SearchArticleVo {
+
+    // 文章id
+    private Long id;
+    // 文章标题
+    private String title;
+    // 文章发布时间
+    private Date publishTime;
+    // 文章布局
+    private Integer layout;
+    // 封面
+    private String images;
+    // 作者id
+    private Long authorId;
+    // 作者名词
+    private String authorName;
+    //静态url
+    private String staticUrl;
+    //文章内容
+    private String content;
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-test/es-init/src/main/resources/application.yml b/heima-leadnews-test/es-init/src/main/resources/application.yml
new file mode 100644
index 0000000000000000000000000000000000000000..cd42f9ba61489c3234c5241d87811b3fc8a59757
--- /dev/null
+++ b/heima-leadnews-test/es-init/src/main/resources/application.yml
@@ -0,0 +1,20 @@
+server:
+  port: 9999
+spring:
+  application:
+    name: es-article
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://localhost:3306/leadnews_article?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
+    username: root
+    password: root
+# 设置Mapper接口所对应的XML文件位置，如果你在Mapper接口中有自定义方法，需要进行该配置
+mybatis-plus:
+  mapper-locations: classpath*:mapper/*.xml
+  # 设置别名包扫描路径，通过该属性可以给包中的类注册别名
+  type-aliases-package: com.heima.model.article.pojos
+
+#自定义elasticsearch连接配置
+elasticsearch:
+  host: 192.168.200.130
+  port: 9200
diff --git a/heima-leadnews-test/es-init/src/main/resources/mapper/ApArticleMapper.xml b/heima-leadnews-test/es-init/src/main/resources/mapper/ApArticleMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a7ed9f939ff7ba49bacb62779ab770edba93ec53
--- /dev/null
+++ b/heima-leadnews-test/es-init/src/main/resources/mapper/ApArticleMapper.xml
@@ -0,0 +1,31 @@
+<?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="com.heima.es.mapper.ApArticleMapper">
+
+    <resultMap id="resultMap" type="com.heima.es.pojo.SearchArticleVo">
+        <id column="id" property="id"/>
+        <result column="title" property="title"/>
+        <result column="author_id" property="authorId"/>
+        <result column="author_name" property="authorName"/>
+        <result column="layout" property="layout"/>
+        <result column="images" property="images"/>
+        <result column="publish_time" property="publishTime"/>
+        <result column="static_url" property="staticUrl"/>
+        <result column="content" property="content"/>
+    </resultMap>
+    <select id="loadArticleList" resultMap="resultMap">
+        SELECT
+            aa.*, aacon.content
+        FROM
+            `ap_article` aa,
+            ap_article_config aac,
+            ap_article_content aacon
+        WHERE
+            aa.id = aac.article_id
+          AND aa.id = aacon.article_id
+          AND aac.is_delete != 1
+          AND aac.is_down != 1
+
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/heima-leadnews-test/es-init/src/test/java/com/heima/es/ApArticleTest.java b/heima-leadnews-test/es-init/src/test/java/com/heima/es/ApArticleTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..1732a5f51b8b97f3669d313b27132801b68355de
--- /dev/null
+++ b/heima-leadnews-test/es-init/src/test/java/com/heima/es/ApArticleTest.java
@@ -0,0 +1,44 @@
+package com.heima.es;
+
+import com.alibaba.fastjson.JSON;
+import com.heima.es.mapper.ApArticleMapper;
+import com.heima.es.pojo.SearchArticleVo;
+import org.elasticsearch.action.bulk.BulkRequest;
+import org.elasticsearch.action.bulk.BulkResponse;
+import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.common.xcontent.XContentType;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+
+@SpringBootTest
+public class ApArticleTest {
+
+    @Autowired
+    private RestHighLevelClient client;
+    @Autowired
+    private ApArticleMapper apArticleMapper;
+
+    /**
+     * 注意：数据量的导入，如果数据量过大，需要分页导入
+     * @throws Exception
+     */
+    @Test
+    public void init() throws Exception {
+        BulkRequest bulkRequest = new BulkRequest("app_info_article");
+        List<SearchArticleVo> searchArticleVos = apArticleMapper.loadArticleList();
+        for (SearchArticleVo vo : searchArticleVos) {
+            IndexRequest indexRequest = new IndexRequest("app_info_article")
+                    .id(vo.getId().toString())
+                    .source(JSON.toJSONString(vo), XContentType.JSON);
+            bulkRequest.add(indexRequest);
+        }
+        BulkResponse response = client.bulk(bulkRequest, RequestOptions.DEFAULT);
+        System.out.println(response);
+    }
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-test/freemarker-demo/pom.xml b/heima-leadnews-test/freemarker-demo/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3442dad042d37f93764f5ce8b57d639bb39f9efa
--- /dev/null
+++ b/heima-leadnews-test/freemarker-demo/pom.xml
@@ -0,0 +1,47 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews-test</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>freemarker-demo</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <!-- lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <!-- apache 对 java io 的封装工具库 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/heima-leadnews-test/freemarker-demo/src/main/java/com/heima/freemarker/FreemarkerDemoApplication.java b/heima-leadnews-test/freemarker-demo/src/main/java/com/heima/freemarker/FreemarkerDemoApplication.java
new file mode 100644
index 0000000000000000000000000000000000000000..f2218d8e8251cba926e277d0a736b9fcdd5a3bcb
--- /dev/null
+++ b/heima-leadnews-test/freemarker-demo/src/main/java/com/heima/freemarker/FreemarkerDemoApplication.java
@@ -0,0 +1,11 @@
+package com.heima.freemarker;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class FreemarkerDemoApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(FreemarkerDemoApplication.class,args);
+    }
+}
\ No newline at end of file
diff --git a/heima-leadnews-test/freemarker-demo/src/main/java/com/heima/freemarker/controller/FreemarkerController.java b/heima-leadnews-test/freemarker-demo/src/main/java/com/heima/freemarker/controller/FreemarkerController.java
new file mode 100644
index 0000000000000000000000000000000000000000..08f25c78c9ab0409f7478da3bec1f152b296259d
--- /dev/null
+++ b/heima-leadnews-test/freemarker-demo/src/main/java/com/heima/freemarker/controller/FreemarkerController.java
@@ -0,0 +1,102 @@
+package com.heima.freemarker.controller;
+
+import com.heima.freemarker.pojo.Student;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-05 16:09:31
+ */
+@Controller
+public class FreemarkerController {
+
+
+    @GetMapping("func")
+    public String func(Model model) {
+        //1.1 小强对象模型数据
+        Student stu1 = new Student();
+        stu1.setName("小强");
+        stu1.setAge(18);
+        stu1.setMoney(1000.86f);
+        stu1.setBirthday(new Date());
+        //1.2 小红对象模型数据
+        Student stu2 = new Student();
+        stu2.setName("小红");
+        stu2.setMoney(200.1f);
+        stu2.setAge(19);
+        //1.3 将两个对象模型数据存放到List集合中
+        List<Student> stus = new ArrayList<>();
+        stus.add(stu1);
+        stus.add(stu2);
+        model.addAttribute("stus", stus);
+        // 2.1 添加日期
+        Date date = new Date();
+        model.addAttribute("today", date);
+        // 3.1 添加数值
+        model.addAttribute("point", 102920122);
+        return "func";
+    }
+
+    @GetMapping("/list")
+    public String list(Model model){
+
+        //------------------------------------
+        Student stu1 = new Student();
+        stu1.setName("小强");
+        stu1.setAge(18);
+        stu1.setMoney(1000.86f);
+        stu1.setBirthday(new Date());
+
+        //小红对象模型数据
+        Student stu2 = new Student();
+        stu2.setName("小红");
+        stu2.setMoney(200.1f);
+        stu2.setAge(19);
+
+        //将两个对象模型数据存放到List集合中
+        List<Student> stus = new ArrayList<>();
+        stus.add(stu1);
+        stus.add(stu2);
+        //向model中存放List集合数据
+        model.addAttribute("stus",stus);
+
+        //------------------------------------
+
+        //创建Map数据
+        HashMap<String,Student> stuMap = new HashMap<>();
+        stuMap.put("stu1",stu1);
+        stuMap.put("stu2",stu2);
+        // 3.1 向model中存放Map数据
+        model.addAttribute("stuMap", stuMap);
+
+        Date now = new Date();
+        model.addAttribute("date1", now);
+        model.addAttribute("date2", now);
+
+        model.addAttribute("name", "小李");
+
+        return "list";
+    }
+
+    @GetMapping("/basic")
+    public String basic(Model model){
+        //向model中放数据
+        model.addAttribute("name", "张三");
+        Student student = new Student();
+        student.setName("李四");
+        student.setAge(11);
+        student.setMoney(111.11F);
+        model.addAttribute("stu", student);
+        //跳转视图
+        return "basic";
+    }
+
+}
diff --git a/heima-leadnews-test/freemarker-demo/src/main/java/com/heima/freemarker/pojo/Student.java b/heima-leadnews-test/freemarker-demo/src/main/java/com/heima/freemarker/pojo/Student.java
new file mode 100644
index 0000000000000000000000000000000000000000..977ba89e0698475a46aee75047c5de37121271b5
--- /dev/null
+++ b/heima-leadnews-test/freemarker-demo/src/main/java/com/heima/freemarker/pojo/Student.java
@@ -0,0 +1,13 @@
+package com.heima.freemarker.pojo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class Student {
+    private String name;//姓名
+    private int age;//年龄
+    private Date birthday;//生日
+    private Float money;//钱包
+}
\ No newline at end of file
diff --git a/heima-leadnews-test/freemarker-demo/src/main/resources/application.yml b/heima-leadnews-test/freemarker-demo/src/main/resources/application.yml
new file mode 100644
index 0000000000000000000000000000000000000000..406c1d616b5241b28226fef10321ab2e9b438f5e
--- /dev/null
+++ b/heima-leadnews-test/freemarker-demo/src/main/resources/application.yml
@@ -0,0 +1,10 @@
+server:
+  port: 8881 #服务端口
+spring:
+  application:
+    name: freemarker-demo #指定服务名
+  freemarker:
+    cache: false  #关闭模板缓存，方便测试
+    settings:
+      template_update_delay: 0 #检查模板更新延迟时间，设置为0表示立即检查，如果时间大于0会有缓存不方便进行模板测试
+    suffix: .ftl               #指定Freemarker模板文件的后缀名
\ No newline at end of file
diff --git a/heima-leadnews-test/freemarker-demo/src/main/resources/templates/basic.ftl b/heima-leadnews-test/freemarker-demo/src/main/resources/templates/basic.ftl
new file mode 100644
index 0000000000000000000000000000000000000000..6be67c57817d4568fa6e08ae7ad1058b2c2e1455
--- /dev/null
+++ b/heima-leadnews-test/freemarker-demo/src/main/resources/templates/basic.ftl
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Hello World!</title>
+</head>
+<body>
+<b>普通文本 String 展示：</b><br><br>
+Hello ${name} <br>
+<hr>
+<b>对象Student中的数据展示：</b><br/>
+姓名：${stu.name}<br/>
+年龄：${stu.age}
+<hr>
+</body>
+</html>
\ No newline at end of file
diff --git a/heima-leadnews-test/freemarker-demo/src/main/resources/templates/func.ftl b/heima-leadnews-test/freemarker-demo/src/main/resources/templates/func.ftl
new file mode 100644
index 0000000000000000000000000000000000000000..f51a2945a44d2a54e62df55d97ac5098cb80ef40
--- /dev/null
+++ b/heima-leadnews-test/freemarker-demo/src/main/resources/templates/func.ftl
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>inner Function</title>
+</head>
+<body>
+
+<b>获得集合大小</b><br>
+
+集合大小：${stus?size}
+<hr>
+
+
+<b>获得日期</b><br>
+
+显示年月日: ${today?date}       <br>
+
+显示时分秒：${today?time}<br>
+
+显示日期+时间：${today?datetime}<br>
+
+自定义格式化：  ${today?string("yyyy年MM月")}<br>
+
+<hr>
+
+<b>内建函数C</b><br>
+没有C函数显示的数值：${point} <br>
+
+有C函数显示的数值：${point?c}
+
+<hr>
+
+<b>声明变量assign</b><br>
+<#assign text="{'bank':'工商银行','account':'10101920201920212'}" />
+<#assign data=text?eval />
+开户行：${data.bank}  账号：${data.account}
+
+<hr>
+</body>
+</html>
\ No newline at end of file
diff --git a/heima-leadnews-test/freemarker-demo/src/main/resources/templates/list.ftl b/heima-leadnews-test/freemarker-demo/src/main/resources/templates/list.ftl
new file mode 100644
index 0000000000000000000000000000000000000000..1d0ae803413c72591dd4af27f7a38dfe543f4fc6
--- /dev/null
+++ b/heima-leadnews-test/freemarker-demo/src/main/resources/templates/list.ftl
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Hello World!</title>
+</head>
+<body>
+
+<#-- list 数据的展示 -->
+<b>展示list中的stu数据:</b>
+<br>
+<br>
+<table>
+    <tr>
+        <td>序号</td>
+        <td>姓名</td>
+        <td>年龄</td>
+        <td>钱包</td>
+    </tr>
+    <#--
+        <#list指令 ： 遍历List集合
+             stus ：集合数据在Model中的key
+             as :  关键字，固定的
+             stu : 正在遍历的集合的元素
+     -->
+    <#list stus as stu>
+        <#if stu.name == '小红'>
+            <tr style="background-color:red;">
+                <#-- stu_index ：元素_index，获取元素对应的下标 -->
+                <td>${stu_index+1}</td>
+                <td>${stu.name}</td>
+                <td>${stu.age}</td>
+                <td>${stu.money}</td>
+            </tr>
+            <#else>
+                <tr>
+                    <#-- stu_index ：元素_index，获取元素对应的下标 -->
+                    <td>${stu_index+1}</td>
+                    <td>${stu.name}</td>
+                    <td>${stu.age}</td>
+                    <td>${stu.money}</td>
+                </tr>
+        </#if>
+    </#list>
+
+</table>
+<hr>
+
+<#-- Map 数据的展示 -->
+<b>map数据的展示：</b>
+<br/><br/>
+<a href="###">方式一：通过 map['keyname'].property</a><br/>
+输出stu1的学生信息：<br/>
+姓名：${stuMap['stu1'].name}<br/>
+年龄：${stuMap['stu1'].age}<br/>
+<br/>
+<a href="###">方式二：通过map.keyname.property</a><br/>
+输出stu2的学生信息：<br/>
+姓名：${stuMap.stu2.name}<br/>
+年龄：${stuMap.stu2.age}<br/>
+
+<br/>
+<a href="###">遍历map中两个学生信息：</a><br/>
+<table>
+    <tr>
+        <td>序号</td>
+        <td>姓名</td>
+        <td>年龄</td>
+        <td>钱包</td>
+    </tr>
+    <#--
+        stuMap?keys ：获取stuMap中所有key
+        key : 正在遍历的key,可以自己取名字
+    -->
+    <#list stuMap?keys as key >
+        <tr>
+            <td>${key_index}</td>
+            <td>${stuMap[key].name}</td>
+            <td>${stuMap[key].age}</td>
+            <td>${stuMap[key].money}</td>
+        </tr>
+    </#list>
+</table>
+<hr>
+    <#if (date1?date >= date2?date)>
+        条件成立
+    </#if>
+
+<hr>
+
+<#if date1??>
+    date1存在
+</#if>
+
+<#if date3??>
+<#else>
+    date3不存在
+</#if>
+
+<hr/>
+${name ! ''}  <br>
+${name2 ! 'name2不存在，给一个默认值'}
+
+</body>
+</html>
\ No newline at end of file
diff --git a/heima-leadnews-test/freemarker-demo/src/test/java/com/heima/freemarker/test/FreemarkerTest.java b/heima-leadnews-test/freemarker-demo/src/test/java/com/heima/freemarker/test/FreemarkerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..85e0c89031f4b7891352687e1a2a37ce22626d2c
--- /dev/null
+++ b/heima-leadnews-test/freemarker-demo/src/test/java/com/heima/freemarker/test/FreemarkerTest.java
@@ -0,0 +1,81 @@
+package com.heima.freemarker.test;
+
+import com.heima.freemarker.pojo.Student;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.io.FileWriter;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-05 17:31:33
+ */
+@SpringBootTest
+public class FreemarkerTest {
+    
+    @Autowired
+    private Configuration configuration;  //freemarker.template.Configuration;
+    
+    /**
+     * 
+     * @throws Exception
+     */
+    @Test  //org.junit.jupiter.api.Test;
+    public void generateHtmlTest() throws Exception {
+        //获取模板对象
+        Template template = configuration.getTemplate("list.ftl");
+        //准备数据，是一个Map
+        Map data = getData();
+        //输出页面
+        template.process(data, new FileWriter("D://list.html"));
+    }
+
+    private Map getData() {
+        Map data = new HashMap();
+        //------------------------------------
+        Student stu1 = new Student();
+        stu1.setName("小强");
+        stu1.setAge(18);
+        stu1.setMoney(1000.86f);
+        stu1.setBirthday(new Date());
+
+        //小红对象模型数据
+        Student stu2 = new Student();
+        stu2.setName("小红");
+        stu2.setMoney(200.1f);
+        stu2.setAge(19);
+
+        //将两个对象模型数据存放到List集合中
+        List<Student> stus = new ArrayList<>();
+        stus.add(stu1);
+        stus.add(stu2);
+        //向model中存放List集合数据
+        data.put("stus",stus);
+
+        //------------------------------------
+
+        //创建Map数据
+        HashMap<String,Student> stuMap = new HashMap<>();
+        stuMap.put("stu1",stu1);
+        stuMap.put("stu2",stu2);
+        // 3.1 向model中存放Map数据
+        data.put("stuMap", stuMap);
+
+        Date now = new Date();
+        data.put("date1", now);
+        data.put("date2", now);
+
+        data.put("name", "小李");
+        return data;
+    }
+
+}
diff --git a/heima-leadnews-test/kafka-demo/pom.xml b/heima-leadnews-test/kafka-demo/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..460ab23de0f589cd5b0a6d45df1bc4902da432e4
--- /dev/null
+++ b/heima-leadnews-test/kafka-demo/pom.xml
@@ -0,0 +1,45 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews-test</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>kafka-demo</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <!-- kafkfa -->
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.kafka</groupId>
+                    <artifactId>kafka-clients</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/KafkaApp.java b/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/KafkaApp.java
new file mode 100644
index 0000000000000000000000000000000000000000..59199066f3050dc6f7bcf5e0dc4adfdbf9fd5eed
--- /dev/null
+++ b/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/KafkaApp.java
@@ -0,0 +1,11 @@
+package com.heima.kafka;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class KafkaApp {
+    public static void main(String[] args) {
+        SpringApplication.run(KafkaApp.class, args);
+    }
+}
diff --git a/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/controller/KafkaController.java b/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/controller/KafkaController.java
new file mode 100644
index 0000000000000000000000000000000000000000..e96cb1eebd45f8f2049e84256b8e3aede3745cec
--- /dev/null
+++ b/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/controller/KafkaController.java
@@ -0,0 +1,25 @@
+package com.heima.kafka.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-14 14:34:33
+ */
+@RestController
+public class KafkaController {
+
+    @Autowired
+    private KafkaTemplate<String, String> kafkaTemplate;
+
+    @GetMapping("/send")
+    public String send(String message){
+        kafkaTemplate.send("itheima-topic", message);
+        return "success";
+    }
+
+}
diff --git a/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/listeners/KafkaMessageListener.java b/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/listeners/KafkaMessageListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..b20b4fd2de51e3597c241938e5760a4015cbe191
--- /dev/null
+++ b/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/listeners/KafkaMessageListener.java
@@ -0,0 +1,21 @@
+package com.heima.kafka.listeners;
+
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-14 14:37:01
+ */
+@Component
+public class KafkaMessageListener {
+
+    @KafkaListener(topics = "itheima-topic")
+    public void handleMessage(String message){
+        if(!StringUtils.isEmpty(message)) {
+            System.out.println(message);
+        }
+    }
+}
diff --git a/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/sample/ConsumerQuickStart.java b/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/sample/ConsumerQuickStart.java
new file mode 100644
index 0000000000000000000000000000000000000000..813737569b94636bad0e86bddd5f288933510356
--- /dev/null
+++ b/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/sample/ConsumerQuickStart.java
@@ -0,0 +1,65 @@
+package com.heima.kafka.sample;
+
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.clients.consumer.OffsetAndMetadata;
+import org.apache.kafka.clients.consumer.OffsetCommitCallback;
+import org.apache.kafka.common.TopicPartition;
+
+import java.time.Duration;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * 消费者
+ */
+public class ConsumerQuickStart {
+
+    public static void main(String[] args) {
+        //1.添加kafka的配置信息
+        Properties properties = new Properties();
+        //kafka的连接地址
+        properties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "192.168.200.130:9092");
+        //消费者组，一定要指定，没有组，无法正确消费消息，还会报错
+        properties.put(ConsumerConfig.GROUP_ID_CONFIG, "group2");
+        //消息的反序列化器
+        properties.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
+        properties.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
+        properties.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, false);
+        //2.消费者对象
+        KafkaConsumer<String, String> consumer = new KafkaConsumer<String, String>(properties);
+
+        //3.订阅主题
+        consumer.subscribe(Collections.singletonList("itheima-topic"));
+
+        //当前线程一直处于监听状态
+        while (true) {
+            //4.获取消息
+            ConsumerRecords<String, String> consumerRecords = consumer.poll(Duration.ofMillis(1000));
+            try {
+                for (ConsumerRecord<String, String> consumerRecord : consumerRecords) {
+                    System.out.println(consumerRecord.key());
+                    System.out.println(consumerRecord.value());
+                    System.out.println(consumerRecord.topic());
+                    //异步提交
+                    consumer.commitAsync(new OffsetCommitCallback() {
+                        @Override
+                        public void onComplete(Map<TopicPartition, OffsetAndMetadata> map, Exception e) {
+                            if(e != null) {
+                                System.out.println(map);
+                            }
+                        }
+                    });
+                }
+            } finally {
+                //同步提交
+                consumer.commitSync();
+            }
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/sample/ConsumerQuickStart2.java b/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/sample/ConsumerQuickStart2.java
new file mode 100644
index 0000000000000000000000000000000000000000..c213a4641b43d60511da31840c3f0ddea50d119b
--- /dev/null
+++ b/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/sample/ConsumerQuickStart2.java
@@ -0,0 +1,47 @@
+package com.heima.kafka.sample;
+
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+
+import java.time.Duration;
+import java.util.Collections;
+import java.util.Properties;
+
+/**
+ * 消费者
+ */
+public class ConsumerQuickStart2 {
+
+    public static void main(String[] args) {
+        //1.添加kafka的配置信息
+        Properties properties = new Properties();
+        //kafka的连接地址
+        properties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, "192.168.200.130:9092");
+        //消费者组，一定要指定，没有组，无法正确消费消息，还会报错
+        properties.put(ConsumerConfig.GROUP_ID_CONFIG, "group1");
+        //消息的反序列化器
+        properties.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
+        properties.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
+
+        //2.消费者对象
+        KafkaConsumer<String, String> consumer = new KafkaConsumer<String, String>(properties);
+
+        //3.订阅主题
+        consumer.subscribe(Collections.singletonList("itheima-topic"));
+
+        //当前线程一直处于监听状态
+        while (true) {
+            //4.获取消息
+            ConsumerRecords<String, String> consumerRecords = consumer.poll(Duration.ofMillis(1000));
+            for (ConsumerRecord<String, String> consumerRecord : consumerRecords) {
+                System.out.println(consumerRecord.key());
+                System.out.println(consumerRecord.value());
+                System.out.println(consumerRecord.topic());
+            }
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/sample/ProducerQuickStart.java b/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/sample/ProducerQuickStart.java
new file mode 100644
index 0000000000000000000000000000000000000000..71d5e83635abd8f5a2ed181cc561fafafa6a3b8b
--- /dev/null
+++ b/heima-leadnews-test/kafka-demo/src/main/java/com/heima/kafka/sample/ProducerQuickStart.java
@@ -0,0 +1,55 @@
+package com.heima.kafka.sample;
+
+import org.apache.kafka.clients.producer.Callback;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.clients.producer.RecordMetadata;
+
+import java.util.Properties;
+import java.util.concurrent.ExecutionException;
+
+/**
+ * 生产者
+ */
+public class ProducerQuickStart {
+
+    public static void main(String[] args) throws ExecutionException, InterruptedException {
+        //1.kafka的配置信息
+        Properties properties = new Properties();
+        //kafka服务器地址
+        properties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,"192.168.200.130:9092");
+        //发送失败，失败的重试次数
+        properties.put(ProducerConfig.RETRIES_CONFIG,5);
+        //消息key的序列化器
+        properties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,"org.apache.kafka.common.serialization.StringSerializer");
+        //消息value的序列化器
+        properties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,"org.apache.kafka.common.serialization.StringSerializer");
+
+        properties.put(ProducerConfig.ACKS_CONFIG,"all");
+
+        //2.生产者对象
+        KafkaProducer<String,String> producer = new KafkaProducer<String, String>(properties);
+        //封装发送的消息
+        ProducerRecord<String,String> record = new ProducerRecord<String, String>("itheima-topic","100001","hello kafka");
+        //3.发送消息
+           //RecordMetadata recordMetadata = producer.send(record).get();
+           //System.out.println("偏移量:" + recordMetadata.offset());
+
+        //异步消息发送
+        producer.send(record, new Callback() {
+            @Override
+            public void onCompletion(RecordMetadata recordMetadata, Exception e) {
+                if(e != null){
+                    System.out.println("记录异常信息到日志表中");
+                }
+                System.out.println("偏移量:" + recordMetadata.offset());
+            }
+        });
+        System.out.println("消息发送成功了");
+        Thread.sleep(999999);
+        //4.关闭消息通道，必须关闭，否则消息发送不成功
+        producer.close();
+    }
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-test/kafka-demo/src/main/resources/application.yml b/heima-leadnews-test/kafka-demo/src/main/resources/application.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c9552705d2174954bf1e66a47357ec2caeb9763b
--- /dev/null
+++ b/heima-leadnews-test/kafka-demo/src/main/resources/application.yml
@@ -0,0 +1,15 @@
+server:
+  port: 8885
+spring:
+  application:
+    name: kafka-demo
+  kafka:
+    bootstrap-servers: 192.168.200.130:9092
+    producer:
+      retries: 10
+      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+      value-serializer: org.apache.kafka.common.serialization.StringSerializer
+    consumer:
+      group-id: ${spring.application.name}-test
+      key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+      value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
\ No newline at end of file
diff --git a/heima-leadnews-test/minio-demo/pom.xml b/heima-leadnews-test/minio-demo/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1891d5891b01d3c4b2fbb002621c509aba9badd3
--- /dev/null
+++ b/heima-leadnews-test/minio-demo/pom.xml
@@ -0,0 +1,42 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews-test</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>minio-demo</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.heima</groupId>
+            <artifactId>heima-file-starter</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>7.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/heima-leadnews-test/minio-demo/src/main/java/com/heima/minio/MinIOApplication.java b/heima-leadnews-test/minio-demo/src/main/java/com/heima/minio/MinIOApplication.java
new file mode 100644
index 0000000000000000000000000000000000000000..4e2c2ae2c21ba59f3931dab34ec3938f1f58790b
--- /dev/null
+++ b/heima-leadnews-test/minio-demo/src/main/java/com/heima/minio/MinIOApplication.java
@@ -0,0 +1,13 @@
+package com.heima.minio;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+
+@SpringBootApplication
+public class MinIOApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MinIOApplication.class,args);
+    }
+}
\ No newline at end of file
diff --git a/heima-leadnews-test/minio-demo/src/main/resources/application.yml b/heima-leadnews-test/minio-demo/src/main/resources/application.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d05800254a31feaba514b95be9018702d4f9cb62
--- /dev/null
+++ b/heima-leadnews-test/minio-demo/src/main/resources/application.yml
@@ -0,0 +1,6 @@
+minio:
+  accessKey: minio
+  secretKey: minio123
+  bucket: leadnews
+  endpoint: http://192.168.200.130:9000
+  readPath: http://192.168.200.130:9000
\ No newline at end of file
diff --git a/heima-leadnews-test/minio-demo/src/test/java/com/heima/minio/test/MinioTest.java b/heima-leadnews-test/minio-demo/src/test/java/com/heima/minio/test/MinioTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d1fe6b901869482ab7aa9b895cd7c7b202da8d06
--- /dev/null
+++ b/heima-leadnews-test/minio-demo/src/test/java/com/heima/minio/test/MinioTest.java
@@ -0,0 +1,59 @@
+package com.heima.minio.test;
+
+import com.heima.file.service.FileStorageService;
+import io.minio.MinioClient;
+import io.minio.PutObjectArgs;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.io.FileInputStream;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-06 09:03:11
+ */
+@SpringBootTest
+public class MinioTest {
+
+    /**
+     *
+     * @throws Exception
+     */
+    @Test
+    public void uploadTest() throws Exception {
+        //1.创建minio对应的Java客户端
+        MinioClient minioClient =
+                MinioClient.builder()
+                        .endpoint("http://192.168.200.130:9000")
+                        .credentials("minio", "minio123")
+                        .build();
+        //2.构造上传对象
+        FileInputStream in = new FileInputStream("D:\\list.html");
+        PutObjectArgs putObjectArgs = PutObjectArgs.builder()
+                .bucket("test")
+                .object("pages/list.html")
+                .stream(in, in.available(), -1)
+                .contentType("text/html")
+                .build();
+        //3.上传
+        minioClient.putObject(putObjectArgs);
+    }
+
+
+    @Autowired
+    private FileStorageService fileStorageService;
+
+    /**
+     *
+     * @throws Exception
+     */
+    @Test
+    public void starterFileUploadTest() throws Exception {
+        String url = fileStorageService.uploadHtmlFile("", "mylist.html", new FileInputStream("D:\\list.html"));
+        System.out.println(url);
+    }
+
+
+}
diff --git a/heima-leadnews-test/mongo-demo/pom.xml b/heima-leadnews-test/mongo-demo/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4431be9ddae610d19b7a39fa0786218df87d84c5
--- /dev/null
+++ b/heima-leadnews-test/mongo-demo/pom.xml
@@ -0,0 +1,39 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews-test</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>mongo-demo</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
+        <!-- lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/heima-leadnews-test/mongo-demo/src/main/java/com/itheima/mongo/MongoApplication.java b/heima-leadnews-test/mongo-demo/src/main/java/com/itheima/mongo/MongoApplication.java
new file mode 100644
index 0000000000000000000000000000000000000000..91febb5b41bdbcebae83cb24de95ed651eb7aae7
--- /dev/null
+++ b/heima-leadnews-test/mongo-demo/src/main/java/com/itheima/mongo/MongoApplication.java
@@ -0,0 +1,13 @@
+package com.itheima.mongo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+
+@SpringBootApplication
+public class MongoApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MongoApplication.class,args);
+    }
+}
diff --git a/heima-leadnews-test/mongo-demo/src/main/java/com/itheima/mongo/pojo/ApAssociateWords.java b/heima-leadnews-test/mongo-demo/src/main/java/com/itheima/mongo/pojo/ApAssociateWords.java
new file mode 100644
index 0000000000000000000000000000000000000000..3bea6dc5793de5ce531784b3cbc45a58011ffa7b
--- /dev/null
+++ b/heima-leadnews-test/mongo-demo/src/main/java/com/itheima/mongo/pojo/ApAssociateWords.java
@@ -0,0 +1,34 @@
+package com.itheima.mongo.pojo;
+
+import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 联想词表
+ * </p>
+ *
+ * @author itheima
+ */
+@Data
+@Document("ap_associate_words")   //用来映射实体与文档的对应关系
+public class ApAssociateWords implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    /**
+     * 联想词
+     */
+    private String associateWords;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-test/mongo-demo/src/main/java/com/itheima/mongo/pojo/ApUserSearch.java b/heima-leadnews-test/mongo-demo/src/main/java/com/itheima/mongo/pojo/ApUserSearch.java
new file mode 100644
index 0000000000000000000000000000000000000000..7e26d42fdb4f7903e5488a03f276c7ceb0b78054
--- /dev/null
+++ b/heima-leadnews-test/mongo-demo/src/main/java/com/itheima/mongo/pojo/ApUserSearch.java
@@ -0,0 +1,42 @@
+package com.itheima.mongo.pojo;
+
+import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * APP用户搜索信息表
+ * </p>
+ * @author itheima
+ */
+@Data
+@Document("ap_user_search")
+public class ApUserSearch implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * 搜索词
+     */
+    private String keyword;
+
+    /**
+     * 创建时间
+     */
+    //private String createdTime;
+    private Date createdTime;
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-test/mongo-demo/src/main/resources/application.yml b/heima-leadnews-test/mongo-demo/src/main/resources/application.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9d76bb1bd9948590f9f4c5707b7693292455bdaf
--- /dev/null
+++ b/heima-leadnews-test/mongo-demo/src/main/resources/application.yml
@@ -0,0 +1,8 @@
+server:
+  port: 9998
+spring:
+  data:
+    mongodb:
+      host: 192.168.200.130
+      port: 27017
+      database: leadnews-history
\ No newline at end of file
diff --git a/heima-leadnews-test/mongo-demo/src/test/java/com/itheima/mongo/test/MongoTest.java b/heima-leadnews-test/mongo-demo/src/test/java/com/itheima/mongo/test/MongoTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..f74e0d09585cc3d099935c39ecc0869126495a1b
--- /dev/null
+++ b/heima-leadnews-test/mongo-demo/src/test/java/com/itheima/mongo/test/MongoTest.java
@@ -0,0 +1,80 @@
+package com.itheima.mongo.test;
+
+
+import com.itheima.mongo.MongoApplication;
+import com.itheima.mongo.pojo.ApAssociateWords;
+import com.itheima.mongo.pojo.ApUserSearch;
+import com.mongodb.client.result.DeleteResult;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+
+import java.util.Date;
+import java.util.List;
+
+@SpringBootTest(classes = MongoApplication.class)
+public class MongoTest {
+
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
+    /**
+     *
+     * @throws Exception
+     */
+    @Test
+    public void Test() throws Exception {
+        Query query = Query.query(Criteria.where("keyword").is("测试搜索4").and("userId").is(1));
+        ApUserSearch apUserSearch = mongoTemplate.findOne(query, ApUserSearch.class);
+        System.out.println(apUserSearch);
+    }
+
+    //保存
+    @Test
+    public void saveTest(){
+        ApAssociateWords apAssociateWords = new ApAssociateWords();
+        apAssociateWords.setAssociateWords("测试");
+        apAssociateWords.setCreatedTime(new Date());
+        ApAssociateWords words = mongoTemplate.save(apAssociateWords);
+        System.out.println(words);
+    }
+
+    //根据ID查询一个
+    @Test
+    public void saveFindById(){
+        ApAssociateWords associateWords = mongoTemplate.findById("669499a234d38e625fafb701", ApAssociateWords.class);
+        System.out.println(associateWords);
+    }
+
+    //根据条件查询一个
+    @Test
+    public void saveFindOne(){
+        Query query = Query.query(
+                Criteria.where("associateWords").is("测试"));
+        ApAssociateWords associateWords = mongoTemplate.findOne(query, ApAssociateWords.class);
+        System.out.println(associateWords);
+    }
+
+    //条件查询
+    @Test
+    public void testQuery(){
+        Query query = Query.query(
+                Criteria.where("createdTime")
+                        .gt(java.sql.Date.valueOf("2020-01-01"))
+                        .and("associateWords").in("测试")
+        );
+        List<ApAssociateWords> associateWordsList = mongoTemplate.find(query, ApAssociateWords.class);
+        System.out.println(associateWordsList.size());
+    }
+
+    @Test
+    public void testDel(){
+        Query query = Query.query(
+                Criteria.where("associateWords").is("测试"));
+        DeleteResult deleteResult = mongoTemplate.remove(query, ApAssociateWords.class);
+        System.out.println(deleteResult);
+    }
+}
diff --git a/heima-leadnews-test/pom.xml b/heima-leadnews-test/pom.xml
index 9edd63375eae97443bc89212d68c8bda1efd93d7..d38586dd8903ffd1f6d6d38c74315724f2f6124d 100644
--- a/heima-leadnews-test/pom.xml
+++ b/heima-leadnews-test/pom.xml
@@ -10,6 +10,18 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>heima-leadnews-test</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>freemarker-demo</module>
+        <module>minio-demo</module>
+        <module>tess4j-demo</module>
+        <module>redisson-demo</module>
+        <module>rabbitmq-demo</module>
+        <module>kafka-demo</module>
+        <module>es-init</module>
+        <module>mongo-demo</module>
+        <module>spring-task-demo</module>
+    </modules>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
diff --git a/heima-leadnews-test/rabbitmq-demo/pom.xml b/heima-leadnews-test/rabbitmq-demo/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..522d8ef7aa2b29596c7d90bdced7f2006696d318
--- /dev/null
+++ b/heima-leadnews-test/rabbitmq-demo/pom.xml
@@ -0,0 +1,35 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews-test</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>rabbitmq-demo</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>
\ No newline at end of file
diff --git a/heima-leadnews-test/rabbitmq-demo/src/main/java/com/heima/rabbitmq/RabbitmqApp.java b/heima-leadnews-test/rabbitmq-demo/src/main/java/com/heima/rabbitmq/RabbitmqApp.java
new file mode 100644
index 0000000000000000000000000000000000000000..ddb970e9393f1897ee78aa76fd1fec88f09ab1cc
--- /dev/null
+++ b/heima-leadnews-test/rabbitmq-demo/src/main/java/com/heima/rabbitmq/RabbitmqApp.java
@@ -0,0 +1,11 @@
+package com.heima.rabbitmq;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class RabbitmqApp {
+    public static void main(String[] args) {
+        SpringApplication.run(RabbitmqApp.class, args);
+    }
+}
diff --git a/heima-leadnews-test/rabbitmq-demo/src/main/java/com/heima/rabbitmq/config/RabbitConfig.java b/heima-leadnews-test/rabbitmq-demo/src/main/java/com/heima/rabbitmq/config/RabbitConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..37febc392397bbe500d6429ab5d26c403b139ae3
--- /dev/null
+++ b/heima-leadnews-test/rabbitmq-demo/src/main/java/com/heima/rabbitmq/config/RabbitConfig.java
@@ -0,0 +1,58 @@
+package com.heima.rabbitmq.config;
+
+import org.springframework.amqp.core.Binding;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.amqp.core.Queue;
+import org.springframework.amqp.core.QueueBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-12 15:14:06
+ */
+@Configuration
+public class RabbitConfig {
+
+    @Bean
+    public Queue testQueue(){
+        return new Queue("test.queue");
+    }
+
+    @Bean
+    public DirectExchange testDirectExchange(){
+        return new DirectExchange("test.direct.exchange");
+    }
+
+    @Bean
+    public Binding testQueueToTestDirectExchange(Queue testQueue, DirectExchange testDirectExchange){
+        return BindingBuilder.bind(testQueue)
+                .to(testDirectExchange)
+                .with("test");
+    }
+
+    @Bean
+    public Queue simpleQueue(){
+        return QueueBuilder
+                .durable("simple.queue")
+                .deadLetterExchange("dl.ttl.direct")
+                .deadLetterRoutingKey("dl")
+                .ttl(10000)
+                .build();
+    }
+
+    @Bean
+    public DirectExchange simpleDirectExchange(){
+        return new DirectExchange("simple.direct.exchange");
+    }
+
+    @Bean
+    public Binding simpleQueueToSimpleDirectExchange(Queue simpleQueue, DirectExchange simpleDirectExchange){
+        return BindingBuilder.bind(simpleQueue)
+                .to(simpleDirectExchange)
+                .with("dl");
+    }
+
+}
diff --git a/heima-leadnews-test/rabbitmq-demo/src/main/java/com/heima/rabbitmq/listeners/TestConsumerListener.java b/heima-leadnews-test/rabbitmq-demo/src/main/java/com/heima/rabbitmq/listeners/TestConsumerListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..7d0f3670abe5821f5cf287f4184313719f1a08e5
--- /dev/null
+++ b/heima-leadnews-test/rabbitmq-demo/src/main/java/com/heima/rabbitmq/listeners/TestConsumerListener.java
@@ -0,0 +1,41 @@
+package com.heima.rabbitmq.listeners;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.ExchangeTypes;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.Exchange;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.QueueBinding;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-12 15:19:49
+ */
+@Component
+@Slf4j
+public class TestConsumerListener {
+
+    @RabbitListener(queues = "test.queue")
+    public void handleMessage(Message message){
+        byte[] body = message.getBody();
+        String msg = new String(body);
+        System.out.println(msg);
+    }
+
+    /**
+     * 监听死信队列的消息
+     * @param message
+     */
+    @RabbitListener(bindings = @QueueBinding(
+            value = @Queue(name = "dl.ttl.queue"),
+            exchange = @Exchange(name = "dl.ttl.direct", type = ExchangeTypes.DIRECT),
+            key = "dl"
+    ))
+    public void handleDeadMessage(String message){
+        log.warn("收到消息:" + message);
+    }
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-test/rabbitmq-demo/src/main/resources/application.yml b/heima-leadnews-test/rabbitmq-demo/src/main/resources/application.yml
new file mode 100644
index 0000000000000000000000000000000000000000..19f4ed2421b6f04ea69985c9f8766c592ef959fe
--- /dev/null
+++ b/heima-leadnews-test/rabbitmq-demo/src/main/resources/application.yml
@@ -0,0 +1,12 @@
+server:
+  port: 8884
+spring:
+  application:
+    name: rabbitmq-demo
+
+  rabbitmq:
+    host: 192.168.200.130
+    port: 5672
+    virtual-host: /
+    username: itcast
+    password: 123456
diff --git a/heima-leadnews-test/rabbitmq-demo/src/test/java/com/heima/rabbitmq/test/ProducerTest.java b/heima-leadnews-test/rabbitmq-demo/src/test/java/com/heima/rabbitmq/test/ProducerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3e6a017e27824a98d5fff0b273d1aa0d9b1ca015
--- /dev/null
+++ b/heima-leadnews-test/rabbitmq-demo/src/test/java/com/heima/rabbitmq/test/ProducerTest.java
@@ -0,0 +1,38 @@
+package com.heima.rabbitmq.test;
+
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.core.MessageBuilder;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-12 15:21:26
+ */
+@SpringBootTest
+@Slf4j
+public class ProducerTest {
+
+    @Autowired
+    private RabbitTemplate rabbitTemplate;
+
+    @Test
+    public void testSendMsg(){
+        //rabbitTemplate.convertAndSend("test.direct.exchange", "test","Haha!!");
+        //rabbitTemplate.convertAndSend("simple.direct.exchange", "dl","Haha22!!");
+        Message message = MessageBuilder
+                .withBody("Haha33!!".getBytes(StandardCharsets.UTF_8))
+                .setExpiration("3000")
+                .build();
+        rabbitTemplate.convertAndSend("simple.direct.exchange", "dl",message);
+        log.warn("消息发送成功");
+    }
+
+
+}
diff --git a/heima-leadnews-test/redisson-demo/pom.xml b/heima-leadnews-test/redisson-demo/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4d2959ceca5be57ee98deabede4ccf80927378a9
--- /dev/null
+++ b/heima-leadnews-test/redisson-demo/pom.xml
@@ -0,0 +1,40 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews-test</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>redisson-demo</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <!--<dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+            <version>3.16.3</version>
+        </dependency>-->
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson</artifactId>
+            <version>3.23.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/heima-leadnews-test/redisson-demo/src/main/java/com/heima/redisson/RedissonApp.java b/heima-leadnews-test/redisson-demo/src/main/java/com/heima/redisson/RedissonApp.java
new file mode 100644
index 0000000000000000000000000000000000000000..ea1c0d5ba0c8132ac92aa48e54586a8ed2263837
--- /dev/null
+++ b/heima-leadnews-test/redisson-demo/src/main/java/com/heima/redisson/RedissonApp.java
@@ -0,0 +1,13 @@
+package com.heima.redisson;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+@SpringBootApplication
+@EnableAsync
+public class RedissonApp {
+    public static void main(String[] args) {
+        SpringApplication.run(RedissonApp.class, args);
+    }
+}
diff --git a/heima-leadnews-test/redisson-demo/src/main/java/com/heima/redisson/config/RedissonConfig.java b/heima-leadnews-test/redisson-demo/src/main/java/com/heima/redisson/config/RedissonConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..218f4e291ae3cf231cfdb93711889dcdd03f891f
--- /dev/null
+++ b/heima-leadnews-test/redisson-demo/src/main/java/com/heima/redisson/config/RedissonConfig.java
@@ -0,0 +1,25 @@
+package com.heima.redisson.config;
+
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.Config;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class RedissonConfig {
+
+    @Bean
+    public RedissonClient redissonClient(){
+        // 创建配置对象
+        Config config = new Config();
+        // 配置单节点Redis服务器
+        config.useSingleServer()
+                .setAddress("redis://192.168.200.130:6379")
+                .setPassword("leadnews");
+
+        // 创建Redisson客户端实例
+        return Redisson.create(config);
+    }
+
+}
diff --git a/heima-leadnews-test/redisson-demo/src/main/java/com/heima/redisson/controller/HelloController.java b/heima-leadnews-test/redisson-demo/src/main/java/com/heima/redisson/controller/HelloController.java
new file mode 100644
index 0000000000000000000000000000000000000000..c5a1c4b290b26a4f03b2e2dc2baab5ecea6e8d3c
--- /dev/null
+++ b/heima-leadnews-test/redisson-demo/src/main/java/com/heima/redisson/controller/HelloController.java
@@ -0,0 +1,42 @@
+package com.heima.redisson.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBlockingDeque;
+import org.redisson.api.RDelayedQueue;
+import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-12 09:15:19
+ */
+@RestController
+@Slf4j
+public class HelloController {
+
+    @Autowired
+    private RedissonClient redissonClient;
+
+    /**
+     * 发布一个任务
+     * @param time 延迟时间，单位为秒
+     * @return
+     */
+    @GetMapping("/sendMsg/{time}")
+    public String sendMsg(@PathVariable(name = "time") Integer time){
+        RBlockingDeque<String> blockingDeque = redissonClient.getBlockingDeque("test-deque");
+        RDelayedQueue<String> delayedQueue = redissonClient.getDelayedQueue(blockingDeque);
+        delayedQueue.offer("This is a Delay Message!!", time, TimeUnit.SECONDS);
+        //返回一个发布任务成功的时间
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+    }
+
+}
diff --git a/heima-leadnews-test/redisson-demo/src/main/java/com/heima/redisson/listeners/DelayMessageListener.java b/heima-leadnews-test/redisson-demo/src/main/java/com/heima/redisson/listeners/DelayMessageListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..a7174964fa6ea7de6ab33c86256882dd280ea584
--- /dev/null
+++ b/heima-leadnews-test/redisson-demo/src/main/java/com/heima/redisson/listeners/DelayMessageListener.java
@@ -0,0 +1,26 @@
+package com.heima.redisson.listeners;
+
+import com.heima.redisson.task.DelayMessageTask;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-12 09:25:06
+ */
+@Component
+public class DelayMessageListener {
+
+    @Autowired
+    private DelayMessageTask delayMessageTask;
+
+    @PostConstruct  //Bean初始化后就立即执行这个方法
+
+    public void run(){
+        delayMessageTask.handleMessage();
+    }
+
+}
diff --git a/heima-leadnews-test/redisson-demo/src/main/java/com/heima/redisson/task/DelayMessageTask.java b/heima-leadnews-test/redisson-demo/src/main/java/com/heima/redisson/task/DelayMessageTask.java
new file mode 100644
index 0000000000000000000000000000000000000000..9c8ee096b254bfa987447358ce6899273da4f1e0
--- /dev/null
+++ b/heima-leadnews-test/redisson-demo/src/main/java/com/heima/redisson/task/DelayMessageTask.java
@@ -0,0 +1,41 @@
+package com.heima.redisson.task;
+
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBlockingDeque;
+import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-12 09:20:32
+ */
+@Component
+@Slf4j
+public class DelayMessageTask {
+
+    @Autowired
+    private RedissonClient redissonClient;
+    @Async
+    public void handleMessage(){
+        log.warn("准备开始从test-deque延迟队列中获取任务");
+        RBlockingDeque<String> blockingDeque = redissonClient.getBlockingDeque("test-deque");
+        while (true) {
+            try {
+                //从队列中获取任务，如果拿到，直接返回。如果没有，则等10秒，如果还没有，本次拿任务中断
+                String message = blockingDeque.poll(10, TimeUnit.SECONDS);
+                if(message != null){
+                    log.warn("拿到test-deque中的任务:{}",message);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.warn("获取任务失败:{}",e.getMessage());
+            }
+        }
+    }
+
+}
diff --git a/heima-leadnews-test/redisson-demo/src/main/resources/application.yml b/heima-leadnews-test/redisson-demo/src/main/resources/application.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2b09a3507f95e7034ed5711d01ed1d60dae7939e
--- /dev/null
+++ b/heima-leadnews-test/redisson-demo/src/main/resources/application.yml
@@ -0,0 +1,13 @@
+server:
+  port: 8883
+spring:
+  application:
+    name: redisson-demo
+  redis:
+    host: 192.168.200.130
+    password: leadnews
+    redisson:
+      config:
+        clusterServersConfig:
+          nodeAddresses:
+            - "redis://192.168.200.130:6379"
\ No newline at end of file
diff --git a/heima-leadnews-test/spring-task-demo/pom.xml b/heima-leadnews-test/spring-task-demo/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..469f1e0da8328cfb39e25800c0f3e4d8040ce367
--- /dev/null
+++ b/heima-leadnews-test/spring-task-demo/pom.xml
@@ -0,0 +1,36 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews-test</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>spring-task-demo</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <!--xxl-job-->
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-job-core</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/heima-leadnews-test/spring-task-demo/src/main/java/com/heima/task/TaskApp.java b/heima-leadnews-test/spring-task-demo/src/main/java/com/heima/task/TaskApp.java
new file mode 100644
index 0000000000000000000000000000000000000000..9084e96adb91a252531cb78286894afad17308d3
--- /dev/null
+++ b/heima-leadnews-test/spring-task-demo/src/main/java/com/heima/task/TaskApp.java
@@ -0,0 +1,13 @@
+package com.heima.task;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@SpringBootApplication
+@EnableScheduling   //开启定时任务
+public class TaskApp {
+    public static void main(String[] args) {
+        SpringApplication.run(TaskApp.class, args);
+    }
+}
diff --git a/heima-leadnews-test/spring-task-demo/src/main/java/com/heima/task/config/XxlJobConfig.java b/heima-leadnews-test/spring-task-demo/src/main/java/com/heima/task/config/XxlJobConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..4440077ae64c18770c71ed9b373bf4f1859589a7
--- /dev/null
+++ b/heima-leadnews-test/spring-task-demo/src/main/java/com/heima/task/config/XxlJobConfig.java
@@ -0,0 +1,40 @@
+package com.heima.task.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * xxl-job config
+ *
+ * @author xuxueli 2017-04-28
+ */
+@Configuration
+public class XxlJobConfig {
+    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+
+    @Value("${xxl.job.admin.addresses}")
+    private String adminAddresses;
+
+    @Value("${xxl.job.executor.appname}")
+    private String appname;
+
+    @Value("${xxl.job.executor.port}")
+    private int port;
+
+
+    @Bean
+    public XxlJobSpringExecutor xxlJobExecutor() {
+        logger.info(">>>>>>>>>>> xxl-job config init.");
+        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+        xxlJobSpringExecutor.setAppname(appname);
+        xxlJobSpringExecutor.setPort(port);
+        return xxlJobSpringExecutor;
+    }
+
+
+}
\ No newline at end of file
diff --git a/heima-leadnews-test/spring-task-demo/src/main/java/com/heima/task/job/JobHandler.java b/heima-leadnews-test/spring-task-demo/src/main/java/com/heima/task/job/JobHandler.java
new file mode 100644
index 0000000000000000000000000000000000000000..78e851fba575a3b4f348e7ddfd67a298cfa83633
--- /dev/null
+++ b/heima-leadnews-test/spring-task-demo/src/main/java/com/heima/task/job/JobHandler.java
@@ -0,0 +1,23 @@
+package com.heima.task.job;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-17 09:00:53
+ */
+@Component
+@Slf4j
+public class JobHandler {
+
+    /**
+     * 每2秒执行一次
+     */
+    //@Scheduled(cron = "0/2 * * * * ?")
+    public void task(){
+        log.warn("任务开始执行了---->");
+    }
+
+}
diff --git a/heima-leadnews-test/spring-task-demo/src/main/java/com/heima/task/job/XxlJobHandler.java b/heima-leadnews-test/spring-task-demo/src/main/java/com/heima/task/job/XxlJobHandler.java
new file mode 100644
index 0000000000000000000000000000000000000000..75919a3cd80ba11cb252d60f3d61d8ea13ed3b09
--- /dev/null
+++ b/heima-leadnews-test/spring-task-demo/src/main/java/com/heima/task/job/XxlJobHandler.java
@@ -0,0 +1,30 @@
+package com.heima.task.job;
+
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author ghy
+ * @version 1.0.1
+ * @date 2024-07-17 09:30:06
+ */
+@Component
+@Slf4j
+public class XxlJobHandler {
+
+    @Value("${server.port}")
+    private String port;
+
+    @XxlJob("testJobHandler")
+    public void testJobHandler(){
+        log.warn("任务执行了--->" + port);
+    }
+
+
+    @XxlJob("demoJobHandler")
+    public void demoJobHandler(){
+        log.warn("本地xxl-job----任务执行了--->" + port);
+    }
+}
diff --git a/heima-leadnews-test/spring-task-demo/src/main/resources/application.yml b/heima-leadnews-test/spring-task-demo/src/main/resources/application.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b1357214b59d24b3ec6bd432c8c209c1f151113c
--- /dev/null
+++ b/heima-leadnews-test/spring-task-demo/src/main/resources/application.yml
@@ -0,0 +1,11 @@
+server:
+  port: 8889
+
+xxl:
+  job:
+    admin:
+      #addresses: http://192.168.200.130:8888/xxl-job-admin
+      addresses: http://localhost:8080/xxl-job-admin
+    executor:
+      appname: xxl-job-executor-sample
+      port: 39999
diff --git a/heima-leadnews-test/tess4j-demo/pom.xml b/heima-leadnews-test/tess4j-demo/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..52184373aa95948b65b033a44cd3561f9462c779
--- /dev/null
+++ b/heima-leadnews-test/tess4j-demo/pom.xml
@@ -0,0 +1,27 @@
+<?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">
+    <parent>
+        <artifactId>heima-leadnews-test</artifactId>
+        <groupId>com.heima</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>tess4j-demo</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>net.sourceforge.tess4j</groupId>
+            <artifactId>tess4j</artifactId>
+            <version>4.1.1</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/heima-leadnews-test/tess4j-demo/src/main/java/com/heima/tess4j/test/Application.java b/heima-leadnews-test/tess4j-demo/src/main/java/com/heima/tess4j/test/Application.java
new file mode 100644
index 0000000000000000000000000000000000000000..68892c23ca912aa65797d5b2189049915c45e575
--- /dev/null
+++ b/heima-leadnews-test/tess4j-demo/src/main/java/com/heima/tess4j/test/Application.java
@@ -0,0 +1,29 @@
+package com.heima.tess4j.test;
+
+import net.sourceforge.tess4j.ITesseract;
+import net.sourceforge.tess4j.Tesseract;
+
+import java.io.File;
+
+public class Application {
+
+    public static void main(String[] args) {
+        try {
+            //获取本地图片
+            File file = new File("D:\\166\\project2\\tessdata\\test.png");
+            //创建Tesseract对象
+            ITesseract tesseract = new Tesseract();
+            //设置字体库路径
+            tesseract.setDatapath("D:\\166\\project2\\tessdata");
+            //中文识别
+            tesseract.setLanguage("chi_sim");
+            //执行ocr识别
+            String result = tesseract.doOCR(file);
+            //替换回车和tal键  使结果为一行
+            result = result.replaceAll("\\r|\\n","-").replaceAll(" ","");
+            System.out.println("识别的结果为："+result);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
\ No newline at end of file
diff --git a/heima-leadnews-utils/src/main/java/com/heima/utils/common/SensitiveWordUtil.java b/heima-leadnews-utils/src/main/java/com/heima/utils/common/SensitiveWordUtil.java
index c855d29fd145c46b709846e49bcef54f597816a3..aac7f4a621498e05d8d07cf0c560da0792af58d7 100644
--- a/heima-leadnews-utils/src/main/java/com/heima/utils/common/SensitiveWordUtil.java
+++ b/heima-leadnews-utils/src/main/java/com/heima/utils/common/SensitiveWordUtil.java
@@ -1,10 +1,12 @@
 package com.heima.utils.common;
-
-
 import java.util.*;
 
+/**
+ * 敏感词操作工具类
+ */
 public class SensitiveWordUtil {
 
+    //敏感词列表构建的一个Map
     public static Map<String, Object> dictionaryMap = new HashMap<>();
 
 
@@ -86,7 +88,7 @@ public class SensitiveWordUtil {
     }
 
     /**
-     * 获取匹配的关键词和命中次数
+     * 获取匹配的敏感词和命中次数
      * @param text
      * @return
      */
@@ -118,6 +120,8 @@ public class SensitiveWordUtil {
         initMap(list);
         String content="我是一个好人，并不会卖冰毒，也不操练法轮功,我真的不卖冰毒";
         Map<String, Integer> map = matchWords(content);
+        //{ "冰毒":2, "法轮功":1 }
         System.out.println(map);
     }
+
 }
diff --git a/pom.xml b/pom.xml
index f5a460136fb8f2a739aea591936192d440198ca1..4883e4849c1729e74a349b2efe81ab653ec07b6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
         <module>heima-leadnews-service</module>
         <module>heima-leadnews-gateway</module>
         <module>heima-leadnews-test</module>
+        <module>heima-leadnews-basic</module>
     </modules>
 
     <!-- 继承Spring boot工程 -->