日志加入加入IP来源，支持多字段模糊搜索，升级七牛云存储版本

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/CommonQueryCriteria.java → eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/DictQueryCriteria.java

@@ -7,8 +7,9 @@ import me.zhengjie.annotation.Query;
  * 公共查询类
  */
 @Data
-public class CommonQueryCriteria {
+public class DictQueryCriteria {
 
-    @Query(type = Query.Type.INNER_LIKE)
-    private String name;
+    // 多字段模糊
+    @Query(blurry = "name,remark")
+    private String blurry;
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuQueryCriteria.java

+package me.zhengjie.modules.system.service.dto;
+
+import lombok.Data;
+import me.zhengjie.annotation.Query;
+
+/**
+ * 公共查询类
+ */
+@Data
+public class MenuQueryCriteria {
+
+    // 多字段模糊
+    @Query(blurry = "name,path,component")
+    private String blurry;
+}

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/PermissionQueryCriteria.java

+package me.zhengjie.modules.system.service.dto;
+
+import lombok.Data;
+import me.zhengjie.annotation.Query;
+
+/**
+ * 公共查询类
+ */
+@Data
+public class PermissionQueryCriteria {
+
+    // 多字段模糊
+    @Query(blurry = "name,alias")
+    private String blurry;
+}

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleQueryCriteria.java

+package me.zhengjie.modules.system.service.dto;
+
+import lombok.Data;
+import me.zhengjie.annotation.Query;
+
+/**
+ * 公共查询类
+ */
+@Data
+public class RoleQueryCriteria {
+
+    // 多字段模糊
+    @Query(blurry = "name,remark")
+    private String blurry;
+}

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserQueryCriteria.java

@@ -18,11 +18,9 @@ public class UserQueryCriteria implements Serializable {
     @Query(propName = "id", type = Query.Type.IN, joinName = "dept")
     private Set<Long> deptIds;
 
-    @Query(type = Query.Type.INNER_LIKE)
-    private String username;
-
-    @Query(type = Query.Type.INNER_LIKE)
-    private String email;
+    // 多字段模糊
+    @Query(blurry = "email,username")
+    private String blurry;
 
     @Query
     private Boolean enabled;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java

 package me.zhengjie.modules.system.service.impl;
 
 import me.zhengjie.modules.system.domain.Dict;
+import me.zhengjie.modules.system.service.dto.DictQueryCriteria;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;
 import me.zhengjie.utils.ValidationUtil;
@@ -31,7 +32,7 @@ public class DictServiceImpl implements DictService {
     private DictMapper dictMapper;
 
     @Override
-    public Object queryAll(DictDTO dict, Pageable pageable){
+    public Object queryAll(DictQueryCriteria dict, Pageable pageable){
         Page<Dict> page = dictRepository.findAll((root, query, cb) -> QueryHelp.getPredicate(root, dict, cb), pageable);
         return PageUtil.toPage(page.map(dictMapper::toDto));
     }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java

@@ -8,8 +8,8 @@ import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.exception.EntityExistException;
 import me.zhengjie.modules.system.repository.MenuRepository;
 import me.zhengjie.modules.system.service.MenuService;
-import me.zhengjie.modules.system.service.dto.CommonQueryCriteria;
 import me.zhengjie.modules.system.service.dto.MenuDTO;
+import me.zhengjie.modules.system.service.dto.MenuQueryCriteria;
 import me.zhengjie.modules.system.service.dto.RoleSmallDTO;
 import me.zhengjie.modules.system.service.mapper.MenuMapper;
 import me.zhengjie.utils.QueryHelp;
@@ -32,7 +32,7 @@ public class MenuServiceImpl implements MenuService {
     private MenuMapper menuMapper;
 
     @Override
-    public List queryAll(CommonQueryCriteria criteria){
+    public List queryAll(MenuQueryCriteria criteria){
         return menuMapper.toDto(menuRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
     }
 

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/PermissionServiceImpl.java

@@ -5,8 +5,8 @@ import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.exception.EntityExistException;
 import me.zhengjie.modules.system.repository.PermissionRepository;
 import me.zhengjie.modules.system.service.PermissionService;
-import me.zhengjie.modules.system.service.dto.CommonQueryCriteria;
 import me.zhengjie.modules.system.service.dto.PermissionDTO;
+import me.zhengjie.modules.system.service.dto.PermissionQueryCriteria;
 import me.zhengjie.modules.system.service.mapper.PermissionMapper;
 import me.zhengjie.utils.QueryHelp;
 import me.zhengjie.utils.ValidationUtil;
@@ -31,7 +31,7 @@ public class PermissionServiceImpl implements PermissionService {
     private PermissionMapper permissionMapper;
 
     @Override
-    public List<PermissionDTO> queryAll(CommonQueryCriteria criteria) {
+    public List<PermissionDTO> queryAll(PermissionQueryCriteria criteria) {
         return permissionMapper.toDto(permissionRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
     }
 

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java

@@ -5,8 +5,8 @@ import me.zhengjie.modules.system.domain.Role;
 import me.zhengjie.exception.EntityExistException;
 import me.zhengjie.modules.system.repository.RoleRepository;
 import me.zhengjie.modules.system.service.RoleService;
-import me.zhengjie.modules.system.service.dto.CommonQueryCriteria;
 import me.zhengjie.modules.system.service.dto.RoleDTO;
+import me.zhengjie.modules.system.service.dto.RoleQueryCriteria;
 import me.zhengjie.modules.system.service.dto.RoleSmallDTO;
 import me.zhengjie.modules.system.service.mapper.RoleMapper;
 import me.zhengjie.modules.system.service.mapper.RoleSmallMapper;
@@ -45,7 +45,7 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    public Object queryAll(CommonQueryCriteria criteria, Pageable pageable) {
+    public Object queryAll(RoleQueryCriteria criteria, Pageable pageable) {
         Page<Role> page = roleRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
         return PageUtil.toPage(page.map(roleMapper::toDto));
     }

eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java

@@ -84,7 +84,7 @@ public class QiNiuServiceImpl implements QiNiuService {
         /**
          * 构造一个带指定Zone对象的配置类
          */
-        Configuration cfg = QiNiuUtil.getConfiguration(qiniuConfig.getZone());
+        Configuration cfg = new Configuration(QiNiuUtil.getRegion(qiniuConfig.getZone()));
         UploadManager uploadManager = new UploadManager(cfg);
         Auth auth = Auth.create(qiniuConfig.getAccessKey(), qiniuConfig.getSecretKey());
         String upToken = auth.uploadToken(qiniuConfig.getBucket());
@@ -136,7 +136,7 @@ public class QiNiuServiceImpl implements QiNiuService {
     @Transactional(rollbackFor = Exception.class)
     public void delete(QiniuContent content, QiniuConfig config) {
         //构造一个带指定Zone对象的配置类
-        Configuration cfg = QiNiuUtil.getConfiguration(config.getZone());
+        Configuration cfg = new Configuration(QiNiuUtil.getRegion(config.getZone()));
         Auth auth = Auth.create(config.getAccessKey(), config.getSecretKey());
         BucketManager bucketManager = new BucketManager(auth, cfg);
         try {
@@ -154,7 +154,7 @@ public class QiNiuServiceImpl implements QiNiuService {
             throw new BadRequestException("请先添加相应配置，再操作");
         }
         //构造一个带指定Zone对象的配置类
-        Configuration cfg = QiNiuUtil.getConfiguration(config.getZone());
+        Configuration cfg = new Configuration(QiNiuUtil.getRegion(config.getZone()));
         Auth auth = Auth.create(config.getAccessKey(), config.getSecretKey());
         BucketManager bucketManager = new BucketManager(auth, cfg);
         //文件名前缀
@@ -181,7 +181,6 @@ public class QiNiuServiceImpl implements QiNiuService {
                 }
             }
         }
-
     }
 
     @Override

eladmin-tools/src/main/java/me/zhengjie/utils/QiNiuUtil.java

 package me.zhengjie.utils;
 
-import com.qiniu.common.Zone;
-import com.qiniu.storage.Configuration;
-
+import com.qiniu.storage.Region;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -26,20 +24,19 @@ public class QiNiuUtil {
      * @param zone
      * @return
      */
-    public static Configuration getConfiguration(String zone){
+    public static Region getRegion(String zone){
 
         if(HUAD.equals(zone)){
-            return new Configuration(Zone.zone0());
+            return Region.huadong();
         } else if(HUAB.equals(zone)){
-            return new Configuration(Zone.zone1());
+            return Region.huabei();
         } else if(HUAN.equals(zone)){
-            return new Configuration(Zone.zone2());
+            return Region.huanan();
         } else if (BEIM.equals(zone)){
-            return new Configuration(Zone.zoneNa0());
-
+            return Region.beimei();
             // 否则就是东南亚
         } else {
-            return new Configuration(Zone.zoneAs0());
+            return Region.qvmHuadong();
         }
     }
 

pom.xml

@@ -149,6 +149,12 @@
             <artifactId>hutool-all</artifactId>
             <version>${hutool.version}</version>
         </dependency>
+        <!--https://gitee.com/lionsoul/ip2region/tree/v1.4-release/-->
+        <dependency>
+            <groupId>org.lionsoul</groupId>
+            <artifactId>ip2region</artifactId>
+            <version>1.7.2</version>
+        </dependency>
 
         <!-- fastjson -->
         <dependency>