fix：移除mogu_config，将其合并到mogu_conmons中

README.md

@@ -16,7 +16,16 @@
 <img src="https://img.shields.io/badge/SpringCloud-Hoxton.RELEASE-brightgreen" ></img><img src="https://img.shields.io/badge/vue-2.5.17-green" ></img>
 <img src="https://img.shields.io/badge/swagger-2.6.1-green" ></img>
 <img src="https://img.shields.io/badge/mybatis--plus-3.1.2-green" ></img></a></p>
+## 前言
 
+虽然我知道很多人来到这里，都是pull 或者dowonload了一下代码，就把项目关闭了。突然有一天想起了看看蘑菇博客这个项目有没有更新，然后继续执行以下操作：
+
+- 更新了，pull或者download代码
+- 没更新，直接关闭项目 
+
+但是我还是非常希望各位小伙伴能够 **多多star支持**，您的**点赞**就是我维护的动力！
+
+如果您有任何相关建议，欢迎在issue或者群里提出，再次感谢大家的支持~
 
 ## 项目介绍
 
@@ -61,9 +70,9 @@
 
 推荐配置：2核4G
 
-> 【阿里云】 限量爆款 低至69元/年 [点我进入](https://www.aliyun.com/minisite/goods?userCode=w7aungxw) `(仅限新用户)`
+> 【阿里云】 限量爆款低至91.8元/年 [点我进入](https://www.aliyun.com/minisite/goods?userCode=w7aungxw)
 >
-> 【腾讯云】云产品限时秒杀，爆款1核2G云服务器，首年99元 [点我进入](https://cloud.tencent.com/act/cps/redirect?redirect=1054&cps_key=4e9b8ce643afe47621493331d101dd6e&from=console) `(仅限新用户)`
+> 【腾讯云】星星海SA2云服务器618钜惠，1核2G 首年95元 [点我进入](https://url.cn/WuGZnFBn)
 >
 > 【阿里云翼计划】 1核2G 5M / 年 (博主目前使用的) 仅需114元  [点我进入 ](https://promotion.aliyun.com/ntms/act/campus2018.html?spm=5176.10695662.1244717.1.641e5a06KpmU4A&accounttraceid=3ac1b990a4f445859080d2555566af8fiirr?userCode=w7aungxw&tag=share_component&share_source=copy_link?userCode=w7aungxw&tag=share_component&share_source=copy_link?userCode=w7aungxw&tag=share_component&share_source=copy_link) `(仅限学生或未满24岁的用户)`
 
@@ -115,12 +124,11 @@
 - mogu_spider：爬虫服务`（目前还未完善）`
 - mogu_spider：网关服务`（目前还未完善）`
 - mogu_zipkin：链路追踪服务，`目前使用java -jar的方式启动`
-- mogu_search：搜索服务，ElasticSearch和Solr作为检索工具，[支持可插拔配置](http://moguit.cn/#/info?blogUid=4042b4f4088e4e37e95d9fc75d97298b)，默认使用SQL搜索
-- mogu_commons: 是公共模块，主要用于存放Entity实体类和Feign远程调用接口
+- mogu_search：搜索服务，ElasticSearch和Solr作为全文检索工具，[支持可插拔配置](http://moguit.cn/#/info?blogUid=4042b4f4088e4e37e95d9fc75d97298b)，默认使用SQL搜索
+- mogu_commons：公共模块，主要用于存放Entity实体类、Feign远程调用接口、以及公共config配置
 - mogu_utils: 是常用工具类；
 - mogu_xo: 是存放 VO、Service，Dao层的
 - mogu_base: 是一些Base基类
-- mogu_config: 是存放一些配置
 - doc: 是蘑菇博客的一些文档和数据库文件
 - vue_mogu_admin：VUE的后台管理页面
 - vue_mogu_web：VUE的门户网站
@@ -141,7 +149,7 @@
 | SpringSecurity |     认证和授权框架      |          https://spring.io/projects/spring-security          |
 |  MyBatis-Plus  |         ORM框架         |                   https://mp.baomidou.com/                   |
 |   Swagger-UI   |      文档生产工具       | [ https://github.com/swagger-api/swagger-ui](https://github.com/swagger-api/swagger-ui) |
-|     Kibana     |    分析和可视化平台     |                                                              |
+|     Kibana     |    分析和可视化平台     |               https://www.elastic.co/cn/kibana               |
 | Elasticsearch  |        搜索引擎         | [ https://github.com/elastic/elasticsearch](https://github.com/elastic/elasticsearch) |
 |      Solr      |        搜索引擎         |                http://lucene.apache.org/solr/                |
 |    RabbitMQ    |        消息队列         |   [ https://www.rabbitmq.com/](https://www.rabbitmq.com/)    |
@@ -159,6 +167,7 @@
 | Github Actions |       自动化部署        |              https://help.github.com/en/actions              |
 |     Zipkin     |        链路追踪         |             https://github.com/openzipkin/zipkin             |
 | Flexmark-java  |    Markdown转换Html     |            https://github.com/vsch/flexmark-java             |
+|   Ip2region    |    离线IP地址定位库     |          https://github.com/lionsoul2014/ip2region           |
 
 ### 前端技术
 

mogu_admin/src/main/java/com/moxi/mogublog/admin/AdminApplication.java

@@ -31,7 +31,7 @@
 @EnableRabbit
 @EnableFeignClients("com.moxi.mogublog.commons.feign")
 @ComponentScan(basePackages = {
-        "com.moxi.mogublog.config",
+        "com.moxi.mogublog.commons.config",
         "com.moxi.mogublog.utils",
         "com.moxi.mogublog.admin.annotion",
         "com.moxi.mogublog.admin.security",

mogu_admin/src/main/java/com/moxi/mogublog/admin/annotion/OperationLogger/SysLogHandle.java

@@ -4,8 +4,8 @@
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.moxi.mogublog.admin.global.SysConf;
+import com.moxi.mogublog.commons.config.security.SecurityUser;
 import com.moxi.mogublog.commons.entity.SysLog;
-import com.moxi.mogublog.config.security.SecurityUser;
 import com.moxi.mogublog.utils.IpUtils;
 import com.moxi.mogublog.utils.RedisUtil;
 import com.moxi.mogublog.utils.StringUtils;

mogu_admin/src/main/java/com/moxi/mogublog/admin/restapi/AuthRestApi.java

@@ -5,9 +5,9 @@
 import com.moxi.mogublog.admin.annotion.OperationLogger.OperationLogger;
 import com.moxi.mogublog.admin.global.SQLConf;
 import com.moxi.mogublog.admin.global.SysConf;
+import com.moxi.mogublog.commons.config.jwt.Audience;
+import com.moxi.mogublog.commons.config.jwt.JwtHelper;
 import com.moxi.mogublog.commons.entity.Admin;
-import com.moxi.mogublog.config.jwt.Audience;
-import com.moxi.mogublog.config.jwt.JwtHelper;
 import com.moxi.mogublog.utils.CheckUtils;
 import com.moxi.mogublog.utils.ResultUtil;
 import com.moxi.mogublog.utils.StringUtils;

mogu_admin/src/main/java/com/moxi/mogublog/admin/restapi/LoginRestApi.java

@@ -6,12 +6,12 @@
 import com.moxi.mogublog.admin.global.RedisConf;
 import com.moxi.mogublog.admin.global.SQLConf;
 import com.moxi.mogublog.admin.global.SysConf;
+import com.moxi.mogublog.commons.config.jwt.Audience;
+import com.moxi.mogublog.commons.config.jwt.JwtHelper;
 import com.moxi.mogublog.commons.entity.Admin;
 import com.moxi.mogublog.commons.entity.CategoryMenu;
 import com.moxi.mogublog.commons.entity.Role;
 import com.moxi.mogublog.commons.feign.PictureFeignClient;
-import com.moxi.mogublog.config.jwt.Audience;
-import com.moxi.mogublog.config.jwt.JwtHelper;
 import com.moxi.mogublog.utils.*;
 import com.moxi.mogublog.xo.service.AdminService;
 import com.moxi.mogublog.xo.service.CategoryMenuService;

mogu_admin/src/main/java/com/moxi/mogublog/admin/security/JwtAuthenticationTokenFilter.java

@@ -2,8 +2,8 @@
 
 import com.moxi.mogublog.admin.global.RedisConf;
 import com.moxi.mogublog.admin.global.SysConf;
-import com.moxi.mogublog.config.jwt.Audience;
-import com.moxi.mogublog.config.jwt.JwtHelper;
+import com.moxi.mogublog.commons.config.jwt.Audience;
+import com.moxi.mogublog.commons.config.jwt.JwtHelper;
 import com.moxi.mogublog.utils.CookieUtils;
 import com.moxi.mogublog.utils.DateUtils;
 import com.moxi.mogublog.utils.RedisUtil;

mogu_admin/src/main/java/com/moxi/mogublog/admin/security/SecurityUserFactory.java

@@ -1,7 +1,7 @@
 package com.moxi.mogublog.admin.security;
 
+import com.moxi.mogublog.commons.config.security.SecurityUser;
 import com.moxi.mogublog.commons.entity.Admin;
-import com.moxi.mogublog.config.security.SecurityUser;
 import com.moxi.mougblog.base.enums.EStatus;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;

mogu_admin/src/main/resources/application.yml

@@ -101,6 +101,7 @@ spring:
   redis:
     host: 127.0.0.1 #redis的主机ip
     port: 6379
+    #password: mogu2018  # 客户端没有设置密码，服务器中redis默认密码为 mogu2018
 
   rabbitmq:
     host: 127.0.0.1 #rabbitmq的主机ip

mogu_base/pom.xml

@@ -18,7 +18,7 @@
 
     <dependencies>
         <dependency>
-            <artifactId>mogu_config</artifactId>
+            <artifactId>mogu_utils</artifactId>
             <groupId>com.moxi</groupId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>

mogu_config/src/main/java/com/moxi/mogublog/config/durid/DruidConfig.java → mogu_commons/src/main/java/com/moxi/mogublog/commons/config/durid/DruidConfig.java

@@ -1,4 +1,4 @@
-//package com.moxi.mogublog.config.durid;
+package com.moxi.mogublog.commons.config.durid;//package com.moxi.mogublog.config.durid;
 //
 //import com.alibaba.druid.pool.DruidDataSource;
 //import com.alibaba.druid.support.http.StatViewServlet;

mogu_config/src/main/java/com/moxi/mogublog/config/feign/FeignBasicAuthRequestInterceptor.java → mogu_commons/src/main/java/com/moxi/mogublog/commons/config/feign/FeignBasicAuthRequestInterceptor.java

@@ -1,4 +1,4 @@
-package com.moxi.mogublog.config.feign;
+package com.moxi.mogublog.commons.config.feign;
 
 import feign.RequestInterceptor;
 import feign.RequestTemplate;

mogu_config/src/main/java/com/moxi/mogublog/config/feign/FeignConfiguration.java → mogu_commons/src/main/java/com/moxi/mogublog/commons/config/feign/FeignConfiguration.java

@@ -1,4 +1,4 @@
-package com.moxi.mogublog.config.feign;
+package com.moxi.mogublog.commons.config.feign;
 
 import feign.RequestInterceptor;
 import feign.auth.BasicAuthRequestInterceptor;

mogu_config/src/main/java/com/moxi/mogublog/config/jwt/Audience.java → mogu_commons/src/main/java/com/moxi/mogublog/commons/config/jwt/Audience.java

@@ -1,4 +1,4 @@
-package com.moxi.mogublog.config.jwt;
+package com.moxi.mogublog.commons.config.jwt;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

mogu_config/src/main/java/com/moxi/mogublog/config/jwt/JwtHelper.java → mogu_commons/src/main/java/com/moxi/mogublog/commons/config/jwt/JwtHelper.java

@@ -1,6 +1,6 @@
-package com.moxi.mogublog.config.jwt;
+package com.moxi.mogublog.commons.config.jwt;
 
-import com.moxi.mogublog.config.security.SecurityUser;
+import com.moxi.mogublog.commons.config.security.SecurityUser;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.JwtBuilder;
 import io.jsonwebtoken.Jwts;
@@ -81,7 +81,7 @@ public boolean isExpiration(String token, String base64Security) {
 
     //效验token
     public Boolean validateToken(String token, UserDetails userDetails, String base64Security) {
-        SecurityUser SecurityUser = (SecurityUser) userDetails;
+        SecurityUser SecurityUser = (com.moxi.mogublog.commons.config.security.SecurityUser) userDetails;
         final String username = getUsername(token, base64Security);
         final boolean expiration = isExpiration(token, base64Security);
         return (

mogu_config/src/main/java/com/moxi/mogublog/config/mybatis/GlobalExceptionHandler.java → mogu_commons/src/main/java/com/moxi/mogublog/commons/config/mybatis/GlobalExceptionHandler.java

@@ -1,4 +1,4 @@
-//package com.moxi.mogublog.config.mybatis;
+package com.moxi.mogublog.commons.config.mybatis;//package com.moxi.mogublog.config.mybatis;
 //
 //import java.util.ArrayList;
 //import java.util.HashMap;

mogu_config/src/main/java/com/moxi/mogublog/config/mybatis/MetaObjectHandlerConfig.java → mogu_commons/src/main/java/com/moxi/mogublog/commons/config/mybatis/MetaObjectHandlerConfig.java

@@ -1,10 +1,8 @@
-package com.moxi.mogublog.config.mybatis;
+package com.moxi.mogublog.commons.config.mybatis;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

mogu_config/src/main/java/com/moxi/mogublog/config/mybatis/MybatisPlusConfig.java → mogu_commons/src/main/java/com/moxi/mogublog/commons/config/mybatis/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.moxi.mogublog.config.mybatis;
+package com.moxi.mogublog.commons.config.mybatis;
 
 import com.baomidou.mybatisplus.extension.incrementer.H2KeyGenerator;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;

mogu_config/src/main/java/com/moxi/mogublog/config/redis/RedisConfig.java → mogu_commons/src/main/java/com/moxi/mogublog/commons/config/redis/RedisConfig.java

@@ -1,4 +1,4 @@
-package com.moxi.mogublog.config.redis;
+package com.moxi.mogublog.commons.config.redis;
 
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;

mogu_config/src/main/java/com/moxi/mogublog/config/security/SecurityUser.java → mogu_commons/src/main/java/com/moxi/mogublog/commons/config/security/SecurityUser.java

@@ -1,4 +1,4 @@
-package com.moxi.mogublog.config.security;
+package com.moxi.mogublog.commons.config.security;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.springframework.security.core.GrantedAuthority;

mogu_commons/src/main/java/com/moxi/mogublog/commons/feign/AdminFeignClient.java

@@ -1,6 +1,6 @@
 package com.moxi.mogublog.commons.feign;
 
-import com.moxi.mogublog.config.feign.FeignConfiguration;
+import com.moxi.mogublog.commons.config.feign.FeignConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

mogu_commons/src/main/java/com/moxi/mogublog/commons/feign/PictureFeignClient.java

@@ -1,6 +1,6 @@
 package com.moxi.mogublog.commons.feign;
 
-import com.moxi.mogublog.config.feign.FeignConfiguration;
+import com.moxi.mogublog.commons.config.feign.FeignConfiguration;
 import com.moxi.mougblog.base.vo.FileVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;

mogu_commons/src/main/java/com/moxi/mogublog/commons/feign/SearchFeignClient.java

@@ -1,7 +1,7 @@
 package com.moxi.mogublog.commons.feign;
 
+import com.moxi.mogublog.commons.config.feign.FeignConfiguration;
 import com.moxi.mogublog.commons.entity.Blog;
-import com.moxi.mogublog.config.feign.FeignConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

mogu_commons/src/main/java/com/moxi/mogublog/commons/feign/WebFeignClient.java

@@ -1,6 +1,6 @@
 package com.moxi.mogublog.commons.feign;
 
-import com.moxi.mogublog.config.feign.FeignConfiguration;
+import com.moxi.mogublog.commons.config.feign.FeignConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;