Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBiz.java

@@ -76,7 +76,7 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
             if(query.entrySet().size()>0) {
                 Example.Criteria criteria = example.createCriteria();
                 for (Map.Entry<String, Object> entry : query.entrySet()) {
-                    criteria.andLike(entry.getKey(), "%" + entry.getValue().toString() + "%");
+                    criteria.orLike(entry.getKey(), "%" + entry.getValue().toString() + "%");
                 }
             }
             example.createCriteria().andGreaterThan("id",1);
@@ -88,7 +88,7 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
             if(query.entrySet().size()>0) {
                 Example.Criteria criteria = example.createCriteria();
                 for (Map.Entry<String, Object> entry : query.entrySet()) {
-                    criteria.andLike(entry.getKey(), "%" + entry.getValue().toString() + "%");
+                    criteria.orLike(entry.getKey(), "%" + entry.getValue().toString() + "%");
                 }
             }
             if(StringUtils.isNotBlank(currentUser.getDataCompany())){

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java

@@ -9,7 +9,6 @@ import com.github.wxiaoqi.security.admin.dto.AppUserManageDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.AppUserManage;
 import com.github.wxiaoqi.security.admin.entity.User;
-import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserManageVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
@@ -17,16 +16,11 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * app用户管理类

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/AppVersionBiz.java

@@ -5,18 +5,11 @@ import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.constant.RestCode;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.util.EntityUtils;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.xxfc.platform.app.vo.appVersionQuery;
-import com.xxfc.platform.vehicle.common.RestResponse;
-import com.xxfc.platform.vehicle.constant.RedisKey;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.log4j.Log4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.session.RowBounds;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -32,18 +25,13 @@ import com.xxfc.platform.app.entity.AppVersion;
 import com.xxfc.platform.app.mapper.AppVersionMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.io.File;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppVersionController.java

@@ -4,37 +4,18 @@ import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.constant.AppFormat;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
-import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
-import com.github.wxiaoqi.security.common.util.Query;
-import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.app.biz.AppVersionBiz;
 import com.xxfc.platform.app.entity.AppVersion;
-import com.xxfc.platform.app.entity.Cofig;
 import com.xxfc.platform.app.vo.appVersionQuery;
-import com.xxfc.platform.vehicle.common.RestResponse;
-import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Delete;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 
 @RestController
 @RequestMapping("version")