Merge branch 'dev' into 'master'

修改和新增新闻标签

See merge request !6

pom.xml

@@ -155,43 +155,12 @@
             <version>1.19.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
-            <version>8.0.30</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.2.6</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>2.1.4</version>
-        </dependency>
-
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>s3</artifactId>
             <version>2.20.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.4.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.4.1</version>
-        </dependency>
-
 
         <dependency>
             <groupId>io.jsonwebtoken</groupId>

src/main/java/com/nanyan/securitylink/config/DatasourceConfig.java

-package com.nanyan.securitylink.config;
-
-import com.alibaba.druid.pool.DruidDataSource;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import javax.sql.DataSource;
-
-@Configuration
-public class DatasourceConfig {
-    @Bean
-    @ConfigurationProperties(prefix = "spring.datasource.druid")
-    public DataSource druidDataSource() {
-        return new DruidDataSource();
-    }
-
-}

src/main/java/com/nanyan/securitylink/config/MybatisPlusConfig.java

-package com.nanyan.securitylink.config;
-
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@MapperScan("com.nanyan.securitylink.mapper")
-public class MybatisPlusConfig {
-    @Bean
-    public MybatisPlusInterceptor mybatisPlusInterceptor() {
-        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        // 添加分页插件
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
-        return interceptor;
-    }
-}

src/main/java/com/nanyan/securitylink/mapper/WechatMsgMapper.java

-package com.nanyan.securitylink.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.nanyan.securitylink.model.WechatMsgDO;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface WechatMsgMapper extends BaseMapper<WechatMsgDO> {
-}

src/main/java/com/nanyan/securitylink/model/WechatMsgDO.java

-package com.nanyan.securitylink.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@TableName("wechat_msg")
-public class WechatMsgDO {
-    @TableId(type = IdType.AUTO)
-    Integer id;
-    String msg;
-    //状态 0:未发送 1:发送
-    Integer status;
-    Date createTime;
-    Date updateTime;
-}