统一使用StringUtils.isBlank校验空字符串

zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsArticleController.java

@@ -54,7 +54,7 @@ public class CmsArticleController extends BaseController {
 		CmsArticleExample cmsArticleExample = new CmsArticleExample();
 		cmsArticleExample.setOffset(offset);
 		cmsArticleExample.setLimit(limit);
-		if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
+		if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
 			cmsArticleExample.setOrderByClause(sort + " " + order);
 		}
 		List<CmsArticle> rows = cmsArticleService.selectByExample(cmsArticleExample);

zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCategoryController.java

@@ -54,7 +54,7 @@ public class CmsCategoryController extends BaseController {
 		CmsCategoryExample cmsCategoryExample = new CmsCategoryExample();
 		cmsCategoryExample.setOffset(offset);
 		cmsCategoryExample.setLimit(limit);
-		if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
+		if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
 			cmsCategoryExample.setOrderByClause(sort + " " + order);
 		}
 		List<CmsCategory> rows = cmsCategoryService.selectByExample(cmsCategoryExample);

zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCommentController.java

@@ -54,7 +54,7 @@ public class CmsCommentController extends BaseController {
 		CmsCommentExample cmsCommentExample = new CmsCommentExample();
 		cmsCommentExample.setOffset(offset);
 		cmsCommentExample.setLimit(limit);
-		if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
+		if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
 			cmsCommentExample.setOrderByClause(sort + " " + order);
 		}
 		List<CmsComment> rows = cmsCommentService.selectByExample(cmsCommentExample);

zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsTagController.java

@@ -8,13 +8,13 @@ import com.zheng.cms.rpc.api.CmsTagService;
 import com.zheng.common.base.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
@@ -54,7 +54,7 @@ public class CmsTagController extends BaseController {
 		CmsTagExample cmsTagExample = new CmsTagExample();
 		cmsTagExample.setOffset(offset);
 		cmsTagExample.setLimit(limit);
-		if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
+		if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
 			cmsTagExample.setOrderByClause(sort + " " + order);
 		}
 		List<CmsTag> rows = cmsTagService.selectByExample(cmsTagExample);

zheng-common/src/main/java/com/zheng/common/util/RedisUtil.java

@@ -108,7 +108,7 @@ public class RedisUtil {
 	 */
 	public synchronized static void set(String key, String value) {
 		try {
-			value = StringUtils.isEmpty(value) ? "" : value;
+			value = StringUtils.isBlank(value) ? "" : value;
 			Jedis jedis = getJedis();
 			jedis.set(key, value);
 			jedis.close();
@@ -140,7 +140,7 @@ public class RedisUtil {
 	 */
 	public synchronized static void set(String key, String value, int seconds) {
 		try {
-			value = StringUtils.isEmpty(value) ? "" : value;
+			value = StringUtils.isBlank(value) ? "" : value;
 			Jedis jedis = getJedis();
 			jedis.setex(key, seconds, value);
 			jedis.close();

zheng-upms/zheng-upms-client/src/main/java/com/zheng/upms/client/filter/SSOFilter.java

@@ -14,9 +14,6 @@ import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.session.Session;
-import org.apache.shiro.subject.Subject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -63,13 +60,13 @@ public class SSOFilter implements Filter {
 
         // 分配子系统登录sessionId，首次获取后缓存到cookie，防止session丢失
         String clientSessionId = CookieUtil.getCookie(request, ZHENG_UPMS_CLIENT_SESSION_ID);
-        if (StringUtils.isEmpty(clientSessionId)) {
+        if (StringUtils.isBlank(clientSessionId)) {
             clientSessionId = request.getSession().getId();
             CookieUtil.setCookie(response, ZHENG_UPMS_CLIENT_SESSION_ID, clientSessionId);
         }
 
         // 判断局部会话是否登录
-        if (null != clientSessionId && !StringUtils.isEmpty(RedisUtil.get(ZHENG_UPMS_CLIENT_SESSION_ID + "_" + clientSessionId))) {
+        if (null != clientSessionId && !StringUtils.isBlank(RedisUtil.get(ZHENG_UPMS_CLIENT_SESSION_ID + "_" + clientSessionId))) {
             // 移除url中的token参数
             if (null != request.getParameter("token")) {
                 String backUrl = RequestParameterUtil.getParameterWithOutToken(request);
@@ -86,7 +83,7 @@ public class SSOFilter implements Filter {
             // 判断是否有认证中心token
             String token = request.getParameter("token");
             // 已拿到token
-            if (!StringUtils.isEmpty(token)) {
+            if (!StringUtils.isBlank(token)) {
                 // HttpPost去校验token
                 try {
                     HttpClient httpclient = new DefaultHttpClient();
@@ -122,7 +119,7 @@ public class SSOFilter implements Filter {
             sso_server_url.append("/sso/index").append("?").append(SYSTEM_NAME).append("=").append(filterConfig.getInitParameter(SYSTEM_NAME));
             StringBuffer backurl = request.getRequestURL();
             String queryString = request.getQueryString();
-            if (!StringUtils.isEmpty(queryString)) {
+            if (!StringUtils.isBlank(queryString)) {
                 backurl.append("?").append(queryString);
             }
             sso_server_url.append("&").append("backurl").append("=").append(URLEncoder.encode(backurl.toString(), "utf-8"));

zheng-upms/zheng-upms-client/src/main/java/com/zheng/upms/client/filter/util/RequestParameterUtil.java

@@ -29,7 +29,7 @@ public class RequestParameterUtil {
                 }
             }
         }
-        if (!StringUtils.isEmpty(params)) {
+        if (!StringUtils.isBlank(params)) {
             backUrl = backUrl.append("?").append(params);
         }
         return backUrl.toString();

zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsOrganizationController.java

@@ -9,17 +9,16 @@ import com.zheng.upms.common.constant.UpmsResult;
 import com.zheng.upms.common.constant.UpmsResultConstant;
 import com.zheng.upms.dao.model.UpmsOrganization;
 import com.zheng.upms.dao.model.UpmsOrganizationExample;
-import com.zheng.upms.dao.model.UpmsSystem;
 import com.zheng.upms.rpc.api.UpmsOrganizationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
@@ -59,7 +58,7 @@ public class UpmsOrganizationController extends BaseController {
         UpmsOrganizationExample upmsOrganizationExample = new UpmsOrganizationExample();
         upmsOrganizationExample.setOffset(offset);
         upmsOrganizationExample.setLimit(limit);
-        if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
+        if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
             upmsOrganizationExample.setOrderByClause(sort + " " + order);
         }
         List<UpmsOrganization> rows = upmsOrganizationService.selectByExample(upmsOrganizationExample);

zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsPermissionController.java

@@ -12,13 +12,13 @@ import com.zheng.upms.dao.model.UpmsPermissionExample;
 import com.zheng.upms.rpc.api.UpmsPermissionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
@@ -77,7 +77,7 @@ public class UpmsPermissionController extends BaseController {
         }
         upmsPermissionExample.setOffset(offset);
         upmsPermissionExample.setLimit(limit);
-        if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
+        if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
             upmsPermissionExample.setOrderByClause(sort + " " + order);
         }
         List<UpmsPermission> rows = upmsPermissionService.selectByExample(upmsPermissionExample);

zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java

@@ -12,13 +12,13 @@ import com.zheng.upms.dao.model.UpmsRoleExample;
 import com.zheng.upms.rpc.api.UpmsRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
@@ -58,7 +58,7 @@ public class UpmsRoleController extends BaseController {
         UpmsRoleExample upmsRoleExample = new UpmsRoleExample();
         upmsRoleExample.setOffset(offset);
         upmsRoleExample.setLimit(limit);
-        if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
+        if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
             upmsRoleExample.setOrderByClause(sort + " " + order);
         }
         List<UpmsRole> rows = upmsRoleService.selectByExample(upmsRoleExample);

zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsSystemController.java

@@ -12,13 +12,13 @@ import com.zheng.upms.dao.model.UpmsSystemExample;
 import com.zheng.upms.rpc.api.UpmsSystemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
@@ -58,7 +58,7 @@ public class UpmsSystemController extends BaseController {
 		UpmsSystemExample upmsSystemExample = new UpmsSystemExample();
 		upmsSystemExample.setOffset(offset);
 		upmsSystemExample.setLimit(limit);
-		if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
+		if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
 			upmsSystemExample.setOrderByClause(sort + " " + order);
 		}
 		List<UpmsSystem> rows = upmsSystemService.selectByExample(upmsSystemExample);

zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsUserController.java

@@ -6,7 +6,6 @@ import com.baidu.unbiz.fluentvalidator.ResultCollectors;
 import com.zheng.common.base.BaseController;
 import com.zheng.common.validator.LengthValidator;
 import com.zheng.common.validator.NotNullValidator;
-import com.zheng.common.validator.SizeValidator;
 import com.zheng.upms.common.constant.UpmsResult;
 import com.zheng.upms.common.constant.UpmsResultConstant;
 import com.zheng.upms.dao.model.UpmsUser;
@@ -14,13 +13,13 @@ import com.zheng.upms.dao.model.UpmsUserExample;
 import com.zheng.upms.rpc.api.UpmsUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
@@ -60,7 +59,7 @@ public class UpmsUserController extends BaseController {
         UpmsUserExample upmsUserExample = new UpmsUserExample();
         upmsUserExample.setOffset(offset);
         upmsUserExample.setLimit(limit);
-        if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
+        if (!StringUtils.isBlank(sort) && !StringUtils.isBlank(order)) {
             upmsUserExample.setOrderByClause(sort + " " + order);
         }
         List<UpmsUser> rows = upmsUserService.selectByExample(upmsUserExample);