Merge branch 'master' into deploy

eladmin-system/src/main/resources/template/generator/admin/Controller.ftl

@@ -31,7 +31,7 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
 /**
-* @website https://el-admin.vip
+* @website https://eladmin.vip
 * @author ${author}
 * @date ${date}
 **/

eladmin-system/src/main/resources/template/generator/admin/Dto.ftl

@@ -29,7 +29,7 @@ import com.alibaba.fastjson.serializer.ToStringSerializer;
 </#if>
 
 /**
-* @website https://el-admin.vip
+* @website https://eladmin.vip
 * @description /
 * @author ${author}
 * @date ${date}

eladmin-system/src/main/resources/template/generator/admin/Entity.ftl

@@ -37,7 +37,7 @@ import java.math.BigDecimal;
 import java.io.Serializable;
 
 /**
-* @website https://el-admin.vip
+* @website https://eladmin.vip
 * @description /
 * @author ${author}
 * @date ${date}

eladmin-system/src/main/resources/template/generator/admin/Mapper.ftl

@@ -22,7 +22,7 @@ import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 
 /**
-* @website https://el-admin.vip
+* @website https://eladmin.vip
 * @author ${author}
 * @date ${date}
 **/

eladmin-system/src/main/resources/template/generator/admin/QueryCriteria.ftl

@@ -30,7 +30,7 @@ import me.zhengjie.annotation.Query;
 </#if>
 
 /**
-* @website https://el-admin.vip
+* @website https://eladmin.vip
 * @author ${author}
 * @date ${date}
 **/

eladmin-system/src/main/resources/template/generator/admin/Repository.ftl

@@ -20,7 +20,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 /**
-* @website https://el-admin.vip
+* @website https://eladmin.vip
 * @author ${author}
 * @date ${date}
 **/

eladmin-system/src/main/resources/template/generator/admin/Service.ftl

@@ -25,7 +25,7 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
 /**
-* @website https://el-admin.vip
+* @website https://eladmin.vip
 * @description 服务接口
 * @author ${author}
 * @date ${date}

eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl

@@ -54,7 +54,7 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 
 /**
-* @website https://el-admin.vip
+* @website https://eladmin.vip
 * @description 服务实现
 * @author ${author}
 * @date ${date}

pom.xml

@@ -17,8 +17,8 @@
         <module>eladmin-generator</module>
     </modules>
 
-    <name>EL-ADMIN 后台管理</name>
-    <url>https://el-admin.vip</url>
+    <name>ELADMIN 后台管理</name>
+    <url>https://eladmin.vip</url>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -185,6 +185,12 @@
             <version>1.6.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.10.0</version>
+        </dependency>
+
         <!-- 解析客户端操作系统、浏览器信息 -->
         <dependency>
             <groupId>nl.basjes.parse.useragent</groupId>